configure.ac (GST_PLUGINS_BASE_LIBS): Check for gstreamer-plugins-base.pc, the one...

Original commit message from CVS:
2005-12-01  Andy Wingo  <wingo@pobox.com>

* configure.ac (GST_PLUGINS_BASE_LIBS): Check for
gstreamer-plugins-base.pc, the one that has the interfaces etc.

* gst/Makefile.am (interfaces_la_CFLAGS, interfaces_la_LDFLAGS):
PLUGINS_BASE, not BASE.

diff --git a/ChangeLog b/ChangeLog
index f186a2c..65eadcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-01  Andy Wingo  <wingo@pobox.com>
+
+       * configure.ac (GST_PLUGINS_BASE_LIBS): Check for
+       gstreamer-plugins-base.pc, the one that has the interfaces etc.
+
+       * gst/Makefile.am (interfaces_la_CFLAGS, interfaces_la_LDFLAGS):
+       PLUGINS_BASE, not BASE.
+
 2005-11-30  Edward Hervey  <edward@fluendo.com>
 
        * configure.ac:

diff --git a/common b/common
index f9f5f06..54bb21c 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f9f5f063728688cf455a1512d492b632c43963d7
+Subproject commit 54bb21c57bb86941d80c15590e0a121405173156

diff --git a/configure.ac b/configure.ac
index 3d62527..496f61c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,17 @@ fi
 AC_SUBST(GST_NET_LIBS)
 AC_SUBST(GST_NET_CFLAGS)
 
+dnl check for gstreamer-net
+PKG_CHECK_MODULES(GST_PLUGINS_BASE, gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ,
+  HAVE_GST_PLUGINS_BASE="yes", HAVE_GST_PLUGINS_BASE="no")
+
+if test "x$HAVE_GST_PLUGINS_BASE" = "xno"; then
+  AC_MSG_ERROR(no gst-plugins-base found)
+fi
+
+AC_SUBST(GST_PLUGINS_BASE_LIBS)
+AC_SUBST(GST_PLUGINS_BASE_CFLAGS)
+
 
 dnl check for pygtk
 PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= $PYGTK_REQ)

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 42247e9..cf1a49d 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -63,9 +63,9 @@ EXTRA_DIST += $(GST_DEFS) $(GST_OVERRIDES)
 gst.c: $(GST_DEFS) $(GST_OVERRIDES) $(GEN_FILES)
 
 # GStreamer interfaces bindings
-interfaces_la_CFLAGS = $(common_cflags) $(GST_BASE_CFLAGS)
+interfaces_la_CFLAGS = $(common_cflags) $(GST_PLUGINS_BASE_CFLAGS)
 interfaces_la_LIBADD = $(common_libadd) -lgstinterfaces-0.9 
-interfaces_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initinterface $(GST_BASE_LIBS)
+interfaces_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initinterface $(GST_PLUGINS_BASE_LIBS)
 interfaces_la_SOURCES = interfacesmodule.c
 nodist_interfaces_la_SOURCES = interfaces.c
 INTERFACES_OVERRIDES = interfaces.override xoverlay.override