From e2cca3d6995ca3f3d331ecd6fc8db95d2e069d1e Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Mon, 20 Feb 2006 23:34:40 +0000
Subject: [PATCH] gst/: Make things work with --disable-parse as they do with

Original commit message from CVS:
* gst/Makefile.am:
* gst/gstparse.h:
* gst/gstutils.c:
* gst/gstutils.h:
Make things work with --disable-parse as they do with
--disable-load-save - the symbols involved disappear, but the
header is still installed and GST_DISABLE_PARSE is included via
gstconfig.h
---
 ChangeLog       | 11 +++++++++++
 gst/Makefile.am |  4 +---
 gst/gstparse.h  |  2 ++
 gst/gstutils.c  |  2 ++
 gst/gstutils.h  | 10 ++++++++++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1988759..72a386d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-21  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst/Makefile.am:
+	* gst/gstparse.h:
+	* gst/gstutils.c:
+	* gst/gstutils.h:
+	Make things work with --disable-parse as they do with 
+	--disable-load-save - the symbols involved disappear, but the
+	header is still installed and GST_DISABLE_PARSE is included via
+	gstconfig.h
+
 2006-02-20  Julien MOUTTE  <julien@moutte.net>
 
 	* libs/gst/base/gstbasetransform.c:
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 3780b1d..be18332 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -14,12 +14,10 @@ endif
 
 if GST_DISABLE_PARSE
 GST_PARSE_SRC = 
-GST_PARSE_H =
 SUBDIRS_PARSE = 
 GST_PARSE_LA = 
 else
 GST_PARSE_SRC = gstparse.c
-GST_PARSE_H = gstparse.h
 SUBDIRS_PARSE = parse
 GST_PARSE_LA = parse/libgstparse.la 
 endif
@@ -190,7 +188,7 @@ gst_headers =			\
 	gstutils.h		\
 	gstvalue.h		\
 	gstregistry.h		\
-	$(GST_PARSE_H)		\
+	gstparse.h              \
 	gstxml.h
 
 libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers)
diff --git a/gst/gstparse.h b/gst/gstparse.h
index 7deea1b..b21d1de 100644
--- a/gst/gstparse.h
+++ b/gst/gstparse.h
@@ -23,6 +23,8 @@
 #ifndef __GST_PARSE_H__
 #define __GST_PARSE_H__
 
+#include <gst/gstconfig.h>
+
 #include <gst/gstelement.h>
 
 G_BEGIN_DECLS
diff --git a/gst/gstutils.c b/gst/gstutils.c
index 74174e2..8f685b4 100644
--- a/gst/gstutils.c
+++ b/gst/gstutils.c
@@ -3047,6 +3047,7 @@ gst_bin_find_unconnected_pad (GstBin * bin, GstPadDirection direction)
   return pad;
 }
 
+#ifndef GST_DISABLE_PARSE
 /**
  * gst_parse_bin_from_description:
  * @bin_description: command line describing the bin
@@ -3107,3 +3108,4 @@ gst_parse_bin_from_description (const gchar * bin_description,
 
   return GST_ELEMENT (bin);
 }
+#endif
diff --git a/gst/gstutils.h b/gst/gstutils.h
index f170d87..7f445f7 100644
--- a/gst/gstutils.h
+++ b/gst/gstutils.h
@@ -25,6 +25,8 @@
 #ifndef __GST_UTILS_H__
 #define __GST_UTILS_H__
 
+#include <gst/gstconfig.h>
+
 #include <glib.h>
 #include <gst/gstbin.h>
 
@@ -599,10 +601,18 @@ void			gst_element_found_tags_for_pad	(GstElement * element,
 void			gst_element_found_tags		(GstElement * element,
 							 GstTagList * list);
 
+#ifndef GST_DISABLE_PARSE
 /* parse utility functions */
 GstElement *            gst_parse_bin_from_description  (const gchar * bin_description,
                                                          gboolean ghost_unconnected_pads,
                                                          GError ** err);
+#else /* GST_DISABLE_PARSE */
+
+#if defined _GNUC_ && _GNUC_ >= 3
+#pragma GCC poison gst_parse_bin_from_description 
+#endif
+
+#endif
 
 G_END_DECLS
 
-- 
2.7.4