added gstversion.h

Original commit message from CVS:
added gstversion.h

diff --git a/configure.in b/configure.in
index eff0c92..81f88df 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,44 +4,44 @@ AC_CANONICAL_SYSTEM
 
 AM_CONFIG_HEADER(config.h)
 
-dnl FIXME this should be GSTREAMER_ now
-STREAMER_MAJOR_VERSION=0
-STREAMER_MINOR_VERSION=1
-STREAMER_MICRO_VERSION=1
-STREAMER_VERSION=$STREAMER_MAJOR_VERSION.$STREAMER_MINOR_VERSION.$STREAMER_MICRO_VERSION
+GST_VERSION_MAJOR=0
+GST_VERSION_MINOR=1
+GST_VERSION_MICRO=1
+GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR.$GST_VERSION_MICRO
 
 PACKAGE=gstreamer
-VERSION=$STREAMER_VERSION
+VERSION=$GST_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
 dnl libtool
-STREAMER_CURRENT=0
-STREAMER_REVISION=0
-STREAMER_AGE=0
-GSTREAMER_LIBVERSION=$STREAMER_CURRENT:$STREAMER_REVISION:$STREAMER_AGE
+GST_CURRENT=0
+GST_REVISION=0
+GST_AGE=0
+GST_LIBVERSION=$GST_CURRENT:$GST_REVISION:$GST_AGE
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 dnl Add parameters for aclocal
 dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
-AC_SUBST(STREAMER_MAJOR_VERSION)
-AC_SUBST(STREAMER_MINOR_VERSION)
-AC_SUBST(STREAMER_MICRO_VERSION)
-AC_SUBST(STREAMER_VERSION)
+AC_SUBST(GST_VERSION_MAJOR)
+AC_SUBST(GST_VERSION_MINOR)
+AC_SUBST(GST_VERSION_MICRO)
+AC_SUBST(GST_VERSION)
 
-AC_SUBST(STREAMER_CURRENT)
-AC_SUBST(STREAMER_REVISION)
-AC_SUBST(STREAMER_AGE)
-AC_SUBST(GSTREAMER_LIBVERSION)
+AC_SUBST(GST_CURRENT)
+AC_SUBST(GST_REVISION)
+AC_SUBST(GST_AGE)
+AC_SUBST(GST_LIBVERSION)
 
 
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
+AC_PROG_CXX
 AC_ISC_POSIX
 AC_STDC_HEADERS
 AC_ARG_PROGRAM
@@ -775,6 +775,7 @@ AC_OUTPUT([Makefile
 include/Makefile
 include/wine/Makefile
 gst/Makefile
+gst/gstversion.h
 gst/types/Makefile
 gst/meta/Makefile
 gst/elements/Makefile
@@ -860,7 +861,7 @@ plugins/esd/Makefile
 plugins/esd/esdsink/Makefile
 plugins/artsd/Makefile
 plugins/xmms/Makefile
-plugins/mulaw/Makefile
+plugins/arts/Makefile
 gstplay/Makefile
 dnl components/bonobo-gstmediaplay/Makefile
 test/Makefile

diff --git a/gst/.gitignore b/gst/.gitignore
index 08f5ed3..8e3b99e 100644 (file)
--- a/gst/.gitignore
+++ b/gst/.gitignore
@@ -5,3 +5,4 @@ Makefile.in
 *.la
 .deps
 .libs
+gstversion.h

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 0ccec0b..ee16394 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -115,7 +115,8 @@ libgstinclude_HEADERS =             \
        gsttypefind.h           \
        gstutils.h              \
        gstparse.h              \
-       gstxml.h
+       gstxml.h                \
+       gstversion.h
 
 noinst_HEADERS =       \
        gst_private.h   \

diff --git a/gst/gst.h b/gst/gst.h
index 98e27aa..94a1444 100644 (file)
--- a/gst/gst.h
+++ b/gst/gst.h
@@ -26,6 +26,8 @@
 
 #include <glib.h>
 
+#include <gst/gstversion.h>
+
 #include <gst/gstinfo.h>
 #include <gst/gstobject.h>
 #include <gst/gstpad.h>

diff --git a/gst/gstversion.h.in b/gst/gstversion.h.in
new file mode 100644 (file)
index 0000000..820e7fc
--- /dev/null
+++ b/gst/gstversion.h.in
@@ -0,0 +1,31 @@
+/* GStreamer
+ * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
+ *                    2000 Wim Taymans <wtay@chello.be>
+ *
+ * gstversion.h: Version information for GStreamer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef __GST_VERSION_H__
+#define __GST_VERSION_H__
+
+#define GST_VERSION_MAJOR @GST_VERSION_MAJOR@
+#define GST_VERSION_MINOR @GST_VERSION_MINOR@
+#define GST_VERSION_MICRO @GST_VERSION_MICRO@
+
+#endif /* __GST_H__ */