* New version of the bootstrap script.

This commit is contained in:
Sam Hocevar 2007-09-30 15:44:21 +00:00 committed by sam
parent a2e04d85e7
commit 43b9df4ff1

View file

@ -1,11 +1,12 @@
#! /bin/sh #! /bin/sh
# bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects # bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects
# Copyright (c) 2002, 2003, 2004, 2005, 2006 Sam Hocevar <sam@zoy.org> # Copyright (c) 2002-2007 Sam Hocevar <sam@zoy.org>
# #
# This program is free software; you can redistribute it and/or # This program is free software. It comes without any warranty, to
# modify it under the terms of the Do What The Fuck You Want To # the extent permitted by applicable law. You can redistribute it
# Public License, Version 2, as published by Sam Hocevar. See # and/or modify it under the terms of the Do What The Fuck You Want
# To Public License, Version 2, as published by Sam Hocevar. See
# http://sam.zoy.org/wtfpl/COPYING for more details. # http://sam.zoy.org/wtfpl/COPYING for more details.
# #
# The latest version of this script can be found at the following place: # The latest version of this script can be found at the following place:
@ -25,19 +26,21 @@ else
fi fi
# Check for needed features # Check for needed features
auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *( *\([^ )]*\).*/\1/p' $conffile`" auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`" libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`" header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am`" aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am`"
# Check for automake # Check for automake
amvers="no" amvers="no"
for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do for n in 10 9 8 7 6 5; do
for v in "-1.${n}" "1${n}"; do
if automake${v} --version >/dev/null 2>&1; then if automake${v} --version >/dev/null 2>&1; then
amvers="${v}" amvers="${v}"
break break
fi fi
done done
done
if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`" amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
@ -94,7 +97,7 @@ if test -n "$auxdir"; then
if test ! -d "$auxdir"; then if test ! -d "$auxdir"; then
mkdir "$auxdir" mkdir "$auxdir"
fi fi
aclocalflags="${aclocalflags} -I $auxdir" aclocalflags="${aclocalflags} -I $auxdir -I ."
fi fi
# Explain what we are doing from now # Explain what we are doing from now