[gst-cvs] CVS: gstreamer configure.base,1.94,1.95 gstreamer-uninstalled.pc.in,1.7,1.8 gstreamer.pc.in,1.4,1.5

[Andy Wingo]

Update of /cvsroot/gstreamer/gstreamer
In directory usw-pr-cvs1:/tmp/cvs-serv18490

Modified Files:
	configure.base gstreamer-uninstalled.pc.in gstreamer.pc.in 
Log Message:
if USE_GLIB2, the package dependencies are different


Index: configure.base
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/configure.base,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- configure.base	2001/10/21 19:18:35	1.94
+++ configure.base	2001/10/27 06:44:13	1.95
@@ -83,6 +83,12 @@
   HAVE_NASM="yes"
 fi
 
+dnl fix pkg-config's broken default search path
+if test -z $PKG_CONFIG_PATH; then
+  PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+fi
+export PKG_CONFIG_PATH
+
 dnl Check for pkgconfig
 AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, true, false)
 
@@ -202,8 +208,9 @@
 
 dnl Check for glib2
 GST_CHECK_FEATURE(GLIB2, [use of glib-2.0 and GObject], , [
-  PKG_CHECK_MODULES(GLIB2, glib-2.0 gobject-2.0 gthread-2.0 gmodule-2.0,
+  PKG_CHECK_MODULES(GLIB2, glib-2.0 gobject-2.0 gmodule-2.0,
     HAVE_GLIB2=yes,HAVE_GLIB2=no)
+  GST_PKG_DEPS="glib-2.0 gobject-2.0 gmodule-2.0"
   AC_SUBST(GLIB2_LIBS)
   AC_SUBST(GLIB2_CFLAGS)
 ], disabled, [
@@ -216,6 +223,8 @@
 AC_SUBST(USE_GLIB2)
 
 if test x$USE_GLIB2 = xno; then
+  GST_PKG_DEPS="glib >= 1.2.0, gtk+ >= 1.2.0"
+  
   dnl Check for glib and gtk
   AM_PATH_GLIB(1.2.0,,
               AC_MSG_ERROR(Cannot find glib: Is glib-config in path?),
@@ -227,6 +236,8 @@
   CORE_LIBS="$CORE_LIBS $GLIB_LIBS $GTK_LIBS"
   CORE_CFLAGS="$CORE_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS"
 else
+  GST_PKG_DEPS="glib-2.0 gobject-2.0 gmodule-2.0"
+  
   PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
 
   GTK_FLAGS=$GTK2_CFLAGS
@@ -238,6 +249,7 @@
   AC_SUBST(USE_GNOME2)
 fi
 
+AC_SUBST(GST_PKG_DEPS)
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 
@@ -353,6 +365,14 @@
   ALSA_LIBS=
 fi
 
+GST_CHECK_FEATURE(JACK, [jack audio connection kit], jack, [
+  PKG_CHECK_MODULES(JACK, jack,
+    HAVE_JACK=yes,HAVE_JACK=no)
+  AC_SUBST(JACK_LIBS)
+  AC_SUBST(JACK_CFLAGS)
+])
+dnl AC_SUBST(USE_JACK)
+
 dnl Check for libaudiofile
 GST_CHECK_FEATURE(LIBAUDIOFILE, [use gdk pixbuf], afsink afsrc, [
   GST_CHECK_CONFIGPROG(LIBAUDIOFILE, audiofile-config)
@@ -1087,8 +1107,6 @@
 AC_DEFINE_UNQUOTED(PLUGINS_BUILDDIR,"$PLUGINS_BUILDDIR")
 AC_SUBST(PLUGINS_BUILDDIR)
 
-
-
 dnl ##############################
 dnl # Set up the defaults cflags #
 dnl ##############################
@@ -1194,6 +1212,7 @@
 plugins/flx/Makefile
 plugins/festival/Makefile
 plugins/flac/Makefile
+plugins/jack/Makefile
 plugins/jpeg/Makefile
 plugins/mp3decode/Makefile
 plugins/mp3decode/types/Makefile

Index: gstreamer-uninstalled.pc.in
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gstreamer-uninstalled.pc.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gstreamer-uninstalled.pc.in	2001/09/09 12:09:19	1.7
+++ gstreamer-uninstalled.pc.in	2001/10/27 06:44:14	1.8
@@ -6,7 +6,7 @@
 Name: GStreamer Uninstalled
 Description: Streaming-media framework, Not Installed
 Version: @VERSION@
-Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
+Requires: @GST_PKG_DEPS@, libxml >= 1.8.1
 Libs: -lgst -L${pcfiledir}/gst/
 Cflags: -I${pcfiledir} @GST_DEFINE_CFLAGS@
 

Index: gstreamer.pc.in
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gstreamer.pc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gstreamer.pc.in	2001/06/27 20:14:07	1.4
+++ gstreamer.pc.in	2001/10/27 06:44:14	1.5
@@ -5,7 +5,7 @@
 
 Name: GStreamer
 Description: Streaming-media framework
-Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
+Requires: @GST_PKG_DEPS@, libxml >= 1.8.1
 Version: @VERSION@
 Libs: -L${libdir} -lgst
 Cflags: -I${includedir} @GST_DEFINE_CFLAGS@