[glib-networking] autogen.sh: recopy from glib
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] autogen.sh: recopy from glib
- Date: Tue, 8 May 2012 19:19:34 +0000 (UTC)
commit 57be1e8d2aa572a5982d9575c95b4bcf5078ddd9
Author: Dan Winship <danw gnome org>
Date: Tue May 8 15:18:37 2012 -0400
autogen.sh: recopy from glib
glib's autogen.sh has been simplified to use autoreconf rather than
doing everything by hand. Copy it here.
Among other things, this fixes us to be able to build with automake
1.12.
https://bugzilla.gnome.org/show_bug.cgi?id=675261
autogen.sh | 108 ++++++-----------------------------------------------------
1 files changed, 11 insertions(+), 97 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index b019aa7..88ce246 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,105 +1,19 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=glib-networking
-TEST_TYPE=-f
-FILE=proxy/libproxy/glibproxyresolver.h
+olddir=`pwd`
+cd "$srcdir"
-DIE=0
-
-have_libtool=false
-if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
- libtool_version=`libtoolize --version |
- head -1 |
- sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
- -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- case $libtool_version in
- 2.2*)
- have_libtool=true
- ;;
- 2.4*)
- have_libtool=true
- ;;
- esac
-fi
-if $have_libtool ; then : ; else
- echo
- echo "You must have libtool >= 2.2 installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
- DIE=1
-fi
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have autoconf installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
- DIE=1
-}
-
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
- AUTOMAKE=automake-1.11
- ACLOCAL=aclocal-1.11
-else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
- AUTOMAKE=automake-1.10
- ACLOCAL=aclocal-1.10
-else
- echo
- echo "You must have automake 1.10.x or 1.11.x installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
- DIE=1
-fi
-fi
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-test $TEST_TYPE $FILE || {
- echo "You must run this script in the top-level $PROJECT directory"
- exit 1
-}
-
-# NOCONFIGURE is used by gnome-common; support both
-if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
- NOCONFIGURE=1
-fi
-
-if test -z "$NOCONFIGURE"; then
- if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
- fi
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+ echo "*** No autoreconf found, please install it ***"
+ exit 1
fi
-rm -rf autom4te.cache
-
-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
-
-$ACLOCAL $ACLOCAL_FLAGS || exit $?
+autoreconf --force --install --verbose || exit $?
-libtoolize --force || exit $?
-intltoolize --force --copy || exit $?
-
-autoheader || exit $?
-
-$AUTOMAKE --add-missing || exit $?
-autoconf || exit $?
-cd $ORIGDIR || exit $?
-
-if test -z "$NOCONFIGURE"; then
- $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
-
- echo
- echo "Now type 'make' to compile $PROJECT."
-fi
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]