[mapserver-commits] r13002 - trunk/mapserver/mapcache

[svn at osgeo.org]

Author: jmckenna
Date: 2012-01-18 14:12:27 -0800 (Wed, 18 Jan 2012)
New Revision: 13002

Modified:
   trunk/mapserver/mapcache/nmake.opt
Log:
handle case for no sqlite support

Modified: trunk/mapserver/mapcache/nmake.opt
===================================================================
--- trunk/mapserver/mapcache/nmake.opt	2012-01-18 19:29:25 UTC (rev 13001)
+++ trunk/mapserver/mapcache/nmake.opt	2012-01-18 22:12:27 UTC (rev 13002)
@@ -148,8 +148,10 @@
 JPEG_LIB=$(JPEG_DIR)/libjpeg.lib
 !ENDIF
 
+!IFDEF SQLITE_DIR
 SQLITE_LIB=$(SQLITE_DIR)\lib\sqlite3_i.lib
 SQLITE_INC=-I$(SQLITE_DIR)\include
+!ENDIF
 
 FCGI_LIB=$(FCGI_DIR)\libfcgi\Release\libfcgi.lib
 FCGI_INC=-I$(FCGI_DIR)\include
@@ -166,11 +168,11 @@
 
 #APR
 APR_INC=-I$(APR_DIR)\include
-APR_LIB=$(APR_DIR)/lib/apr-1.lib $(APR_DIR)/lib/aprutil-1.lib $(APR_DIR)/lib/libapr-1.lib $(APR_DIR)/lib/libaprutil-1.lib 
+APR_LIB=$(APR_DIR)/lib/apr-1.lib $(APR_DIR)/lib/aprutil-1.lib $(APR_DIR)/lib/libapr-1.lib $(APR_DIR)/lib/libaprutil-1.lib
 
 #APACHE
 APACHE_INC=-I$(APACHE_DIR)\include
-APACHE_LIB=$(APACHE_DIR)\lib\libhttpd.lib 
+APACHE_LIB=$(APACHE_DIR)\lib\libhttpd.lib
 
 # Setup REGEX object and includes
 REGEX_OBJ=$(REGEX_DIR)\regex.obj