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

svn at osgeo.org svn at osgeo.org
Fri Aug 26 07:02:34 EDT 2011 

Author: tbonfort
Date: 2011-08-26 04:02:34 -0700 (Fri, 26 Aug 2011)
New Revision: 12155

Modified:
   trunk/mapserver/mapcache/Makefile.inc.in
   trunk/mapserver/mapcache/configure
   trunk/mapserver/mapcache/configure.in
Log:
fix a compiler warning
thomas.bonfort | 2010-11-05 16:51:30 +0100 (Fri, 05 Nov 2010)

Modified: trunk/mapserver/mapcache/Makefile.inc.in
===================================================================
--- trunk/mapserver/mapcache/Makefile.inc.in	2011-08-26 11:02:30 UTC (rev 12154)
+++ trunk/mapserver/mapcache/Makefile.inc.in	2011-08-26 11:02:34 UTC (rev 12155)
@@ -5,7 +5,7 @@
 CURLCONFIG=@CURLCONFIG@
 XML2CONFIG=@XML2CONFIG@
 
-APXS_CFLAGS=@APXS_CFLAGS@ @APXS_INCLUDEDIR@
+APXS_CFLAGS=@APXS_INC@
 APXS_LIBS=@APXS_LIBS@
 APXS_LDFLAGS=@APXS_LDFLAGS@
 
@@ -27,7 +27,7 @@
 FCGI_INC=@FASTCGI_INC@
 FCGI_LIB=@FASTCGI_LIB@
 
-ALL_CFLAGS=-fPIC -I../include $(APXS_CFLAGS) $(APR_CFLAGS) $(CURL_CFLAGS) $(XML2_CFLAGS) $(PNG_INC) $(JPEG_INC)
+ALL_CFLAGS=$(CFLAGS) -fPIC -I../include $(APXS_CFLAGS) $(APR_CFLAGS) $(CURL_CFLAGS) $(XML2_CFLAGS) $(PNG_INC) $(JPEG_INC)
 ALL_LIBS=$(CURL_LIBS) $(APR_LIBS) $(XML2_LIBS) $(PNG_LIB) $(JPEG_LIB)
 
 

Modified: trunk/mapserver/mapcache/configure
===================================================================
--- trunk/mapserver/mapcache/configure	2011-08-26 11:02:30 UTC (rev 12154)
+++ trunk/mapserver/mapcache/configure	2011-08-26 11:02:34 UTC (rev 12155)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for mod_mapcache 0.1.
+# Generated by GNU Autoconf 2.67 for mod_geocache 0.1.
 #
 # Report bugs to <tbonfort at terriscope.fr>.
 #
@@ -550,10 +550,10 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='mod_mapcache'
-PACKAGE_TARNAME='mod_mapcache'
+PACKAGE_NAME='mod_geocache'
+PACKAGE_TARNAME='mod_geocache'
 PACKAGE_VERSION='0.1'
-PACKAGE_STRING='mod_mapcache 0.1'
+PACKAGE_STRING='mod_geocache 0.1'
 PACKAGE_BUGREPORT='tbonfort at terriscope.fr'
 PACKAGE_URL=''
 
@@ -615,8 +615,7 @@
 APRCONFIG
 APXS_LDFLAGS
 APXS_LIBS
-APXS_INCLUDEDIR
-APXS_CFLAGS
+APXS_INC
 APACHECTL
 APACHE_SBINDIR
 APXS
@@ -1228,7 +1227,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_mapcache 0.1 to adapt to many kinds of systems.
+\`configure' configures mod_geocache 0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1276,7 +1275,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/mod_mapcache]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/mod_geocache]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1289,7 +1288,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_mapcache 0.1:";;
+     short | recursive ) echo "Configuration of mod_geocache 0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1386,7 +1385,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_mapcache configure 0.1
+mod_geocache configure 0.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1688,7 +1687,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_mapcache $as_me 0.1, which was
+It was created by mod_geocache $as_me 0.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2038,7 +2037,7 @@
 
 
 # don't let AC_PROG_CC force "-g -O2"
-: ${CFLAGS="-Wall"}
+#: ${CFLAGS="-Wall"}
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2831,8 +2830,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+CFLAGS=$CFLAGS
 
-
 # macro that is used to parse a --with-xml2-config parameter
 
 
@@ -2872,7 +2871,7 @@
     if test "$enable_debug" == "yes"; then
         CFLAGS="$CFLAGS -g -O0 -DDEBUG"
     else
-        CFLAGS="-O2 -DNDEBUG"
+        CFLAGS="$CFLAGS -O2 -DNDEBUG"
     fi
     CFLAGS=$CFLAGS
 
@@ -3097,10 +3096,8 @@
 $as_echo "$APACHECTL" >&6; }
     fi
 
-    APXS_CFLAGS=`$APXS -q CFLAGS`
+    APXS_INC=-I`$APXS -q INCLUDEDIR`
 
-    APXS_INCLUDEDIR=-I`$APXS -q INCLUDEDIR`
-
     APXS_LIBS=`$APXS -q LIBS`
 
     APXS_LDFLAGS=`$APXS -q LDFLAGS`
@@ -4646,7 +4643,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mod_mapcache $as_me 0.1, which was
+This file was extended by mod_geocache $as_me 0.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4699,7 +4696,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mod_mapcache config.status 0.1
+mod_geocache config.status 0.1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in	2011-08-26 11:02:30 UTC (rev 12154)
+++ trunk/mapserver/mapcache/configure.in	2011-08-26 11:02:34 UTC (rev 12155)
@@ -1,13 +1,13 @@
 # Required initializer
-AC_INIT(mod_mapcache,0.1,tbonfort at terriscope.fr)
+AC_INIT(mod_geocache,0.1,tbonfort at terriscope.fr)
 
 # don't let AC_PROG_CC force "-g -O2"
-: ${CFLAGS="-Wall"}
+#: ${CFLAGS="-Wall"}
 
 AC_PROG_CC
 
+CFLAGS=$CFLAGS
 
-
 # macro that is used to parse a --with-xml2-config parameter
 AC_DEFUN([XML2_CHECK],[
     AC_SUBST(XML2CONFIG)
@@ -95,8 +95,7 @@
       AC_MSG_RESULT([$APACHECTL])
     fi
     AC_SUBST(APACHECTL)
-    AC_SUBST(APXS_CFLAGS,`$APXS -q CFLAGS`)
-    AC_SUBST(APXS_INCLUDEDIR,-I`$APXS -q INCLUDEDIR`)
+    AC_SUBST(APXS_INC,-I`$APXS -q INCLUDEDIR`)
     AC_SUBST(APXS_LIBS,`$APXS -q LIBS`)
     AC_SUBST(APXS_LDFLAGS,`$APXS -q LDFLAGS`)
     
@@ -238,7 +237,7 @@
     if test "$enable_debug" == "yes"; then
         CFLAGS="$CFLAGS -g -O0 -DDEBUG"
     else
-        CFLAGS="-O2 -DNDEBUG"
+        CFLAGS="$CFLAGS -O2 -DNDEBUG"
     fi
     AC_SUBST(CFLAGS,$CFLAGS)
 ])

More information about the mapserver-commits mailing list