X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config%2Fbootstrap;h=d62ca6ba87f7cbc9afe7be5d40a1f55d82778dcb;hb=921abbe1906e77cc18cbe8859bc5afe9494d780e;hp=cc463d86d6abbf5ab36688ac8a88461a5940c05f;hpb=375ad7d822a4bbc121a79ce7e927385d6be7f754;p=awesomized%2Flibmemcached

diff --git a/config/bootstrap b/config/bootstrap
index cc463d86..d62ca6ba 100755
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Taken from lighthttpd server (BSD). Thanks Jan!
 # Run this to generate all the initial makefiles, etc.
 
@@ -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"
@@ -26,9 +27,9 @@ set -e
 
 ## We do not currently support glibtoolize
 if test x$LIBTOOLIZE = x; then
-#  if test \! "x`which glibtoolize 2> /dev/null | grep -v '^no'`" = x; then
-#    LIBTOOLIZE=glibtoolize
-  if test \! "x`which libtoolize-1.5 2> /dev/null | grep -v '^no'`" = x; then
+  if test \! "x`which glibtoolize 2> /dev/null | grep -v '^no'`" = x; then
+    LIBTOOLIZE=glibtoolize
+  elif test \! "x`which libtoolize-1.5 2> /dev/null | grep -v '^no'`" = x; then
     LIBTOOLIZE=libtoolize-1.5
   elif test \! "x`which libtoolize 2> /dev/null | grep -v '^no'`" = x; then
     LIBTOOLIZE=libtoolize
@@ -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"