[fdo-commits] r2638 - trunk/Providers/WMS

[svn_fdo at osgeo.org]

Author: gregboone
Date: 2007-03-04 13:09:51 -0500 (Sun, 04 Mar 2007)
New Revision: 2638

Modified:
   trunk/Providers/WMS/configure
   trunk/Providers/WMS/configure.in
Log:
Ticket #5: Update to GDAL 1.4.0

Modified: trunk/Providers/WMS/configure
===================================================================
--- trunk/Providers/WMS/configure	2007-03-04 18:03:22 UTC (rev 2637)
+++ trunk/Providers/WMS/configure	2007-03-04 18:09:51 UTC (rev 2638)
@@ -1053,7 +1053,7 @@
                           default=DEFAULT
   --with-fdo-thirdparty   specifies directory for FDO API Thirdparty files
                           default=DEFAULT
-  --with-fdo-gdal         specifies directory for thirdparty GDAL files
+  --with-fdo-gdal         specifies directory for the installed GDAL files
                           default=DEFAULT
 
 Some influential environment variables:
@@ -18767,8 +18767,7 @@
 fi;
 
 if test $custom_fdo_gdal = "DEFAULT"; then
-    FDOTHIRDPARTY="$PWD/Thirdparty/gdal"
-    if test -d $FDOGDAL; then
+    if test -d $FDOGDAL && test ! $FDOGDAL = ""; then
         { echo "$as_me:$LINENO: Building with default location of thirdparty GDAL files at $FDOGDAL" >&5
 echo "$as_me: Building with default location of thirdparty GDAL files at $FDOGDAL" >&6;}
     else
@@ -18778,7 +18777,7 @@
     fi
 else
     if test -d $custom_fdo_gdal; then
-        FDOTHIRDPARTY="$custom_fdo_gdal"
+        FDOGDAL="$custom_fdo_gdal"
         { echo "$as_me:$LINENO: Building with custom location of thirdparty GDAL files at $FDOGDAL" >&5
 echo "$as_me: Building with custom location of thirdparty GDAL files at $FDOGDAL" >&6;}
     else

Modified: trunk/Providers/WMS/configure.in
===================================================================
--- trunk/Providers/WMS/configure.in	2007-03-04 18:03:22 UTC (rev 2637)
+++ trunk/Providers/WMS/configure.in	2007-03-04 18:09:51 UTC (rev 2638)
@@ -105,20 +105,19 @@
 
 AC_ARG_WITH([fdo-gdal],
         FDO_HELP_STRING([--with-fdo-gdal],
-                        [specifies directory for thirdparty GDAL files [[default=DEFAULT]]]),
+                        [specifies directory for the installed GDAL files [[default=DEFAULT]]]),
         [custom_fdo_gdal=$withval],
         [custom_fdo_gdal=DEFAULT])
 
 if test $custom_fdo_gdal = "DEFAULT"; then
-    FDOTHIRDPARTY="$PWD/Thirdparty/gdal"
-    if test -d $FDOGDAL; then
+    if test -d $FDOGDAL && test ! $FDOGDAL = ""; then
         AC_MSG_NOTICE([Building with default location of thirdparty GDAL files at $FDOGDAL])
     else
        AC_MSG_ERROR([The default GDAL path $custom_fdo_gdal is not a valid directory. Please use the custom option])
     fi
 else 
     if test -d $custom_fdo_gdal; then
-        FDOTHIRDPARTY="$custom_fdo_gdal"
+        FDOGDAL="$custom_fdo_gdal"
         AC_MSG_NOTICE([Building with custom location of thirdparty GDAL files at $FDOGDAL])
     else 
         AC_MSG_ERROR([The specified GDAL path $custom_fdo_gdal is not a valid directory])