various build fixes

Original commit message from CVS:
various build fixes

diff --git a/Makefile.am b/Makefile.am
index 14cbc0de7f82d75f759a5e112506bb3112852c3f..cc23931c33fac2e311717a7becc656eb18d5ee7c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ pkgconfig_DATA = gstreamer.pc
 man_MANS = gstreamer-config.1
 
 EXTRA_DIST = gstreamer.spec.in gstreamer-config.in gstreamer.m4 \
-            gstreamer.pc.in gstreamer-uninstall.pc.in \
+            gstreamer.pc.in gstreamer-uninstalled.pc.in \
             LICENSE REQUIREMENTS ABOUT-NLS $(man_MANS)
 
 dist-hook:

diff --git a/acconfig.h b/acconfig.h
index 6f697110e1b253a52f6af26228086b985bebc7e2..acb8115d3cc6124d28af366d68c3fc7b545dbd67 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -40,6 +40,8 @@
 #undef HAVE_MPEG2DEC
 #undef HAVE_LINUX_CDROM
 #undef HAVE_LINUX_VIDEODEV
+#undef HAVE_LIBSDL
+#undef HAVE_LIBOPENQUICKTIME
 
 #undef HAVE_ATOMIC_H
 

diff --git a/configure.in b/configure.in
index e9c9bcd994a1b6b40cc3b427d72753c45418fe39..18e0b664cd146eaaea52530889e4a6ba5c22f720 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,8 +5,8 @@ AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
 
 GST_VERSION_MAJOR=0
-GST_VERSION_MINOR=1
-GST_VERSION_MICRO=1
+GST_VERSION_MINOR=2
+GST_VERSION_MICRO=0
 GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR.$GST_VERSION_MICRO
 
 PACKAGE=gstreamer
@@ -898,6 +898,7 @@ AM_CONDITIONAL(HAVE_RAW1394,        test "x$HAVE_RAW1394" = "xyes")
 AM_CONDITIONAL(HAVE_LIBDV,          test "x$HAVE_LIBDV" = "xyes")
 AM_CONDITIONAL(HAVE_LIBAA,          test "x$HAVE_LIBAA" = "xyes")
 AM_CONDITIONAL(HAVE_GNOME_VFS,      test "x$HAVE_GNOME_VFS" = "xyes")
+AM_CONDITIONAL(HAVE_LIBSDL,         test "x$HAVE_LIBSDL" = "xyes")
 AM_CONDITIONAL(HAVE_LIBOPENQUICKTIME,      test "x$HAVE_LIBOPENQUICKTIME" = "xyes")
 
 
@@ -985,7 +986,6 @@ include/wine/Makefile
 gst/Makefile
 gst/gstversion.h
 gst/types/Makefile
-gst/meta/Makefile
 gst/elements/Makefile
 gst/autoplug/Makefile
 libs/Makefile
@@ -1061,7 +1061,6 @@ plugins/visualization/spectrum/Makefile
 plugins/visualization/vumeter/Makefile
 plugins/visualization/synaesthesia/Makefile
 plugins/visualization/smoothwave/Makefile
-plugins/videosink/Makefile
 plugins/videoscale/Makefile
 plugins/xvideosink/Makefile
 plugins/wav/Makefile

diff --git a/gst/autoplug/Makefile.am b/gst/autoplug/Makefile.am
index 043317a262f4a7da6bd21d9d31c93b8c1d91e9e1..9c84f3384ac31f20a0c2efbe958bfcd271528817 100644 (file)
--- a/gst/autoplug/Makefile.am
+++ b/gst/autoplug/Makefile.am
@@ -3,18 +3,17 @@ filterdir = $(libdir)/gst
 filter_LTLIBRARIES = libgststaticautoplug.la libgststaticautoplugrender.la \
        libgstautoplugcache.la libgstautoplugger.la
 
-libgststaticautoplug_la_SOURCES =      \
-       gststaticautoplug.c 
-       
-libgststaticautoplugrender_la_SOURCES =        \
-       gststaticautoplugrender.c
-
+libgststaticautoplug_la_SOURCES = gststaticautoplug.c 
+libgststaticautoplugrender_la_SOURCES =        gststaticautoplugrender.c
 libgstautoplugcache_la_SOURCES = gstautoplugcache.c
 libgstautoplugger_la_SOURCES = gstautoplugger.c
 
 libgststaticautoplug_la_LDFLAGS = -version-info $(GST_LIBVERSION)
 libgststaticautoplugrender_la_LDFLAGS = -version-info $(GST_LIBVERSION)
 libgstautoplugcache_la_LDFLAGS = -version-info $(GST_LIBVERSION)
+libgstautoplugger_la_LDFLAGS = -version-info $(GST_LIBVERSION)
+
+noinst_HEADERS = gststaticautoplug.h gststaticautoplugrender.h
 
 noinst_PROGRAMS = autoplugtest
 autoplugtest_LDADD = $(GST_LIBS)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 11ce4da685427514cccac19bcea58a3ca84ccd04..14f67769c3ffc11a99094383ad4ed8083922a8ba 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = sched eos
+SUBDIRS = sched eos nego
 
 noinst_PROGRAMS = init loadall simplefake states caps queue registry \
 paranoia rip mp3encode autoplug props case4 markup load tee autoplug2 autoplug3 \

diff --git a/tests/old/testsuite/Makefile.am b/tests/old/testsuite/Makefile.am
index 9e32fd0ae2dda8f1799237457ccd2fdc99ca4100..ba6916388254eae040b2676f3d7f35036cb12515 100644 (file)
--- a/tests/old/testsuite/Makefile.am
+++ b/tests/old/testsuite/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = refcounting capsnego
 
 testprogs = test_gst_init
 

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 9e32fd0ae2dda8f1799237457ccd2fdc99ca4100..ba6916388254eae040b2676f3d7f35036cb12515 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = refcounting capsnego
 
 testprogs = test_gst_init