diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2007-02-13 09:44:20 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2007-02-13 09:44:20 +0000 |
| commit | 5725e7b3099b5dd12462095da16ec50529936448 (patch) | |
| tree | dcbef9eb68bfa31b8b173d61488690b661a06e04 /configure.ac | |
| parent | ba820cdc34f397f6afd2b1b1181672ba7b66bc0b (diff) | |
| download | gst-plugins-bad-5725e7b3099b5dd12462095da16ec50529936448.tar.gz gst-plugins-bad-5725e7b3099b5dd12462095da16ec50529936448.tar.bz2 gst-plugins-bad-5725e7b3099b5dd12462095da16ec50529936448.zip | |
Add crossreferences to glib/gobject/gstream docs. Also fix typo in timidity.cfg check.
Original commit message from CVS:
* configure.ac:
* docs/plugins/Makefile.am:
Add crossreferences to glib/gobject/gstream docs. Also fix typo in
timidity.cfg check.
* ext/timidity/gsttimidity.c: (plugin_init):
Also build if no config was detected at configure time.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 42181694..24a844f1 100644 --- a/configure.ac +++ b/configure.ac @@ -156,7 +156,7 @@ dnl *** checks for compiler characteristics *** dnl *** checks for library functions *** -dnl *** checks for dependancy libraries *** +dnl *** checks for dependency libraries *** dnl GLib is required GST_GLIB_CHECK([2.6]) @@ -184,6 +184,14 @@ dnl check for "check", unit testing library/header AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no) AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") +dnl Check for documentation xrefs +GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" +GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`" +GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMINOR`" +AC_SUBST(GLIB_PREFIX) +AC_SUBST(GST_PREFIX) +AC_SUBST(GSTPB_PREFIX) + dnl GTK is optional and used in examples HAVE_GTK=NO PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no) @@ -762,8 +770,8 @@ GST_CHECK_FEATURE(TIMIDITY, [timidity midi soft synth plugin], timidity, [ timidity_cfg="" if test -r /etc/timidity.cfg; then timidity_cfg=/etc/timidity.cfg - elif test -r /etc/timidify/timidity.cfg; then - timidity_cfg=/etc/timidify/timidity.cfg + elif test -r /etc/timidity/timidity.cfg; then + timidity_cfg=/etc/timidity/timidity.cfg elif test -r /usr/share/timidity/timidity.cfg; then timidity_cfg=/usr/share/timidity/timidity.cfg elif test -r /usr/local/share/timidity/timidity.cfg; then |