X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config%2Fbootstrap;h=fa2cb512e947708188b8960e71902e2f4b553258;hb=baf931721d1b37ac06ea5126ac038cca2d413d91;hp=624c14570987c575ffd6ec9e62e1d5c582f440b7;hpb=929a8caf41ed6e616b24d02fad4281a316e55751;p=m6w6%2Flibmemcached 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