femsci/toilet
femsci/toilet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: update bootstrap script.

Browse source
This commit is contained in:
Sam Hocevar 2013-06-17 13:09:07 +00:00 committed by sam
parent 784ea9a179
commit f35c90ff3e
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bootstrap
View file

@ -2,16 +2,16 @@
# bootstrap: generic bootstrap/autogen.sh script for autotools projects # bootstrap: generic bootstrap/autogen.sh script for autotools projects
# #
# Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net> # Copyright (c) 2002-2010 Sam Hocevar <sam@hocevar.net>
# #
# This program is free software. It comes without any warranty, to # This program is free software. It comes without any warranty, to
# the extent permitted by applicable law. You can redistribute it # the extent permitted by applicable law. You can redistribute it
# and/or modify it under the terms of the Do What The Fuck You Want # 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 # To Public License, Version 2, as published by Sam Hocevar. See
# http://sam.zoy.org/wtfpl/COPYING for more details. # http://www.wtfpl.net/ 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:
# http://caca.zoy.org/wiki/build # http://caca.zoy.org/wiki/build
# Die if an error occurs # Die if an error occurs
set -e set -e
@ -36,7 +36,7 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/n
# Check for automake # Check for automake
amvers="no" amvers="no"
for v in 11 10 9 8 7 6 5; do for v in 13 12 11 10 9 8 7 6 5; do
if automake-1.${v} --version >/dev/null 2>&1; then if automake-1.${v} --version >/dev/null 2>&1; then
amvers="-1.${v}" amvers="-1.${v}"
break break
@ -109,9 +109,20 @@ 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 -I ." aclocalflags="-I $auxdir -I . ${aclocalflags}"
fi fi
# Honour M4PATH because sometimes M4 doesn't
save_IFS=$IFS
IFS=:
tmp="$M4PATH"
for x in $tmp; do
if test -n "$x"; then
aclocalflags="-I $x ${aclocalflags}"
fi
done
IFS=$save_IFS
# Explain what we are doing from now # Explain what we are doing from now
set -x set -x