merge upstream

[awesomized/libmemcached] / config / bootstrap

diff --git a/config/bootstrap b/config/bootstrap
index 624c14570987c575ffd6ec9e62e1d5c582f440b7..d62ca6ba87f7cbc9afe7be5d40a1f55d82778dcb 100755 (executable)
--- 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 m4"
 # AUTOHEADER=${AUTOHEADER:-autoheader}
 # AUTOMAKE=${AUTOMAKE:-automake}
 AUTOMAKE_FLAGS="--add-missing --copy --force"
@@ -39,7 +40,9 @@ fi
 
 ## suse has aclocal and aclocal-1.9
 if test x$ACLOCAL = x; then
-  if test \! "x`which aclocal-1.9 2> /dev/null | grep -v '^no'`" = x; then
+  if test \! "x`which aclocal-1.10 2> /dev/null | grep -v '^no'`" = x; then
+    ACLOCAL=aclocal-1.10
+  elif test \! "x`which aclocal-1.9 2> /dev/null | grep -v '^no'`" = x; then
     ACLOCAL=aclocal-1.9
   elif test \! "x`which aclocal19 2> /dev/null | grep -v '^no'`" = x; then
     ACLOCAL=aclocal19
@@ -51,7 +54,9 @@ if test x$ACLOCAL = x; then
 fi
 
 if test x$AUTOMAKE = x; then
-  if test \! "x`which automake-1.9 2> /dev/null | grep -v '^no'`" = x; then
+  if test \! "x`which automake-1.10 2> /dev/null | grep -v '^no'`" = x; then
+    AUTOMAKE=automake-1.10
+  elif test \! "x`which automake-1.9 2> /dev/null | grep -v '^no'`" = x; then
     AUTOMAKE=automake-1.9
   elif test \! "x`which automake19 2> /dev/null | grep -v '^no'`" = x; then
     AUTOMAKE=automake19
@@ -89,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"