Skip to content

Commit

Permalink
Revert "Fix bootstrap to work where aclocal is..."
Browse files Browse the repository at this point in the history
This reverts commit f12fbe8.

I just observed how preferring of 1.10 over 1.12 caused innocent
people pain.

Lack of forward-compatibility in this entire approach of preferring
some specific version over canonical one is evident and should not be
accepted.

Users who want some extra costumizations can do it by setting right
environment variables or by implementing shell wrappers.

Change-Id: I046a47828b51b9464445fe161cce61f4de398065
  • Loading branch information
Aliaksey Kandratsenka committed May 4, 2012
1 parent f12fbe8 commit ecfe656
Showing 1 changed file with 2 additions and 35 deletions.
37 changes: 2 additions & 35 deletions bootstrap
@@ -1,40 +1,7 @@
#!/bin/sh -e
#!/bin/sh

git log >ChangeLog

mkdir -p m4

# Seach a list of names for the first occurence of a program.
# Some systems may use aclocal-1.10, others may have aclocal etc.
#
# Exit with status code 0 if the program exists (and print the
# path to stdout), exit with status code 1 if it can't be
# located
find_program() {
set +e
for f in "$@"
do
file=`which ${f} 2>/dev/null | grep -v '^no '`
if test -n "x${file}" -a -x "${file}"
then
echo ${file}
set -e
exit 0
fi
done

echo "Failed to locate required program:" 1>&2
echo "\t$@" 1>&2
set -e
exit 1
}

LIBTOOLIZE=`find_program glibtoolize libtoolize`
ACLOCAL=`find_program aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal`
AUTOHEADER=`find_program autoheader`
AUTOMAKE=`find_program automake-1.11 automake-1.10 automake-1.9 automake`
AUTOCONF=`find_program autoconf`

export AUTOCONF AUTOMAKE AUTOHEADER ACLOCAL LIBTOOLIZE
mkdir m4

autoreconf -i --force --verbose

0 comments on commit ecfe656

Please sign in to comment.