Add a "MODULES" parameter to GST_CHECK_CONFIGPROG, to pass sets of modules to the...

Original commit message from CVS:
Add a "MODULES" parameter to GST_CHECK_CONFIGPROG, to pass sets of modules
to the -config script.  Convert gnome test to use GST_CHECK_CONFIGPROG.

diff --git a/acinclude.m4 b/acinclude.m4
index a20e8ae..731b60b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -363,7 +363,7 @@ dnl Use a -config program which accepts --cflags and --libs parameters
 dnl to set *_CFLAGS and *_LIBS and check existence of a feature.
 dnl Richard Boulton <richard-alsa@tartarus.org>
 dnl Last modification: 26/06/2001
-dnl GST_CHECK_CONFIGPROG(FEATURE-NAME, CONFIG-PROG-FILENAME)
+dnl GST_CHECK_CONFIGPROG(FEATURE-NAME, CONFIG-PROG-FILENAME, MODULES)
 dnl
 dnl This check was written for GStreamer: it should be renamed and checked
 dnl for portability if you decide to use it elsewhere.
@@ -376,8 +376,8 @@ AC_DEFUN(GST_CHECK_CONFIGPROG,
     [$1]_CFLAGS=
     HAVE_[$1]=no
   else
-    [$1]_LIBS=`[$2] --libs`
-    [$1]_CFLAGS=`[$2] --cflags`
+    [$1]_LIBS=`[$2] --libs [$3]`
+    [$1]_CFLAGS=`[$2] --cflags [$3]`
     HAVE_[$1]=yes
   fi
   AC_SUBST([$1]_LIBS)

diff --git a/configure.base b/configure.base
index f1ddbe6..58f96e2 100644 (file)
--- a/configure.base
+++ b/configure.base
@@ -348,20 +348,8 @@ if test x$USE_GLIB2 = xyes; then
   AC_MSG_WARN(gnome disabled for glib2.0)
 else
   dnl Check for libgnome
-  AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
-  if test x$GNOME_CONFIG = xno; then
-    AC_MSG_WARN(Couldn't find gnome-config: can't build editor or gstplay)
-    GNOME_LIBS=
-    GNOME_CFLAGS=
-    HAVE_GNOME=no
-  else
-    GNOME_LIBS=`gnome-config --libs gnome gnomeui`
-    GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
-    HAVE_GNOME=yes
-  fi
+  GST_CHECK_CONFIGPROG(GNOME, gnome-config, gnome gnomeui)
 fi
-AC_SUBST(GNOME_LIBS)
-AC_SUBST(GNOME_CFLAGS)
 
 dnl Check for libghttp
 GST_CHECK_FEATURE(LIBGHTTP, [libghttp plugins], gsthttpsrc, [