configure: don't use as_version

2 files changed, 12 insertions, 54 deletions

diff --git a/config.h.in b/config.h.in
index ad0c570..27c07b3 100644
--- a/config.h.in
+++ b/config.h.in
@@ -6,12 +6,6 @@
 /* Define to the Gettext package name */
 #undef GETTEXT_PACKAGE
 
-/* Define the version */
-#undef GST_PPS_VERSION
-
-/* Define the release version */
-#undef GST_PPS_VERSION_RELEASE
-
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 
diff --git a/configure.ac b/configure.ac
index 9eb90dd..58fc173 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,30 +1,21 @@
 #                                               -*- Autoconf -*-
-AC_INIT
+m4_define([gst_pps_major], 0)
+m4_define([gst_pps_minor], 0)
+m4_define([gst_pps_micro], 15)
+m4_define([gst_pps_nano], 13)
+AC_INIT([gst-plugins-pps], gst_pps_major.gst_pps_minor.gst_pps_micro.gst_pps_nano)
 
-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 git HEAD,
-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-plugins-pps, GST_PPS_VERSION, 0, 0, 15, 13,
-    GST_PPS_CVS="no", GST_PPS_CVS="yes")
+dnl AC_INIT([$PACKAGE], [$VERSION])
+AC_CONFIG_SRCDIR([config.h.in])
+AC_CONFIG_HEADERS([config.h])
 
 dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
 dnl AM_MAINTAINER_MODE
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE
 
 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
 AM_PROG_CC_C_O
@@ -84,6 +75,9 @@ 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
 
+dnl versions of gstreamer and plugins-base
+GST_MAJORMINOR=0.10
+GST_REQUIRED=0.10.0
 
 PKG_CHECK_MODULES(GST, \
   gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED,
@@ -128,36 +122,6 @@ AC_CHECK_FUNCS([gst_type_find_helper_for_extension])
 CFLAGS=$saved_CFLAGS
 LIBS=$saved_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
-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 _CFLAGS and _LIBS available
-AC_SUBST(GSTPB_BASE_CFLAGS)
-AC_SUBST(GSTPB_BASE_LIBS)
-
-dnl If we need them, we can also use the gstreamer-controller libraries
-PKG_CHECK_MODULES(GSTCTRL,
-                  gstreamer-controller-$GST_MAJORMINOR >= $GSTPB_REQUIRED,
-                  HAVE_GSTCTRL=yes, HAVE_GSTCTRL=no)
-
-dnl Give a warning if we don't have gstreamer-controller
-dnl you can turn this into an error if you need them
-if test "x$HAVE_GSTCTRL" = "xno"; then
-  AC_MSG_NOTICE(no GStreamer Controller libraries found (gstreamer-controller-$GST_MAJORMINOR))
-fi
-
-dnl make _CFLAGS and _LIBS available
-AC_SUBST(GSTCTRL_CFLAGS)
-AC_SUBST(GSTCTRL_LIBS)
-
 dnl set the plugindir where plugins should be installed
 if test "x${prefix}" = "x$HOME"; then
   ppsdir="$HOME/.gstreamer-$GST_MAJORMINOR/plugins"