From 84d7363d4b9ee3a85ae99d8d56185015d227413a Mon Sep 17 00:00:00 2001 From: Trond Norbye Date: Sat, 29 Nov 2008 00:04:30 +0100 Subject: [PATCH] bootstrap should search for aclocal-1.10 and automake-1.10 as well --- config/bootstrap | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 -- 2.30.2