]>
Commit | Line | Data |
---|---|---|
14120dca JB |
1 | --- gdal-1.2.5/configure.in.orig 2005-01-16 03:01:31.252567000 +0100 |
2 | +++ gdal-1.2.5/configure.in 2005-01-16 03:09:32.131462448 +0100 | |
3 | @@ -1111,9 +1111,9 @@ | |
4 | AC_MSG_ERROR([--with-mysql argument is a not an executable file. It should be the path to the mysql_config script, often somewhere like /usr/local/bin/mysql_config.]) | |
5 | fi | |
6 | ||
7 | - MYSQL_VERSION="`$MYSQL_CONFIG --version`" | |
8 | + MYSQL_VERSION="`$MYSQL_CONFIG --version | cut -d . -f 1`" | |
9 | ||
10 | - if test ${MYSQL_VERSION:0:1} -ge 4 ; then | |
11 | + if test ${MYSQL_VERSION} -ge 4 ; then | |
12 | HAVE_MYSQL=yes | |
13 | MYSQL_LIB="`$MYSQL_CONFIG --libs`" | |
14 | MYSQL_INC="`$MYSQL_CONFIG --include`" | |
15 | @@ -1388,7 +1388,8 @@ | |
16 | if test "$GEOS_CONFIG" != "no" ; then | |
17 | ||
18 | VERSION=`$GEOS_CONFIG --version` | |
19 | - if test "${VERSION:0:1}" -lt 2 ; then | |
20 | + MAJORVER=`echo $VERSION | cut -d . -f 1` | |
21 | + if test $MAJORVER -lt 2 ; then | |
22 | AC_MSG_ERROR([geos-config reports version $VERSION, need at least 2.0 or configure --without-geos]) | |
23 | fi | |
24 |