bring into the 0.10 world

Original commit message from CVS:

* autogen.sh:
* configure.ac:
* src/Makefile.am:
* src/gstplugin.c:
bring into the 0.10 world
Fix #315582

5 files changed, 51 insertions, 19 deletions

diff --git a/gst-plugin/ChangeLog b/gst-plugin/ChangeLog
index d2a630a..e28d385 100644
--- a/gst-plugin/ChangeLog
+++ b/gst-plugin/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* autogen.sh:
+	* configure.ac:
+	* src/Makefile.am:
+	* src/gstplugin.c:
+	  bring into the 0.10 world
+	  Fix #315582
+
 2005-12-16  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* src/gstplugin.c: (gst_plugin_template_class_init):
diff --git a/gst-plugin/autogen.sh b/gst-plugin/autogen.sh
index d8e0813..6adb971 100755
--- a/gst-plugin/autogen.sh
+++ b/gst-plugin/autogen.sh
@@ -19,7 +19,7 @@ set -x
 # we want to treat errors as soon as possible
 $ACLOCAL -I m4 || exit 1
 libtoolize --force || exit 1
-# autoheader || exit 1
+autoheader || exit 1
 $AUTOMAKE -a || exit 1
 $AUTOCONF || exit 1
 ./configure --enable-maintainer-mode $*
diff --git a/gst-plugin/configure.ac b/gst-plugin/configure.ac
index 126c99d..2b41907 100644
--- a/gst-plugin/configure.ac
+++ b/gst-plugin/configure.ac
@@ -1,12 +1,18 @@
 AC_INIT
 
+dnl versions of gstreamer and plugins-base
+GST_MAJORMINOR=0.10
+GST_REQUIRED=0.10.0
+GSTPB_REQUIRED=0.10.0
+
 dnl fill in your package name and version here
 dnl the fourth (nano) number should be 0 for a release, 1 for CVS,
 dnl and 2... for a prerelease
 
 dnl when going to/from release please set the nano correctly !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-plugin, GST_PLUGIN_VERSION, 0, 1, 1, 1, GST_PLUGIN_CVS="no", GST_PLUGIN_CVS="yes")
+AS_VERSION(gst-plugin, GST_PLUGIN_VERSION, 0, 10, 0, 1,
+    GST_PLUGIN_CVS="no", GST_PLUGIN_CVS="yes")
 
 dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
 AM_MAINTAINER_MODE
@@ -16,10 +22,13 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 dnl make aclocal work in maintainer mode
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 
+AM_CONFIG_HEADER(config.h)
+
 dnl check for tools
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
+
 dnl decide on error flags
 AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
                                                                                 
@@ -42,9 +51,7 @@ fi
 dnl Now we're ready to ask for gstreamer libs and cflags
 dnl And we can also ask for the right version of gstreamer
 
-GST_REQUIRED=0.9
 
-GST_MAJORMINOR=0.9
 PKG_CHECK_MODULES(GST, \
   gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED,
   HAVE_GST=yes,HAVE_GST=no)
@@ -64,18 +71,34 @@ AC_SUBST(GST_LIBS)
 dnl make GST_MAJORMINOR available in Makefile.am
 AC_SUBST(GST_MAJORMINOR)
 
-dnl If we need them, we can also use the plugin libraries
-PKG_CHECK_MODULES(GST_LIBS, gstreamer-libs-$GST_MAJORMINOR >= $GST_REQUIRED,
-                  HAVE_GST_LIBS=yes, HAVE_GST_LIBS=no)
+dnl If we need them, we can also use the base class libraries
+PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED,
+                  HAVE_GST_BASE=yes, HAVE_GST_BASE=no)
+
+dnl Give a warning if we don't have gstreamer libs
+dnl you can turn this into an error if you need them
+if test "x$HAVE_GST_BASE" = "xno"; then
+  AC_MSG_NOTICE(no GStreamer base class libraries found (gstreamer-base-$GST_MAJORMINOR))
+fi
+
+dnl make _CFLAGS and _LIBS available
+AC_SUBST(GST_BASE_CFLAGS)
+AC_SUBST(GST_BASE_LIBS)
+
+dnl If we need them, we can also use the gstreamer-plugins-base libraries
+PKG_CHECK_MODULES(GSTPB_BASE,
+                  gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPB_REQUIRED,
+                  HAVE_GSTPB_BASE=yes, HAVE_GSTPB_BASE=no)
 
 dnl Give a warning if we don't have gstreamer libs
-if test "x$HAVE_GST_LIBS" = "xno"; then
-  AC_MSG_NOTICE(no GStreamer plugin libs found)
+dnl you can turn this into an error if you need them
+if test "x$HAVE_GSTPB_BASE" = "xno"; then
+  AC_MSG_NOTICE(no GStreamer Plugins Base libraries found (gstreamer-plugins-base-$GST_MAJORMINOR))
 fi
 
-dnl make GST_LIBS_CFLAGS and GST_LIBS_LIBS available
-AC_SUBST(GST_LIBS_CFLAGS)
-AC_SUBST(GST_LIBS_LIBS)
+dnl make _CFLAGS and _LIBS available
+AC_SUBST(GSTPB_BASE_CFLAGS)
+AC_SUBST(GSTPB_BASE_LIBS)
 
 dnl set the plugindir where plugins should be installed
 plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
diff --git a/gst-plugin/src/Makefile.am b/gst-plugin/src/Makefile.am
index 4cbf2a9..eebc08b 100644
--- a/gst-plugin/src/Makefile.am
+++ b/gst-plugin/src/Makefile.am
@@ -9,9 +9,9 @@ plugin_LTLIBRARIES = libgstplugin.la
 libgstplugin_la_SOURCES = gstplugin.c
 
 # flags used to compile this plugin
-# we use the GST_LIBS flags because we might be using plug-in libs
-libgstplugin_la_CFLAGS = $(GST_LIBS_CFLAGS)
-libgstplugin_la_LIBADD = $(GST_LIBS_LIBS)
+# add other _CFLAGS and _LIBS as needed
+libgstplugin_la_CFLAGS = $(GST_CFLAGS)
+libgstplugin_la_LIBADD = $(GST_LIBS)
 libgstplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 # headers we need but don't want installed
diff --git a/gst-plugin/src/gstplugin.c b/gst-plugin/src/gstplugin.c
index 86b6090..b20f8e8 100644
--- a/gst-plugin/src/gstplugin.c
+++ b/gst-plugin/src/gstplugin.c
@@ -40,11 +40,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gst/gst.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
-/* include this header if you want to use dynamic parameters
-#include <gst/control/control.h>
-*/
+#include <gst/gst.h>
 
 #include "gstplugin.h"