Changeset: 814a58276c20 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=814a58276c20
Modified Files:
        
Branch: default
Log Message:

merge with Jun2010: cope with (old) sed (e.g. on Solaris) that do not support 
"\(...\|...\)"


diffs (12 lines):

diff -r 75fb1faa9477 -r 814a58276c20 buildtools/conf/Mbootstrap.in
--- a/buildtools/conf/Mbootstrap.in     Tue Jul 06 17:58:33 2010 +0200
+++ b/buildtools/conf/Mbootstrap.in     Wed Jul 07 00:15:52 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\|libtool\)/{s/([^)]*)//g;s/\(ltmain\.sh\|libtool\)//g;s/ 
//g;p;q;}'`
+LT_VERSION=`$LIBTOOL --version 2>/dev/null | sed -n -e 
'/^ltmain\.sh/{s/([^)]*)//g;s/ltmain\.sh//g;s/ //g;p;q;}' -e 
'/^libtool/{s/([^)]*)//g;s/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

Reply via email to