[geos-commits] r3006 - trunk
svn_geos at osgeo.org
svn_geos at osgeo.org
Fri Jun 18 06:29:31 EDT 2010
Author: strk
Date: 2010-06-18 10:29:31 +0000 (Fri, 18 Jun 2010)
New Revision: 3006
Modified:
trunk/configure.in
Log:
Do not set user FLAGS, se project flags instead.
For the whole story, see:
http://www.gnu.org/software/hello/manual/automake/Flag-Variables-Ordering.html
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2010-06-18 09:57:19 UTC (rev 3005)
+++ trunk/configure.in 2010-06-18 10:29:31 UTC (rev 3006)
@@ -97,11 +97,11 @@
AC_SUBST(INLINE_FLAGS)
if test x"$enable_inline" = xtrue; then
INLINE_FLAGS="-DGEOS_INLINE"
- CXXFLAGS="$CXXFLAGS $INLINE_FLAGS"
+ AM_CXXFLAGS="$AM_CXXFLAGS $INLINE_FLAGS"
fi
if test x"$enable_cassert" = xfalse; then
- CXXFLAGS="$CXXFLAGS -DNDEBUG"
+ AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG"
fi
dnl --------------------------------------------------------------------
@@ -116,7 +116,7 @@
dnl
AC_LIBTOOL_LANG_CXX_CONFIG
-# Set default CXXFLAGS and CFLAGS if not set by the user
+# Set default AM_CXXFLAGS and AM_CFLAGS
# -pedantic: ISO does not support long long
# we add -Wno-long-long to avoid those messages
WARNFLAGS=""
@@ -131,8 +131,10 @@
DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS}"
-CXXFLAGS="${CXXFLAGS} ${DEFAULTFLAGS}"
-CFLAGS="${CFLAGS} ${DEFAULTFLAGS}"
+AM_CXXFLAGS="${AM_CXXFLAGS} ${DEFAULTFLAGS}"
+AM_CFLAGS="${AM_CFLAGS} ${DEFAULTFLAGS}"
+AC_SUBST(AM_CXXFLAGS)
+AC_SUBST(AM_CFLAGS)
dnl --------------------------------------------------------------------
dnl - Look for finite and/or isfinite macros/functions
@@ -304,7 +306,7 @@
AC_MSG_RESULT([Mac OS X 10.5 Leopard])
;;
10.*)
-dnl CXXFLAGS="$CXXFLAGS -Wnon-virtual-dtor -Woverloaded-virtual"
+dnl AM_CXXFLAGS="$AM_CXXFLAGS -Wnon-virtual-dtor -Woverloaded-virtual"
AC_MSG_RESULT([Mac OS X 10.6 Snow Leopard])
;;
*)
More information about the geos-commits
mailing list