[mapserver-commits] r12445 - in trunk/mapserver/mapcache: . include src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:26:46 -0700 (Fri, 26 Aug 2011)
New Revision: 12445

Modified:
   trunk/mapserver/mapcache/Makefile.inc.in
   trunk/mapserver/mapcache/include/geocache.h
   trunk/mapserver/mapcache/src/Makefile
Log:


Modified: trunk/mapserver/mapcache/Makefile.inc.in
===================================================================
--- trunk/mapserver/mapcache/Makefile.inc.in	2011-08-26 11:26:40 UTC (rev 12444)
+++ trunk/mapserver/mapcache/Makefile.inc.in	2011-08-26 11:26:46 UTC (rev 12445)
@@ -55,7 +55,8 @@
 MISC_ENABLED=@MISC_ENABLED@ -DTHREADED_MPM=$(shell $(HTTPD) -V | grep "Server MPM" | grep -q "Prefork"; echo $$?)
 
 INCLUDES=-I../include $(MISC_ENABLED) $(CAIRO_ENABLED) $(CAIRO_INC) $(CURL_CFLAGS) $(PNG_INC) $(JPEG_INC) $(GDAL_INC) $(GEOS_INC) $(APR_INC) $(APU_INC) $(MEMCACHE_ENABLED) $(PCRE_CFLAGS) $(PCRE_ENABLED) $(OGR_ENABLED) $(GEOS_ENABLED) $(SQLITE_ENABLED)
-LIBS=$(CURL_LIBS) $(CAIRO_LIB) $(PNG_LIB) $(JPEG_LIB) $(GDAL_LIB) $(GEOS_LIB) $(APR_LIBS) $(APU_LIBS) $(PCRE_LIBS)
+LIBS=$(CURL_LIBS) $(CAIRO_LIB) $(PNG_LIB) $(JPEG_LIB) $(APR_LIBS) $(APU_LIBS) $(PCRE_LIBS)
+SEEDER_EXTRALIBS=$(GDAL_LIB) $(GEOS_LIB)
 
 
 OBJS=$(shell find . -regex '^.*\.c$$' -print | grep -v geocache_seed.c | grep -v mod_geocache.c | grep -v fastcgi_geocache.c |sed "s/^\(.*\)\.c$$/\1.o/") 

Modified: trunk/mapserver/mapcache/include/geocache.h
===================================================================
--- trunk/mapserver/mapcache/include/geocache.h	2011-08-26 11:26:40 UTC (rev 12444)
+++ trunk/mapserver/mapcache/include/geocache.h	2011-08-26 11:26:46 UTC (rev 12445)
@@ -27,11 +27,16 @@
 #include <apr_global_mutex.h>
 #include "util.h"
 #include "ezxml.h"
+#include "ezxml.h"
 #include "errors.h"
+
+#if 0
 #ifdef USE_GDAL
 #include <gdal.h>
 #include <cpl_conv.h>
 #endif
+#endif
+
 #include <assert.h>
 #include <apr_time.h>
 
@@ -79,7 +84,9 @@
 typedef struct geocache_map geocache_map;
 typedef struct geocache_proxied_response geocache_proxied_response;
 typedef struct geocache_source_wms geocache_source_wms;
+#if 0
 typedef struct geocache_source_gdal geocache_source_gdal;
+#endif
 typedef struct geocache_cache_disk geocache_cache_disk;
 typedef struct geocache_http geocache_http;
 typedef struct geocache_request geocache_request;
@@ -288,6 +295,7 @@
     geocache_http *http;
 };
 
+#if 0
 #ifdef USE_GDAL
 /**\class geocache_source_gdal
  * \brief GDAL geocache_source
@@ -301,6 +309,7 @@
 };
 #endif
 /** @} */
+#endif
 
 
 /** \defgroup cache Caches */

Modified: trunk/mapserver/mapcache/src/Makefile
===================================================================
--- trunk/mapserver/mapcache/src/Makefile	2011-08-26 11:26:40 UTC (rev 12444)
+++ trunk/mapserver/mapcache/src/Makefile	2011-08-26 11:26:46 UTC (rev 12445)
@@ -22,7 +22,7 @@
 	$(LIBTOOL) --mode=link --tag CC $(CC) -o geocache.fcgi $(CFLAGS) $(INCLUDES) $(FCGI_INC) fastcgi_geocache.c $(LOBJS) $(LIBS) $(FCGI_LIB)
 
 geocache_seed: geocache_seed.c $(OBJS)
-	$(LIBTOOL) --mode=link --tag CC $(CC) -o geocache_seed $(CFLAGS) $(INCLUDES) geocache_seed.c $(LOBJS) $(LIBS) 
+	$(LIBTOOL) --mode=link --tag CC $(CC) -o geocache_seed $(CFLAGS) $(INCLUDES) geocache_seed.c $(LOBJS) $(LIBS) $(SEEDER_EXTRALIBS)
 
 
 clean: