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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:09:16 -0700 (Fri, 26 Aug 2011)
New Revision: 12232

Modified:
   trunk/mapserver/mapcache/Makefile.inc.in
   trunk/mapserver/mapcache/configure
   trunk/mapserver/mapcache/configure.in
Log:
add vim modelines
thomas.bonfort | 2011-01-10 15:47:39 +0100 (Mon, 10 Jan 2011)

Modified: trunk/mapserver/mapcache/Makefile.inc.in
===================================================================
--- trunk/mapserver/mapcache/Makefile.inc.in	2011-08-26 11:09:11 UTC (rev 12231)
+++ trunk/mapserver/mapcache/Makefile.inc.in	2011-08-26 11:09:16 UTC (rev 12232)
@@ -2,7 +2,7 @@
 APXS=@APXS@
 CC=@CC@
 APACHECTL=@APACHECTL@
-CFLAGS=@CFLAGS@
+CFLAGS=@CFLAGS@ @APR_CFLAGS@
 CURLCONFIG=@CURLCONFIG@
 XML2CONFIG=@XML2CONFIG@
 

Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure	2011-08-26 11:09:11 UTC (rev 12231)
+++ trunk/mapserver/mapcache/configure	2011-08-26 11:09:16 UTC (rev 12232)
@@ -618,6 +618,7 @@
 LIBTOOL
 APR_LIBS
 APR_INC
+APR_CFLAGS
 APRCONFIG
 TARGETS
 FASTCGI_LIB
@@ -3798,6 +3799,8 @@
         as_fn_error $? "apr-config utility not found. use --with-apr-config to specify its location." "$LINENO" 5
     fi
 
+    APR_CFLAGS=`$APRCONFIG --cppflags --cflags`
+
     APR_INC=`$APRCONFIG --includes`
 
     APR_LIBS=`$APRCONFIG --link-libtool`

Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in	2011-08-26 11:09:11 UTC (rev 12231)
+++ trunk/mapserver/mapcache/configure.in	2011-08-26 11:09:16 UTC (rev 12232)
@@ -183,6 +183,7 @@
         AC_MSG_ERROR(apr-config utility not found. use --with-apr-config to specify its location.)
     fi
     AC_SUBST(APRCONFIG)
+    AC_SUBST(APR_CFLAGS,`$APRCONFIG --cppflags --cflags`) 
     AC_SUBST(APR_INC,`$APRCONFIG --includes`)
     AC_SUBST(APR_LIBS,`$APRCONFIG --link-libtool`)
     AC_SUBST(LIBTOOL, `$APRCONFIG --apr-libtool`)