From: Trond Norbye <trond.norbye@sun.com>
Date: Fri, 28 Nov 2008 23:04:30 +0000 (+0100)
Subject: bootstrap should search for aclocal-1.10 and automake-1.10 as well
X-Git-Tag: 0.26~37
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=84d7363d4b9ee3a85ae99d8d56185015d227413a;p=m6w6%2Flibmemcached

bootstrap should search for aclocal-1.10 and automake-1.10 as well
---

diff --git a/config/bootstrap b/config/bootstrap
index 624c1457..fa2cb512 100755
--- 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