6d726b6c09
PR: 166836 Tested by: Multiple -exp runs (pav)
92 lines
2.5 KiB
Text
92 lines
2.5 KiB
Text
--- bootstrap.orig 2011-02-22 11:06:38.000000000 -0800
|
|
+++ bootstrap 2012-05-03 17:40:55.000000000 -0700
|
|
@@ -18,63 +18,2 @@
|
|
|
|
-DIE=0
|
|
-
|
|
-have_libtool=false
|
|
-if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
|
|
- libtool_version=`$LIBTOOLIZE --version | sed 's/.*) \([0-9.][0-9.]*\).*/\1/'`
|
|
-# echo libtool version: $libtool_version
|
|
- case $libtool_version in
|
|
- 1.4*|1.5*|2.0*|2.2*|2.4*)
|
|
- have_libtool=true
|
|
- ;;
|
|
- esac
|
|
-fi
|
|
-if $have_libtool ; then : ; else
|
|
- echo
|
|
- echo "You must have libtool 1.4 or later 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
|
|
-
|
|
-# Assume if we have this that aclocal and autoheader are available
|
|
-have_autoconf=false
|
|
-if $AUTOCONF --version < /dev/null > /dev/null 2>&1 ; then
|
|
- autoconf_version=`$AUTOCONF --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
|
|
-# echo autoconf version: $autoconf_version
|
|
- case $autoconf_version in
|
|
- 2.5*|2.6*)
|
|
- have_autoconf=true
|
|
- ;;
|
|
- esac
|
|
-fi
|
|
-if $have_autoconf ; then : ; else
|
|
- 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
|
|
-fi
|
|
-
|
|
-have_automake=false
|
|
-if $AUTOMAKE --version < /dev/null > /dev/null 2>&1 ; then
|
|
- automake_version=`$AUTOMAKE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
|
|
-# echo automake version: $automake_version
|
|
- case $automake_version in
|
|
- 1.7*|1.8*|1.9*|1.10*|1.11*)
|
|
- have_automake=true
|
|
- ;;
|
|
- esac
|
|
-fi
|
|
-if $have_automake ; then : ; else
|
|
- echo
|
|
- echo "You must have automake 1.7.x or later 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
|
|
-
|
|
-if test "$DIE" -eq 1; then
|
|
- exit 1
|
|
-fi
|
|
-
|
|
test $TEST_TYPE $FILE || {
|
|
@@ -98,25 +37 @@
|
|
$AUTOCONF || exit $?
|
|
-
|
|
-cd $ORIGDIR || exit $?
|
|
-
|
|
-echo
|
|
-echo "I am going to run ./configure with the following arguments:"
|
|
-echo
|
|
-echo " --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS $@"
|
|
-echo
|
|
-
|
|
-if test -z "$*"; then
|
|
- echo "If you wish to pass additional arguments, please specify them "
|
|
- echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS "
|
|
- echo "environment variable."
|
|
- echo
|
|
-fi
|
|
-
|
|
-$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@"
|
|
-RC=$?
|
|
-if test $RC -ne 0; then
|
|
- echo
|
|
- echo "Configure failed or did not finish!"
|
|
- exit $RC
|
|
-fi
|
|
-
|