From fcb7587c02dea5a7fe6093e765b43dfba33bdb09 Mon Sep 17 00:00:00 2001
From: Francesco Salvestrini <salvestrini@gmail.com>
Date: Thu, 30 Oct 2008 19:08:22 +0100
Subject: [PATCH] Patched bootstrap for OSX environment

---
 bootstrap | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/bootstrap b/bootstrap
index 127d628..f2cfd1e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -22,13 +22,34 @@
 
 ME=bootstrap
 
+AUTOHEADER=`which autoheader`
+ACLOCAL=`which aclocal`
+AUTOCONF=`which autoconf`
+AUTOMAKE=`which automake`
+AUTORECONF=`which autoreconf`
+LIBTOOL=`which glibtool || which libtool`
+LIBTOOLIZE=`which glibtoolize || which libtoolize`
+GNULIBTOOL=`which gnulib-tool`
+
 #
 # Dump some useful informations
 #
 echo "$ME: Dumping build-tools information ..."
-for tool in autoheader autoconf libtool libtoolize aclocal automake; do
-    TOOLVER=`$tool --version | head -1`
-    echo "$ME:   $TOOLVER"
+for tool in	\
+    $AUTOHEADER	\
+    $AUTOCONF	\
+    $LIBTOOL	\
+    $LIBTOOLIZE	\
+    $ACLOCAL	\
+    $AUTOMAKE	\
+    $AUTORECONF	\
+    $GNULIBTOOL \
+;
+do
+    if test -n "$tool" ; then
+	TOOLVER=`$tool --version | head -1`
+	echo "$ME:  $tool -> $TOOLVER"
+    fi
 done
 
 #
@@ -44,8 +65,8 @@ rm -rf `find ./ -name ".deps"`                       || exit 1
 #
 # Call gnulib
 #
-if test -n "`which gnulib-tool`" ; then
-    gnulib-tool --lgpl --no-changelog --aux-dir ./tools/autotools --m4-base ./tools/autotools/m4 --source-base=./src/gnulib --macro-prefix GNULIB --no-vc-files --import crypto/md5 crypto/sha1 getopt || exit 1
+if test -n "$GNULIBTOOL" ; then
+    $GNULIBTOOL --lgpl --no-changelog --aux-dir ./tools/autotools --m4-base ./tools/autotools/m4 --source-base=./src/gnulib --macro-prefix GNULIB --no-vc-files --import crypto/md5 crypto/sha1 getopt || exit 1
 fi
 
 #
@@ -64,8 +85,8 @@ chmod a-w configure.ac
 echo "$ME: Handling autotools bootstrap ..."
 
 echo "$ME: Running autoreconf ..."
-aclocal    --force --install -I ./tools/autotools/m4 && \
-autoreconf --verbose --force --install -Wall         || {
+$ACLOCAL    --force --install -I ./tools/autotools/m4 && \
+$AUTORECONF --verbose --force --install -Wall         || {
     exit 1
 }
 
-- 
2.11.4.GIT