- updated patches, removed obsolete

[packages/gdal.git] / gdal-sh.patch

diff --git a/gdal-sh.patch b/gdal-sh.patch
index 873f02caf2de6a99a5e4455ba9abebd4e92671e4..79fd60c936128291b635710c8c74add1b8e2a50b 100644 (file)
--- a/gdal-sh.patch
+++ b/gdal-sh.patch
@@ -1,24 +1,11 @@
---- gdal-1.2.5/configure.in.orig       2005-01-16 03:01:31.252567000 +0100
-+++ gdal-1.2.5/configure.in    2005-01-16 03:09:32.131462448 +0100
-@@ -1111,9 +1111,9 @@
-       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.])
-   fi
- 
--  MYSQL_VERSION="`$MYSQL_CONFIG --version`"
-+  MYSQL_VERSION="`$MYSQL_CONFIG --version | cut -d . -f 1`"
- 
--  if test ${MYSQL_VERSION:0:1} -ge 4 ; then
-+  if test ${MYSQL_VERSION} -ge 4 ; then
-       HAVE_MYSQL=yes
-       MYSQL_LIB="`$MYSQL_CONFIG --libs`"
-       MYSQL_INC="`$MYSQL_CONFIG --include`"
-@@ -1388,7 +1388,8 @@
- if test "$GEOS_CONFIG" != "no" ; then
- 
-   VERSION=`$GEOS_CONFIG --version`
--  if test "${VERSION:0:1}" -lt 2 ; then
-+  MAJORVER=`echo $VERSION | cut -d . -f 1`
-+  if test $MAJORVER -lt 2 ; then
-     AC_MSG_ERROR([geos-config reports version $VERSION, need at least 2.0 or configure --without-geos])
-   fi
- 
+--- gdal-1.9.0/configure.ac.orig       2012-01-04 08:03:42.000000000 +0100
++++ gdal-1.9.0/configure.ac    2012-01-19 20:50:08.902476176 +0100
+@@ -1493,7 +1493,7 @@
+       AC_MSG_CHECKING([libnetcdf version with $ncdump]) 
+       netcdf_version=`$ncdump 2>&1 | grep "netcdf library version" | awk '{gsub(/"/,"");print $4}'`
+       AC_MSG_RESULT([got $netcdf_version])
+-      if test "$netcdf_version" != "" -a "${netcdf_version:0:1}" == "4" ; then
++      if test "$netcdf_version" != "" -a "$(echo ${netcdf_version} | sed 's/^\(.\).*/\1/')" == "4" ; then
+           nc_config=$NETCDF_ROOT"/bin/nc-config"
+       fi
+     fi