From b56261424266d422b60ed3f9afb0bf8b40ec9e1a Mon Sep 17 00:00:00 2001
From: Erik Walthinsen <omega@temple-baptist.org>
Date: Wed, 27 Jun 2001 20:14:07 +0000
Subject: [PATCH] configure.base: changed to 0.2.1, reworked the -D gathering
 for cflags gstreamer-config.in, gstreamer.pc.in, gstreame...

Original commit message from CVS:
configure.base: changed to 0.2.1, reworked the -D gathering for cflags
gstreamer-config.in, gstreamer.pc.in, gstreamer-uninstalled.pc.in:
reworked -D gathering for cflags
---
 configure.base              | 5 ++++-
 gstreamer-config.in         | 2 +-
 gstreamer-uninstalled.pc.in | 2 +-
 gstreamer.pc.in             | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure.base b/configure.base
index 58f96e2b05..9f7edb7c18 100644
--- a/configure.base
+++ b/configure.base
@@ -191,6 +191,7 @@ if test x$USE_GLIB2 = xyes; then
     AC_SUBST(GLIB2_CFLAGS)
 
     AC_DEFINE(USE_GLIB2)
+    GST_DEFINE_CFLAGS="$GST_DEFINE_CFLAGS -DUSE_GLIB2"
 
     HAVE_OBJECT_MODEL=yes
   else
@@ -843,7 +844,8 @@ GST_SUBSYSTEM_DISABLE(TYPEFIND,[typefind plugin],)
 GST_SUBSYSTEM_DISABLE(AUTOPLUG,[autoplugger subsystem])
 GST_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
 GST_SUBSYSTEM_DISABLE(TRACE,[tracing subsystem])
-AC_SUBST(GST_SUBSYSTEM_DISABLE_DEFINES)
+
+GST_DEFINE_CFLAGS="$GST_DEFINE_CFLAGS $GST_SUBSYSTEM_DISABLE_DEFINES"
 
 
 dnl ################################################
@@ -1055,6 +1057,7 @@ AC_SUBST(LDFLAGS)
 AC_SUBST(AS)
 AC_SUBST(ASFLAGS)
 
+AC_SUBST(GST_DEFINE_CFLAGS)
 
 dnl #############################
 dnl # Configure the subpackages #
diff --git a/gstreamer-config.in b/gstreamer-config.in
index 8cd2df8e76..e99bf40ded 100644
--- a/gstreamer-config.in
+++ b/gstreamer-config.in
@@ -47,7 +47,7 @@ while test $# -gt 0; do
       elif test @includedir@ != /usr/include ; then
         includes=-I@includedir@ 
       fi
-      echo $includes @CORE_CFLAGS@
+      echo $includes @CORE_CFLAGS@ @GST_DEFINE_CFLAGS@
       ;;
     --libs)
       if test $prefix -ef @builddir@ ; then
diff --git a/gstreamer-uninstalled.pc.in b/gstreamer-uninstalled.pc.in
index ae740734a5..0ee1289a50 100644
--- a/gstreamer-uninstalled.pc.in
+++ b/gstreamer-uninstalled.pc.in
@@ -8,4 +8,4 @@ Description: Streaming-media framework, Not Installed
 Version: @VERSION@
 Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
 Libs: ${pcbuilddir}/${pcfiledir}/gst/libgst.la
-Cflags: -I${pcbuilddir}/${pcfiledir}
+Cflags: -I${pcbuilddir}/${pcfiledir} @GST_DEFINE_CFLAGS@
diff --git a/gstreamer.pc.in b/gstreamer.pc.in
index 584dc78327..253d642f85 100644
--- a/gstreamer.pc.in
+++ b/gstreamer.pc.in
@@ -8,4 +8,4 @@ Description: Streaming-media framework
 Requires: glib >= 1.2.0, gtk+ >= 1.2.0, libxml >= 1.8.1
 Version: @VERSION@
 Libs: -L${libdir} -lgst
-Cflags: -I${includedir}
+Cflags: -I${includedir} @GST_DEFINE_CFLAGS@