[mapguide-commits] r8136 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-05-20 01:33:03 -0700 (Tue, 20 May 2014)
New Revision: 8136

Modified:
   trunk/MgDev/configure.in
Log:
Merge r8135 to trunk

Modified: trunk/MgDev/configure.in
===================================================================
--- trunk/MgDev/configure.in	2014-05-17 13:50:02 UTC (rev 8135)
+++ trunk/MgDev/configure.in	2014-05-20 08:33:03 UTC (rev 8136)
@@ -176,28 +176,28 @@
         if test $enable_64bit = no; then
             AC_MSG_NOTICE([Using 32-bit CXXFLAGS])
             CXXFLAGS="-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions"
-            AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions"])            
+            AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions -Wno-write-strings"])            
         else
             #TODO: Review. i686 is not a valid march/mtune value for 64-bit compilation
             #TODO: Sticking -fPIC globally is probably a bit of a thermonuclear solution, but we
             # *absolutely* must be sure this flag is used when compiling static libraries
             AC_MSG_NOTICE([Using 64-bit CXXFLAGS])
             CXXFLAGS="-O2 -g -pipe -m64 -fPIC -fno-use-cxa-atexit -fexceptions"
-            AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -m64 -fPIC -fno-use-cxa-atexit -fexceptions"])
+            AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -m64 -fPIC -fno-use-cxa-atexit -fexceptions -Wno-write-strings"])
         fi
     else
         AC_MSG_NOTICE([this gcc version is not actively supported.])
         if test $enable_64bit = no; then
             AC_MSG_NOTICE([Using 32-bit CXXFLAGS])
             CXXFLAGS="-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions"
-            AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions"])
+            AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -march=i686 -mtune=i686 -fno-use-cxa-atexit -fexceptions -Wno-write-strings"])
         else
             #TODO: Review. i686 is not a valid march/mtune value for 64-bit compilation
             #TODO: Sticking -fPIC globally is probably a bit of a thermonuclear solution, but we
             # *absolutely* must be sure this flag is used when compiling static libraries
             AC_MSG_NOTICE([Using 64-bit CXXFLAGS])
             CXXFLAGS="-O2 -g -pipe -m64 -fPIC -fno-use-cxa-atexit -fexceptions"
-            AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -m64 -fPIC -fno-use-cxa-atexit -fexceptions"])
+            AC_SUBST(CXXFLAGS, ["-O2 -g -pipe -m64 -fPIC -fno-use-cxa-atexit -fexceptions -Wno-write-strings"])
         fi
     fi
 fi