[gst-cvs] CVS: gstreamer Makefile.am,1.34,1.34.4.1 REQUIREMENTS,1.19,1.19.4.1 configure.base,1.80.4.6,1.80.4.7

[Erik Walthinsen]

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

Modified Files:
      Tag: BRANCH-EVENTS1
	Makefile.am REQUIREMENTS configure.base 
Log Message:
merge from HEAD on 20011016

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.34.4.1
diff -u -d -r1.34 -r1.34.4.1
--- Makefile.am	2001/08/28 12:15:14	1.34
+++ Makefile.am	2001/10/17 08:50:58	1.34.4.1
@@ -15,7 +15,7 @@
 endif
 
 if BUILD_TESTS
-SUBDIRS_TESTS = test tests testsuite
+SUBDIRS_TESTS =
 else
 SUBDIRS_TESTS =
 endif
@@ -47,7 +47,7 @@
 	     gstreamer.pc.in gstreamer-uninstalled.pc.in \
 	     configure.base autogen.sh \
 	     LICENSE REQUIREMENTS ABOUT-NLS $(man_MANS) \
-	     idiottest.mak ltconfig.sh
+	     idiottest.mak
 
 dist-hook:
 	cp gstreamer.spec $(distdir)

Index: REQUIREMENTS
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/REQUIREMENTS,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -u -d -r1.19 -r1.19.4.1
--- REQUIREMENTS	2001/07/18 22:08:30	1.19
+++ REQUIREMENTS	2001/10/17 08:50:59	1.19.4.1
@@ -79,9 +79,10 @@
 
 Required tools:
 ===============
-autoconf
-automake v1.4 or better
-libtool v1.3.5 or better
+autoconf v2.13 or better, 2.52 prefered
+automake v1.4 or better, 1.5 prefered
+libtool v1.4 or better
+pkgconfig 0.8.0 (http://www.freedesktop.org/software/pkgconfig/)
 
 Optional tools:
 ===============

Index: configure.base
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/configure.base,v
retrieving revision 1.80.4.6
retrieving revision 1.80.4.7
diff -u -d -r1.80.4.6 -r1.80.4.7
--- configure.base	2001/10/06 14:42:29	1.80.4.6
+++ configure.base	2001/10/17 08:50:59	1.80.4.7
@@ -83,6 +83,9 @@
   HAVE_NASM="yes"
 fi
 
+dnl Check for pkgconfig
+AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, true, false)
+
 dnl check for gtkdoc
 AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-mkdb, true, false)
 AC_CHECK_PROG(HAVE_GTK_DOC, gtkdoc-scanobj, :, false)
@@ -803,8 +806,12 @@
 esac], 
 [USE_PROFILING=no]) dnl Default value
 
-dnl Default value
-GST_CONFIG_DIR=/etc/gstreamer
+dnl default to building registry in the source tree if we are enabling plugin build dir
+if test "x$PLUGINS_USE_BUILDDIR" = xyes; then
+  GST_CONFIG_DIR=$builddir
+else
+  GST_CONFIG_DIR=/etc/gstreamer
+fi
 AC_ARG_WITH(configdir,
 [  --with-configdir             specify path to use for configdir],
 [case "${withval}" in
@@ -1181,6 +1188,7 @@
 libs/idct/Makefile
 libs/audio/Makefile
 libs/bytestream/Makefile
+libs/control/Makefile
 plugins/Makefile
 plugins/a52dec/Makefile
 plugins/aasink/Makefile
@@ -1228,7 +1236,7 @@
 plugins/rtp/rtpsend/Makefile
 plugins/mulaw/Makefile
 plugins/alaw/Makefile
-plugins/ffmpeg/Makefile
+dnl until ffmpeg is handled by configure plugins/ffmpeg/Makefile
 plugins/filters/Makefile
 plugins/filters/smooth/Makefile
 plugins/filters/median/Makefile
@@ -1281,12 +1289,14 @@
 plugins/1394/Makefile
 plugins/sdlsink/Makefile
 plugins/dv/Makefile
+plugins/synthesis/Makefile
+plugins/synthesis/sinesrc/Makefile
 gstplay/Makefile
 dnl components/bonobo-gstmediaplay/Makefile
 test/Makefile
 test/xml/Makefile
 test/bindings/Makefile
-test/misc/Makefile
+dnl someone should fix this test/misc/Makefile
 test/memchunk/Makefile
 test/events/Makefile
 tests/Makefile
@@ -1296,7 +1306,7 @@
 testsuite/Makefile
 testsuite/capsnego/Makefile
 testsuite/refcounting/Makefile
-testsuite/plugin/Makefile
+dnl someone should fix this testsuite/plugin/Makefile
 tests/nego/Makefile
 examples/Makefile
 examples/autoplug/Makefile