[mapserver-commits] r10548 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2010-09-30 13:14:58 +0000 (Thu, 30 Sep 2010)
New Revision: 10548

Modified:
   trunk/mapserver/README.CONFIGURE
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Added GDAL dependency check for --with-wmsclient (#3555)

Modified: trunk/mapserver/README.CONFIGURE
===================================================================
--- trunk/mapserver/README.CONFIGURE	2010-09-30 12:50:51 UTC (rev 10547)
+++ trunk/mapserver/README.CONFIGURE	2010-09-30 13:14:58 UTC (rev 10548)
@@ -114,8 +114,8 @@
   --without-wms           Disable OGC WMS Compatibility (enabled by default).
   --with-wfs              Enable OGC WFS Server Support (OGR+PROJ4 required).
   --with-wcs              Enable OGC WCS Server Support (GDAL+PROJ4 required).
-  --with-wmsclient        Enable OGC WMS Client Connections (PROJ4 and libcurl
-                          required).
+  --with-wmsclient        Enable OGC WMS Client Connections (PROJ4, libcurl and
+                          GDAL required).
   --with-wfsclient        Enable OGC WFS Client Connections (PROJ4, libcurl and
                           OGR required).
   --with-sos              Enable OGC SOS Server Support (libxml2 and PROJ4 and
@@ -520,14 +520,14 @@
 
 ::
 
-  --with-wmsclient        Enable OGC WMS Client Connections (PROJ4 and libcurl
-                          required).
+  --with-wmsclient        Enable OGC WMS Client Connections (PROJ4, libcurl and
+                          GDAL required).
 
 - This option enables MapServer's 'CONNECTIONTYPE WMS' to include layers
   from remote WMS servers in MapServer applications.
-  It requires PROJ4, libcurl (see  --with-curl-config option below) and OGR.
-  GDAL is optional but highly recommended in order to support 
-  reprojection of layers obtained from remote WMS servers.
+  It requires PROJ4, libcurl (see  --with-curl-config option below) and GDAL.
+  GDAL is required in order to support reprojection of layers obtained from 
+  remote WMS servers.
 
 - See the MapServer WMS Client HOWTO for more details at 
   http://mapserver.gis.umn.edu/docs/howto/wms_client

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2010-09-30 12:50:51 UTC (rev 10547)
+++ trunk/mapserver/configure	2010-09-30 13:14:58 UTC (rev 10548)
@@ -918,8 +918,8 @@
   --without-wms           Disable OGC WMS Compatibility (enabled by default).
   --with-wfs              Enable OGC WFS Server Support (OGR+PROJ4 required).
   --with-wcs              Enable OGC WCS Server Support (GDAL+PROJ4 required).
-  --with-wmsclient        Enable OGC WMS Client Connections (PROJ4 and libcurl
-                          required).
+  --with-wmsclient        Enable OGC WMS Client Connections (PROJ4, libcurl and
+                          GDAL required).
   --with-wfsclient        Enable OGC WFS Client Connections (PROJ4, libcurl and
                           OGR required).
   --with-sos              Enable OGC SOS Server Support (libxml2 and PROJ4 and
@@ -11934,10 +11934,10 @@
   echo "$as_me:$LINENO: result:         OGC WMS Client Layers disabled by --without-wmsclient." >&5
 echo "${ECHO_T}        OGC WMS Client Layers disabled by --without-wmsclient." >&6
 
-elif test -z "$PROJ_ENABLED" ; then
+elif test -z "$PROJ_ENABLED" -o -z "$GDAL_ENABLED"; then
 
-  echo "$as_me:$LINENO: result:         OGC WMS Client Connections not enabled (PROJ.4 and libcurl required)." >&5
-echo "${ECHO_T}        OGC WMS Client Connections not enabled (PROJ.4 and libcurl required)." >&6
+  echo "$as_me:$LINENO: result:         OGC WMS Client Connections not enabled (PROJ.4, libcurl and GDAL required)." >&5
+echo "${ECHO_T}        OGC WMS Client Connections not enabled (PROJ.4, libcurl and GDAL required)." >&6
 
 elif test "$with_wmsclient" = "yes" ; then
 
@@ -12156,9 +12156,9 @@
 echo "${ECHO_T}      If unavailable disable using --without-xml2-config," >&6
     echo "$as_me:$LINENO: result:       but WCS 1.1 support will be disabled." >&5
 echo "${ECHO_T}      but WCS 1.1 support will be disabled." >&6
-   elif test "x$WFS_SVR_ENABLED" != "x" ; then
+  elif test "x$WFS_SVR_ENABLED" != "x" ; then
     with_xml2_config=yes
-    echo "$as_me:$LINENO: result: libxml2 requested for WCS Server." >&5
+    echo "$as_me:$LINENO: result: libxml2 requested for WFS Server." >&5
 echo "${ECHO_T}libxml2 requested for WFS Server." >&6
     echo "$as_me:$LINENO: result:       If unavailable disable using --without-xml2-config," >&5
 echo "${ECHO_T}      If unavailable disable using --without-xml2-config," >&6

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2010-09-30 12:50:51 UTC (rev 10547)
+++ trunk/mapserver/configure.in	2010-09-30 13:14:58 UTC (rev 10548)
@@ -1770,16 +1770,16 @@
 
 AC_CHECKING(whether we should include WMS Client Connections support)
 AC_ARG_WITH(wmsclient,
-[  --with-wmsclient        Enable OGC WMS Client Connections (PROJ4 and libcurl
-                          required).],,)
+[  --with-wmsclient        Enable OGC WMS Client Connections (PROJ4, libcurl and
+                          GDAL required).],,)
 
 if test "$with_wmsclient" = "no" ; then
 
   AC_MSG_RESULT([        OGC WMS Client Layers disabled by --without-wmsclient.])
 
-elif test -z "$PROJ_ENABLED" ; then
+elif test -z "$PROJ_ENABLED" -o -z "$GDAL_ENABLED"; then
 
-  AC_MSG_RESULT([        OGC WMS Client Connections not enabled (PROJ.4 and libcurl required).])
+  AC_MSG_RESULT([        OGC WMS Client Connections not enabled (PROJ.4, libcurl and GDAL required).])
 
 elif test "$with_wmsclient" = "yes" ; then