Changed Makefiles to: detect xaudio (check header xaudio/decoder.h) detect mmx.h...

Original commit message from CVS:
Changed Makefiles to:
detect xaudio (check header xaudio/decoder.h)
detect mmx.h
detect CSS (check if css.c is in plugins/dvdsrc), need something better.
some LDFLAGS had *.la dependencies which failed for libtool

The build is now 100% on my system.

diff --git a/acconfig.h b/acconfig.h
index de7a6f8ba9a3af779c461103d79fc0268e456e57..9ac8f17a96fdf2d8a64bc16040b546a2c7483746 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -5,6 +5,7 @@
 #undef HAVE_LIBGHTTP
 #undef HAVE_LIBXML
 #undef HAVE_LIBMMX
+#undef HAVE_XAUDIO
 
 #undef HAVE_ATOMIC_H
 

diff --git a/config.h.in b/config.h.in
index cedb21b8321f8ed37b67b52a4876f750d802738c..cd80000bc1e09807860ac308c6e3b0a4a3c92399 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -13,6 +13,7 @@
 #undef HAVE_LIBGHTTP
 #undef HAVE_LIBXML
 #undef HAVE_LIBMMX
+#undef HAVE_XAUDIO
 
 #undef HAVE_ATOMIC_H
 

diff --git a/configure.in b/configure.in
index 215cc776e443e8a7afb287bdbe4ae902df7e6809..0d17534368d3e51cd5b86711da177807951f7b9c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -65,10 +65,21 @@ AC_DEFINE(HAVE_LIBXML)
 AM_CONDITIONAL(HAVE_LIBXML, test "x$HAVE_LIBXML" = "xyes")
 
 
-AC_CHECK_HEADER(mmx.h,[HAVE_LIBMMX=yes],)
-AC_DEFINE(HAVE_LIBMMX)
+AC_CHECK_HEADER(mmx.h,[
+  AC_DEFINE(HAVE_LIBMMX), []])
 AM_CONDITIONAL(HAVE_LIBMMX, test "x$HAVE_LIBMMX" = "xyes")
 
+AC_CHECK_HEADER(xaudio/decoder.h,[
+  AC_DEFINE(HAVE_XAUDIO) 
+  HAVE_XAUDIO="yes", []
+])
+AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
+
+AC_CHECK_HEADER(xaudio/decoder.h,[
+  AC_DEFINE(HAVE_XAUDIO) 
+  HAVE_XAUDIO="yes", []
+])
+AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
 
 PLUGINS_DIR=${libdir}/plugins
 AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR")
@@ -92,6 +103,19 @@ AC_ARG_ENABLE(profiling,
 [  --enable-profiling          adds -pg to compiler commandline, for profiling],
 [CFLAGS="$CFLAGS -pg"])
 
+AC_MSG_CHECKING(DVD CSS code)
+
+dnl check if css.c exists (FIXME)
+if test -f plugins/dvdsrc/css.c
+then
+  AC_MSG_RESULT(yes)
+  HAVE_DECSS="yes"
+else
+  AC_MSG_RESULT(no)
+  HAVE_DECSS="no"
+fi
+AM_CONDITIONAL(HAVE_DECSS, test "x$HAVE_DECSS" = "xyes")
+
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)

diff --git a/editor/Makefile.am b/editor/Makefile.am
index 394cf839ce9534e71fef404f8d993370e8977fd9..c3a38ec253a575e3879f3ca9be4be1af522a41da 100644 (file)
--- a/editor/Makefile.am
+++ b/editor/Makefile.am
@@ -1,5 +1,5 @@
-LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la \
-       $(shell gnome-config --libs gnomeui)
+LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la 
+LDFLAGS = $(shell gnome-config --libs gnomeui)
 INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/gst \
            $(shell gnome-config --cflags gnomeui)
 

diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index d0356951156e6e4763bef7f2c62b3e17c8c8ce0d..346ae7f5ac8a69808f3d55e989f9c91c56b16c89 100644 (file)
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -30,6 +30,5 @@ noinst_HEADERS =              \
        gstqueue.h              \
        gstsinesrc.h
 
-libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) \
-                          $(top_srcdir)/gst/libgst.la
+libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) 
 libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)

diff --git a/gst/types/Makefile.am b/gst/types/Makefile.am
index 2dec2600ef247d8dda2249b66f854517edd2a601..7c9a9d3a0094b47ea337ebf97e0bc32fc4d50e98 100644 (file)
--- a/gst/types/Makefile.am
+++ b/gst/types/Makefile.am
@@ -6,5 +6,5 @@ libgsttypes_la_SOURCES =        \
 
 #noinst_HEADERS =
 
-libgsttypes_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_srcdir)/gst/libgst.la
+libgsttypes_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) 
 libgsttypes_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index d0356951156e6e4763bef7f2c62b3e17c8c8ce0d..346ae7f5ac8a69808f3d55e989f9c91c56b16c89 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -30,6 +30,5 @@ noinst_HEADERS =              \
        gstqueue.h              \
        gstsinesrc.h
 
-libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) \
-                          $(top_srcdir)/gst/libgst.la
+libgstelements_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) 
 libgstelements_la_LDFLAGS = -version-info $(STREAMER_CURRENT):$(STREAMER_REVISION):$(STREAMER_AGE)