Merge.

[awesomized/libmemcached] / config / bootstrap

diff --git a/config/bootstrap b/config/bootstrap
index ab2e114af2502545012c588ca6ca7db4d8c32827..fa2cb512e947708188b8960e71902e2f4b553258 100755 (executable)
--- 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.
 
@@ -24,7 +24,7 @@ run() {
 ## jump out if one of the programs returns 'false'
 set -e
 
-## on macosx glibtoolize, others have libtool
+## 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
@@ -39,7 +39,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 +53,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