Changeset: b1df4a254d3e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1df4a254d3e
Modified Files:
buildtools/conf/Mbootstrap.in
Branch: Jun2010
Log Message:
merge with Feb2010:
fixing bug 2559 "libtool-2.2.10 is not called ltmain.sh anymore"
Apparently, (at least) as of libtool 2.2.10, libtool calls itself
no longer "ltmain.sh" but "libtool" in its own `--version` output;
hence, we need to adapt our version analysis in Mbootstrap.in .
Thanks go to Stefan de Konink for reporting the problem and
providing a patch.
diffs (12 lines):
diff -r 2b71eda5b9e9 -r b1df4a254d3e buildtools/conf/Mbootstrap.in
--- a/buildtools/conf/Mbootstrap.in Mon Jul 05 22:42:47 2010 +0200
+++ b/buildtools/conf/Mbootstrap.in Tue Jul 06 07:31:15 2010 +0200
@@ -111,7 +111,7 @@
echo "Please get it at eg. http://www.gnu.org/software/libtool/."; >&2
exit 1
fi
-LT_VERSION=`$LIBTOOL --version 2>/dev/null | sed -n
'/^ltmain\.sh/{s/([^)]*)//g;s/ltmain.sh//g;s/ //g;p;q;}'`
+LT_VERSION=`$LIBTOOL --version 2>/dev/null | sed -n
'/^\(ltmain\.sh\|libtool\)/{s/([^)]*)//g;s/\(ltmain\.sh\|libtool\)//g;s/
//g;p;q;}'`
_LT_VERSION=`echo $LT_VERSION | awk 'BEGIN { FS = "."; } { printf "%d", ($1 *
1000 + $2) * 1000 + $3;}'`
_REQ_LT_VERSION=`echo $REQ_LT_VERSION | awk 'BEGIN { FS = "."; } { printf
"%d", ($1 * 1000 + $2) * 1000 + $3;}'`
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
