Unify the execution flow for fetch related functions and fix memcached_fetch_execute...

[awesomized/libmemcached] / config / bootstrap

diff --git a/config/bootstrap b/config/bootstrap
index 624c14570987c575ffd6ec9e62e1d5c582f440b7..fa2cb512e947708188b8960e71902e2f4b553258 100755 (executable)
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -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