autogen.sh: require am17

Original commit message from CVS:

* autogen.sh:
require am17
* configure.ac:
* ext/annodex/Makefile.am:
* ext/cdio/Makefile.am:
* ext/dv/Makefile.am:
* ext/esd/Makefile.am:
* ext/flac/Makefile.am:
* ext/gdk_pixbuf/Makefile.am:
* ext/ladspa/Makefile.am:
* ext/libcaca/Makefile.am:
* ext/speex/Makefile.am:
* ext/taglib/Makefile.am:
* sys/oss/Makefile.am:
* sys/sunaudio/Makefile.am:
* sys/ximage/Makefile.am:
clean up build further

diff --git a/common b/common
index 5d58e7652bf38a637dceca167d6e47e7794b2b52..dd85f550441bd5722b98f4dd304e40826383240f 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 5d58e7652bf38a637dceca167d6e47e7794b2b52
+Subproject commit dd85f550441bd5722b98f4dd304e40826383240f

diff --git a/ext/cdio/Makefile.am b/ext/cdio/Makefile.am
index ba454d65df19ae8358c89a66c3d5b9cb7a6555c7..01092c716586d573f671c98ae59d18176c91855f 100644 (file)
--- a/ext/cdio/Makefile.am
+++ b/ext/cdio/Makefile.am
@@ -1,4 +1,3 @@
-
 plugin_LTLIBRARIES = libgstcdio.la
 
 libgstcdio_la_SOURCES = \
@@ -7,12 +6,12 @@ libgstcdio_la_SOURCES = \
 
 libgstcdio_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
-       $(CDIO_CFLAGS) \
        $(GST_BASE_CFLAGS) \
-       $(GST_CFLAGS)
+       $(GST_CFLAGS) \
+       $(CDIO_CFLAGS)
 
 libgstcdio_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstcdda-@GST_MAJORMINOR@ \
+       $(GST_PLUGINS_BASE_LIBS) -lgstcdda-$(GST_MAJORMINOR) \
        $(GST_BASE_LIBS) \
        $(CDIO_LIBS)
 
@@ -21,4 +20,3 @@ libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 noinst_HEADERS = \
        gstcdio.h \
        gstcdiocddasrc.h
-