[gst-cvs] gst-plugins-gl: configure: require autoconf 2.60, automake 1.10, and gettext 0.17
Tim Müller
tpm at kemper.freedesktop.org
Wed Aug 11 15:33:28 PDT 2010
Module: gst-plugins-gl
Branch: master
Commit: 4db0099f378aa998cdfa5127b62f48f6a1e93545
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-gl/commit/?id=4db0099f378aa998cdfa5127b62f48f6a1e93545
Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date: Wed Aug 11 17:59:40 2010 +0100
configure: require autoconf 2.60, automake 1.10, and gettext 0.17
As we do for the other modules. Also, cvs => git.
---
README | 10 +++++-----
REQUIREMENTS | 14 ++++----------
autogen.sh | 11 +++++------
configure.ac | 20 ++++++++++----------
4 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/README b/README
index 908386d..75bd03b 100644
--- a/README
+++ b/README
@@ -154,7 +154,7 @@ Only in cases where you:
- want to hack on GStreamer
- want to verify that a bug has been fixed
- do not have a sane distribution
-should you choose to build from source tarballs or CVS.
+should you choose to build from source tarballs or git.
Find more information about the various packages at
http://gstreamer.freedesktop.org/download/
@@ -190,13 +190,13 @@ COMPILING FROM SOURCE TARBALLS
functionality you're probably looking for by now, so go on and read
that README.
-COMPILING FROM CVS
+COMPILING FROM GIT
------------------
-When building from CVS sources, you will need to run autogen.sh to generate
+When building sources from git, you will need to run autogen.sh to generate
the build system files.
-You will need a set of additional tools typical for building from CVS,
+You will need a set of additional tools typical for building from git,
including:
- autoconf
- automake
@@ -219,7 +219,7 @@ the last passed options as a handy shortcut. Use it.
After the autogen.sh stage, you can follow the directions listed in
"COMPILING FROM SOURCE"
-You can also run your whole cvs stack uninstalled. The script in
+You can also run your whole git stack uninstalled. The script in
the gstreamer module /docs/faq/gst-uninstalled) is helpful in setting
up your environment for this.
diff --git a/REQUIREMENTS b/REQUIREMENTS
index dff3c9b..b39ae0e 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -11,10 +11,10 @@ Required tools:
An extra set of tools is required if you wish to build GStreamer out of
CVS (using autogen.sh):
-autoconf 2.52 or better
-automake 1.5
-gettext 0.11.5
-libtool v1.4 or better
+autoconf 2.60 or better
+automake 1.10
+gettext 0.17
+libtool v1.5 or better
pkgconfig 0.9.0 or better (http://www.freedesktop.org/software/pkgconfig/)
Required libraries:
@@ -32,12 +32,6 @@ Notes: The required version is updated frequently, so the version
listed in this file is often wrong. If you are compiling from CVS,
the required version is often the latest GStreamer CVS.
-Package: liboil
-Version: >= 0.3.8
-Recommended: 0.3.latest
-URL: http://liboil.freedesktop.org/
-DebianPackage: liboil0.3-dev
-
Package: glew
Version: >= 1.4.0
Recommended: 1.5.latest
diff --git a/autogen.sh b/autogen.sh
index bb50c9f..d52dd5a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,12 +35,12 @@ autogen_options $@
echo -n "+ check for build tools"
if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf259 autoconf257 autoconf-2.54 autoconf-2.53 autoconf-2.52" \
- "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.9 automake19 automake-1.7 automake-1.6 automake-1.5" \
- "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1
+version_check "autoconf" "$AUTOCONF autoconf autoconf2.65 autoconf2.64 autoconf2.63 autoconf2.62 autoconf2.61 autoconf2.60" \
+ "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 60 || DIE=1
+version_check "automake" "$AUTOMAKE automake automake-1.12 automake-1.11 automake-1.10" \
+ "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1
version_check "gettext" "gettext" \
- "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1
+ "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
version_check "autopoint" "autopoint" \
"ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1
version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
@@ -50,7 +50,6 @@ version_check "pkg-config" "" \
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 cc8febd..cc5135b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_PREREQ(2.52)
+AC_PREREQ(2.60)
dnl please read gstreamer/docs/random/autotools before changing this file
dnl initialize autoconf
-dnl releases only do -Wall, cvs and prerelease does -Werror too
-dnl use a three digit version number for releases, and four for cvs/prerelease
+dnl releases only do -Wall, git and prerelease does -Werror too
+dnl use a three digit version number for releases, and four for git/prerelease
AC_INIT(GStreamer OpenGL Plug-ins, 0.10.1.2,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-plugins-gl)
@@ -12,13 +12,13 @@ AC_INIT(GStreamer OpenGL Plug-ins, 0.10.1.2,
AG_GST_INIT
dnl initialize automake
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wno-portability 1.10])
dnl define PACKAGE_VERSION_* variables
AS_VERSION
dnl check if this is a release version
-AS_NANO(GST_CVS="no", GST_CVS="yes")
+AS_NANO(GST_GIT="no", GST_GIT="yes")
dnl libtoolize complains about wrong macros
AC_CONFIG_MACRO_DIR([m4])
@@ -77,7 +77,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
dnl set up gettext
dnl the version check needs to stay here because autopoint greps for it
-AM_GNU_GETTEXT_VERSION([0.11.5])
+AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
AG_GST_GETTEXT([gst-plugins-gl-$GST_MAJORMINOR])
@@ -347,11 +347,11 @@ dnl set location of plugin directory
AG_GST_SET_PLUGINDIR
dnl define an ERROR_CFLAGS Makefile variable
-AG_GST_SET_ERROR_CFLAGS($GST_CVS)
-AG_GST_SET_ERROR_CXXFLAGS($GST_CVS)
+AG_GST_SET_ERROR_CFLAGS($GST_GIT)
+AG_GST_SET_ERROR_CXXFLAGS($GST_GIT)
dnl define correct level for debugging messages
-AG_GST_SET_LEVEL_DEFAULT($GST_CVS)
+AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
dnl used in examples
AG_GST_DEFAULT_ELEMENTS
@@ -399,7 +399,7 @@ if test "x$USE_DEBUG" = xyes; then
fi
AC_SUBST(PROFILE_CFLAGS)
-if test "x$GST_CVS" = "xyes"; then
+if test "x$GST_GIT" = "xyes"; then
DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED"
else
DEPRECATED_CFLAGS=""
More information about the Gstreamer-commits
mailing list