X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config%2Fbootstrap;h=fa2cb512e947708188b8960e71902e2f4b553258;hb=21f37886246551f9118b03275dde7534793c3809;hp=74d9fa1d8491507c15e3b4f836a0413f9664c89f;hpb=1622d8b5d30bb6e8bb7f0a0612fda0bc79cb27cf;p=m6w6%2Flibmemcached

diff --git a/config/bootstrap b/config/bootstrap
index 74d9fa1d..fa2cb512 100755
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -26,9 +26,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 +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