Skip to content

Commit 10ea5eb

Browse files
author
g_j_m
committed
Further tweak to the automake sed parser as supplied b Tom Russo. Should now
cope with all known automake version strings (we hope). git-svn-id: http://svn.osgeo.org/qgis/trunk@5735 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9d7af64 commit 10ea5eb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

autogen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [ "`uname`" = "Darwin" ]; then
2222
fi
2323

2424
# Check automake version
25-
AM_VERSION=`automake --version | sed -n -e 's#[^0-9]* \([0-9]*\)\.\([0-9]*\)\.*\([0-9]*\).*$#\1 \2 \3#p'`
25+
AM_VERSION=`automake --version | sed -n -e 's#^.* \([0-9]*\)\.\([0-9]*\)[^0-9]*\([0-9]*\).*$#\1 \2 \3#p'`
2626
AM_V1=`echo $AM_VERSION | awk '{print $1}'`
2727
AM_V2=`echo $AM_VERSION | awk '{print $2}'`
2828
AM_V3=`echo $AM_VERSION | awk '{if ($NF > 2) print $3; else print "0";}'`

0 commit comments

Comments
 (0)