gst-plugins-ugly: configure: Modernize autotools setup a bit

Sebastian Dröge slomo at kemper.freedesktop.org
Fri Apr 13 05:01:54 PDT 2012


Module: gst-plugins-ugly
Branch: master
Commit: 1f8d9315b8c93edafb672bcfccc4527230168442
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=1f8d9315b8c93edafb672bcfccc4527230168442

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Fri Apr 13 13:43:30 2012 +0200

configure: Modernize autotools setup a bit

Also we now only create tar.bz2 and tar.xz tarballs.

---

 autogen.sh   |   11 +++++------
 configure.ac |   16 +++++-----------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index c41ff0f..a1dbbb7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -39,20 +39,19 @@ autogen_options $@
 
 printf "+ check for build tools"
 if test ! -z "$NOCHECK"; then echo " skipped"; else  echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262 autoconf261 autoconf260" \
-              "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 60 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.11 automake-1.10" \
-              "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1
+version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262" \
+              "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 62 || DIE=1
+version_check "automake" "$AUTOMAKE automake automake-1.11" \
+              "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1
 version_check "autopoint" "autopoint" \
               "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
 version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
-              "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
+              "ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 6 || DIE=1
 version_check "pkg-config" "" \
               "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
 
 die_check $DIE
 
-autoconf_2_52d_check || DIE=1
 aclocal_check || DIE=1
 autoheader_check || DIE=1
 
diff --git a/configure.ac b/configure.ac
index 118876d..7ce0cb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ(2.60)
+AC_PREREQ(2.62)
 
 dnl please read gstreamer/docs/random/autotools before changing this file
 
@@ -12,7 +12,7 @@ AC_INIT(GStreamer Ugly Plug-ins, 0.11.90.1,
 AG_GST_INIT
 
 dnl initialize automake
-AM_INIT_AUTOMAKE([-Wno-portability 1.10])
+AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar])
 
 dnl define PACKAGE_VERSION_* variables
 AS_VERSION
@@ -27,7 +27,7 @@ dnl define the output header for config
 AM_CONFIG_HEADER(config.h)
 
 dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 
 dnl sets host_* variables
 AC_CANONICAL_HOST
@@ -44,13 +44,7 @@ AC_SUBST(GST_API_VERSION)
 AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
   [GStreamer API Version])
 
-dnl FIXME: this macro doesn't actually work;
-dnl the generated libtool script has no support for the listed tags.
-dnl So this needs to be fixed first if we want to use this
-dnl AS_LIBTOOL_TAGS([CXX])
-
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AS_LIBTOOL(GST, 0, 0, 0)
 
 dnl *** required versions of GStreamer stuff ***
 GST_REQ=0.11.90
@@ -130,7 +124,7 @@ AG_GST_PLUGIN_DOCS([1.3],[2.1])
 dnl *** checks for libraries ***
 
 dnl check for libm, for sin()
-AC_CHECK_LIBM
+LT_LIB_M
 AC_SUBST(LIBM)
 
 dnl *** checks for header files ***



More information about the gstreamer-commits mailing list