LADI
/
clutter
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Drop version check on auto* 

Just use autoreconf, to avoid having to deal with changes in the version
of autotools.

If somebody has more recent autotools but the symbolic links used by
autoreconf are still pointing to an old version then they can also fix
their own installation, or get a better distribution.
This commit is contained in:
Emmanuele Bassi 2012-05-11 17:37:20 +01:00
parent c70a7b9470
commit ae32136fcc
1 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
autogen.sh
View File

@ -1,10 +1,10 @@
#!/bin/sh #!/bin/sh
# Run this to generate all the initial makefiles, etc. # Run this to generate all the initial makefiles, etc.
srcdir=`dirname $0` test -n "$srcdir" || srcdir=`dirname "$0"`
test -z "$srcdir" && srcdir=. test -n "$srcdir" || srcdir=.
ORIGDIR=`pwd` olddir=`pwd`
cd $srcdir cd $srcdir
PROJECT=Clutter PROJECT=Clutter
@ -20,26 +20,17 @@ test $TEST_TYPE $FILE || {
# https://bugzilla.gnome.org/show_bug.cgi?id=661128 # https://bugzilla.gnome.org/show_bug.cgi?id=661128
touch -t 200001010000 po/clutter-1.0.pot touch -t 200001010000 po/clutter-1.0.pot
if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then GTKDOCIZE=`which gtkdocize`
AUTOMAKE=automake-1.11 if test -z $GTKDOCIZE; then
ACLOCAL=aclocal-1.11 echo "*** No GTK-Doc found, please install it ***"
export AUTOMAKE ACLOCAL
else
echo
echo "You must have automake 1.11.x installed to compile $PROJECT
ECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
exit 1 exit 1
fi fi
(gtkdocize --version) < /dev/null > /dev/null 2>&1 || { AUTORECONF=`which autoreconf`
echo if test -z $AUTORECONF; then
echo "You must have gtk-doc installed to compile $PROJECT." echo "*** No autoreconf found, please install it ***"
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
exit 1 exit 1
} fi
# NOCONFIGURE is used by gnome-common # NOCONFIGURE is used by gnome-common
if test -z "$NOCONFIGURE"; then if test -z "$NOCONFIGURE"; then
@ -49,29 +40,10 @@ if test -z "$NOCONFIGURE"; then
fi fi
fi fi
if test -z "$ACLOCAL_FLAGS"; then
acdir=`$ACLOCAL --print-ac-dir`
m4list="glib-2.0.m4"
for file in $m4list; do
if [ ! -f "$acdir/$file" ]; then
echo "WARNING: aclocal's directory is $acdir, but..."
echo " no file $acdir/$file"
echo " You may see fatal macro warnings below."
echo " If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
echo " environment variable to \"-I /some/dir\", or install"
echo " $acdir/$file."
echo ""
fi
done
fi
rm -rf autom4te.cache rm -rf autom4te.cache
gtkdocize || exit $? gtkdocize || exit $?
autoreconf -vfi || exit $? autoreconf --force --install --verbose || exit $?
cd $ORIGDIR || exit $?
if test -z "$NOCONFIGURE"; then cd "$olddir"
$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
echo "Now type 'make' to compile $PROJECT."
fi