From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 21 May 2009 06:43:36 +0000 (-0700)
Subject: Added -I option to aclocal so the system finds the right libtool.m4 file.
X-Git-Tag: 0.30~3^2~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=adb3aa8ec1a70976f92cd05a8bab4174905d3005;p=m6w6%2Flibmemcached

Added -I option to aclocal so the system finds the right libtool.m4 file.
---

diff --git a/config/bootstrap b/config/bootstrap
index fa2cb512..d252837a 100755
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -7,6 +7,7 @@ die() { echo "$@"; exit 1; }
 # LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
 LIBTOOLIZE_FLAGS=" --automake --copy --force"
 # ACLOCAL=${ACLOCAL:-aclocal}
+ACLOCAL_FLAGS="-I config"
 # AUTOHEADER=${AUTOHEADER:-autoheader}
 # AUTOMAKE=${AUTOMAKE:-automake}
 AUTOMAKE_FLAGS="--add-missing --copy --force"
@@ -93,12 +94,12 @@ if test x$AUTOHEADER = x; then
 fi
 
 
-run $ACLOCAL $ACLOCAL_FLAGS || die "Can't execute aclocal"
-run $AUTOHEADER || die "Can't execute autoheader"
-
 # --force means overwrite ltmain.sh script if it already exists 
 run $LIBTOOLIZE $LIBTOOLIZE_FLAGS || die "Can't execute libtoolize"
 
+run $ACLOCAL $ACLOCAL_FLAGS || die "Can't execute aclocal"
+run $AUTOHEADER || die "Can't execute autoheader"
+
 # --add-missing instructs automake to install missing auxiliary files
 # and --force to overwrite them if they already exist
 run $AUTOMAKE $AUTOMAKE_FLAGS  || die "Can't execute automake"