[mapserver-commits] r11086 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-03-06 10:22:37 -0800 (Sun, 06 Mar 2011)
New Revision: 11086

Modified:
   trunk/mapserver/mapcluster.c
   trunk/mapserver/maptemplate.c
   trunk/mapserver/mapunion.c
Log:
Fix compilation when ./configure'ing without any option

Modified: trunk/mapserver/mapcluster.c
===================================================================
--- trunk/mapserver/mapcluster.c	2011-03-06 12:33:14 UTC (rev 11085)
+++ trunk/mapserver/mapcluster.c	2011-03-06 18:22:37 UTC (rev 11086)
@@ -35,6 +35,10 @@
 
 MS_CVSID("$Id$")
 
+#ifndef EQUAL
+#define EQUAL(a,b) (strcasecmp(a, b) == 0)
+#endif
+
 #ifdef USE_CLUSTER_PLUGIN
 #define USE_CLUSTER_EXTERNAL
 #endif

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2011-03-06 12:33:14 UTC (rev 11085)
+++ trunk/mapserver/maptemplate.c	2011-03-06 18:22:37 UTC (rev 11086)
@@ -3611,9 +3611,11 @@
     snprintf(repstr, PROCESSLINE_BUFLEN, "%s%s%s.map", mapserv->map->web.imagepath, mapserv->map->name, mapserv->Id);
     outstr = msReplaceSubstring(outstr, "[map]", repstr);
   }
-  
+
+#if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR) || defined(USE_WMS_LYR) || defined(USE_WFS_LYR)
   outstr = msReplaceSubstring(outstr, "[mapserv_onlineresource]",
                               msOWSGetOnlineResource(mapserv->map, "O", "onlineresource", mapserv->request));
+#endif
 
   if(getenv("HTTP_HOST")) {
     snprintf(repstr, PROCESSLINE_BUFLEN, "%s", getenv("HTTP_HOST")); 

Modified: trunk/mapserver/mapunion.c
===================================================================
--- trunk/mapserver/mapunion.c	2011-03-06 12:33:14 UTC (rev 11085)
+++ trunk/mapserver/mapunion.c	2011-03-06 18:22:37 UTC (rev 11086)
@@ -33,6 +33,10 @@
 #include <assert.h>
 #include "mapserver.h"
 
+#ifndef EQUAL
+#define EQUAL(a,b) (strcasecmp(a, b) == 0)
+#endif
+
 MS_CVSID("$Id$")
 
 #define MSUNION_NUMITEMS        2