beast r4444 - trunk

[timj svn gnome org]

Author: timj
Date: Thu Jan 24 21:38:59 2008
New Revision: 4444
URL: http://svn.gnome.org/viewvc/beast?rev=4444&view=rev

Log:
Support automake-1.10.

2008-01-24 22:37:55  Tim Janik  <timj gtk org>

        * autogen.sh: removed automake max-version check because
          automake-1.10
        seems to work fine these days. suppress automake warnings about GNU
        make features.


Modified:
   trunk/ChangeLog
   trunk/autogen.sh

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Thu Jan 24 21:38:59 2008
@@ -7,7 +7,6 @@
 AUTOMAKE=automake
 AUTOMAKE_POSTFIX=1.9
 AUTOMAKE_VERSION=1.9
-AUTOMAKE_MAXVERSION=1.9
 ACLOCAL=aclocal
 AUTOCONF=autoconf
 AUTOCONF_POSTFIX=2.50
@@ -77,14 +76,6 @@
 	DIE=1
 fi
 
-# due to automake release incompatibilities, check max-version
-check_version $AUTOMAKE_MAXVERSION.9999 "`$AUTOMAKE --version 2>/dev/null | sed 1q`" || {
-	echo "You need to have $AUTOMAKE (version <= $AUTOMAKE_MAXVERSION) installed to compile $PROJECT."
-	echo "Download the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake";
-	DIE=1
-}
-
 # check for autoconf
 if check_version "`$AUTOCONF --version 2>/dev/null | sed 1q`" $AUTOCONF_VERSION ; then
 	:	# all fine
@@ -174,7 +165,7 @@
 case $CC in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
-$AUTOMAKE --force-missing --add-missing $am_opt || exit $?
+$AUTOMAKE -Wno-portability --force-missing --add-missing $am_opt || exit $?
 
 echo "Running: $AUTOCONF"
 $AUTOCONF || exit $?