[mapserver-commits] r11090 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-03-06 10:46:40 -0800 (Sun, 06 Mar 2011)
New Revision: 11090

Modified:
   trunk/mapserver/mapows.c
   trunk/mapserver/mapwcs11.c
   trunk/mapserver/mapwcs20.c
Log:
Fix compilation with ./configure --with-gdal --with-proj --without-xml2-config --with-wcs --without-wms

Modified: trunk/mapserver/mapows.c
===================================================================
--- trunk/mapserver/mapows.c	2011-03-06 18:35:26 UTC (rev 11089)
+++ trunk/mapserver/mapows.c	2011-03-06 18:46:40 UTC (rev 11090)
@@ -37,6 +37,10 @@
 
 MS_CVSID("$Id$")
 
+#ifndef EQUALN
+#define EQUALN(a,b,n) (strncasecmp(a, b,n) == 0)
+#endif
+
 /*
 ** msOWSDispatch() is the entry point for any OWS request (WMS, WFS, ...)
 ** - If this is a valid request then it is processed and MS_SUCCESS is returned

Modified: trunk/mapserver/mapwcs11.c
===================================================================
--- trunk/mapserver/mapwcs11.c	2011-03-06 18:35:26 UTC (rev 11089)
+++ trunk/mapserver/mapwcs11.c	2011-03-06 18:46:40 UTC (rev 11090)
@@ -1349,7 +1349,9 @@
         msIO_fprintf( stdout, "\n--wcs--%c%c", 10, 10 );
         return MS_SUCCESS;
     }
-#endif /* def GDAL_DCAP_VIRTUALIO */    
+#else
+    return MS_SUCCESS;
+#endif /* def GDAL_DCAP_VIRTUALIO */
 }
 #endif /* defined(USE_WCS_SVR) && defined(USE_LIBXML2) */
 

Modified: trunk/mapserver/mapwcs20.c
===================================================================
--- trunk/mapserver/mapwcs20.c	2011-03-06 18:35:26 UTC (rev 11089)
+++ trunk/mapserver/mapwcs20.c	2011-03-06 18:46:40 UTC (rev 11090)
@@ -634,7 +634,7 @@
 /*      Parses a DOM element, representing a GetCapabilities-request    */
 /*      to a params object.                                             */
 /************************************************************************/
-
+#if defined(USE_LIBXML2)
 static int msWCSParseRequest20_XMLGetCapabilities(
         xmlNodePtr root, wcs20ParamsObjPtr params)
 {
@@ -691,6 +691,7 @@
     }
     return MS_SUCCESS;
 }
+#endif
 
 /************************************************************************/
 /*                   msWCSParseRequest20_XMLDescribeCoverage()          */
@@ -698,7 +699,7 @@
 /*      Parses a DOM element, representing a DescribeCoverage-request   */
 /*      to a params object.                                             */
 /************************************************************************/
-
+#if defined(USE_LIBXML2)
 static int msWCSParseRequest20_XMLDescribeCoverage(
         xmlNodePtr root, wcs20ParamsObjPtr params)
 {
@@ -726,6 +727,7 @@
     }
     return MS_SUCCESS;
 }
+#endif
 
 /************************************************************************/
 /*                   msWCSParseRequest20_XMLGetCoverage()               */
@@ -733,7 +735,7 @@
 /*      Parses a DOM element, representing a GetCoverage-request to a   */
 /*      params object.                                                  */
 /************************************************************************/
-
+#if defined(USE_LIBXML2)
 static int msWCSParseRequest20_XMLGetCoverage(
         xmlNodePtr root, wcs20ParamsObjPtr params)
 {
@@ -965,6 +967,7 @@
     }
     return MS_SUCCESS;
 }
+#endif
 
 /************************************************************************/
 /*                   msWCSParseRequest20()                              */
@@ -3900,7 +3903,7 @@
 
 #else /* defined(USE_LIBXML2) */
     if(params->service && params->version &&
-            EQUAL(params->service, "WCS") && EQUAL(params->version, "2.0.0", 3))
+            EQUAL(params->service, "WCS") && EQUAL(params->version, "2.0.0"))
     {
         msSetError(MS_WCSERR, "WCS 2.0.0 needs mapserver to be compiled with libxml2.", "msWCSDispatch20()");
         return msWCSException(map, "mapserv", "NoApplicableCode", "1.0.0");