|
From: <sv...@va...> - 2013-10-02 15:15:14
|
Author: florian
Date: Wed Oct 2 15:14:59 2013
New Revision: 13604
Log:
The configury bits for checking the annotatoin of smart pointers
were mixing up CFLAGS and CXXFLAGS. Now fixed.
Also, when modifying CFLAGS also modify CXXFLAGS unless there is a
good reason not to do so. This only affects compilation of testcases.
Modified:
trunk/configure.ac
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Oct 2 15:14:59 2013
@@ -19,6 +19,7 @@
# Checks for various programs.
#----------------------------------------------------------------------------
CFLAGS="-Wno-long-long $CFLAGS"
+CXXFLAGS="-Wno-long-long $CXXFLAGS"
AC_PROG_LN_S
AC_PROG_CC
@@ -1520,6 +1521,7 @@
if test x$no_write_strings = xyes; then
CFLAGS="$CFLAGS -Wwrite-strings"
+ CXXFLAGS="$CXXFLAGS -Wwrite-strings"
fi
AM_CONDITIONAL(HAS_WRITE_STRINGS_WARNING, test x$no_write_strings = xyes)
@@ -1669,6 +1671,7 @@
if test x$no_stack_protector = xyes; then
CFLAGS="$CFLAGS -fno-stack-protector"
+ CXXFLAGS="$CXXFLAGS -fno-stack-protector"
fi
@@ -2619,7 +2622,7 @@
# does libstdc++ support annotating shared pointers ?
AC_MSG_CHECKING([if libstdc++ supports annotating shared pointers])
-safe_CXXFLAGS=$CFLAGS
+safe_CXXFLAGS=$CXXFLAGS
CXXFLAGS="-std=c++0x"
AC_LANG_PUSH(C++)
|