projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
54fa240
)
bootstrap should search for aclocal-1.10 and automake-1.10 as well
author
Trond Norbye
<trond.norbye@sun.com>
Fri, 28 Nov 2008 23:04:30 +0000
(
00:04
+0100)
committer
Trond Norbye
<trond.norbye@sun.com>
Fri, 28 Nov 2008 23:04:30 +0000
(
00:04
+0100)
config/bootstrap
patch
|
blob
|
history
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
## 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
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
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
AUTOMAKE=automake-1.9
elif test \! "x`which automake19 2> /dev/null | grep -v '^no'`" = x; then
AUTOMAKE=automake19