Changeset: 7d5a15c7c655 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d5a15c7c655
Modified Files:
        bootstrap
Branch: Jan2014
Log Message:

automake-1.11 is also a viable option for OpenIndiana.


diffs (21 lines):

diff --git a/bootstrap b/bootstrap
--- a/bootstrap
+++ b/bootstrap
@@ -31,10 +31,13 @@ type -P glibtoolize > /dev/null \
 
 # cope with systems where aclocal is known as aclocal-1.10 (and
 # automake as automake-1.10), e.g. OpenIndiana
-if ! type -P aclocal > /dev/null && type -P aclocal-1.10 > /dev/null; then
-    amv=-1.10
-else
-    amv=
+amv=
+if ! type -P aclocal > /dev/null; then
+    if type -P aclocal-1.11 > /dev/null; then
+       amv=-1.11
+    elif type -P aclocal-1.10 > /dev/null; then
+       amv=-1.10
+    fi
 fi
 
 _m4_extra_dirs=
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to