Changeset 1514 for trunk/configure.ac

Timestamp:

Sep 23, 2012, 10:30:43 AM (11 years ago)

Author:

Peter Johansson

Message:

Closes #488. Change how configure sets CXXFLAGS and CPPFLAGS. There
are three cases: 1) As before, if --enable-debug is given, we append
'-pedantic -Wall -Wno-long-long -g -O'. 2) Otherwise, and CXXFLAGS was
not set by user, we set CXXFLAGS to '-O3' just as before.

File:

• trunk/configure.ac (modified) (2 diffs)

trunk/configure.ac

@@ -65 +65 @@
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
-# Let user overide default CXXFLAGS
-if test "${CXXFLAGS+set}" != set; then
-  CXXFLAGS=""  # Setting CXXFLAGS here to prevent expansion in AC_PROG_CXX
-fi
+# record if CXXFLAGS was set by user for further use below
+AS_IF([test "${CXXFLAGS+set}" = set], [
+  CXXFLAGS_set_by_user=yes
+],[
+  CXXFLAGS_set_by_user=no
+  # set CXXFLAGS to avoid expansion in AC_PROG_CXX
+  CXXFLAGS=
+])
 
 # Checks for programs.
@@ -95 +99 @@
 
 AC_ARG_ENABLE([debug],
-  [AS_HELP_STRING([--enable-debug],[turn on debug options and code])])
-
-# -Wno-long-long is needed to suppress compiler diagnostics regarding
-# using extension beyond the C++ standard (usage of non C++ standard
-# 'long long' types).
-AS_IF([test x$enable_debug = xyes],
-  [YAT_CXX_ADD_FLAG([CXXFLAGS],[-pedantic -Wall -Wno-long-long -g -O])],
-  [YAT_CPP_ADD_FLAG([CPPFLAGS],[-DNDEBUG])
-   YAT_CXX_ADD_FLAG([CXXFLAGS],[-O3])])
+  [AS_HELP_STRING([--enable-debug],[turn on debug options and code])],
+  [], [enable_debug=no])
+
+# Set CXXFLAGS depending on whether CXXFLAGS was provided by user and
+# whether we are in debug mode
+AS_IF([test x$enable_debug = xyes], [
+  # in debug we alsways add flags below i.e. we turn on warnings,
+  # debug symbols, and low level of optimisation.
+
+  # -Wno-long-long is needed to suppress compiler diagnostics regarding
+  # using extension beyond the C++ standard (usage of non C++ standard
+  # 'long long' types).
+  YAT_CXX_ADD_FLAG([CXXFLAGS],[-pedantic -Wall -Wno-long-long -g -O])
+],[
+  # in standard mode we set to CXXFLAGS default to '-O3', but only if
+  # CXXFLAGS was not proved by user. If user provided a VALUE FOR
+  # CXXFLAGS we listen to that and leave as is.
+  AS_IF([test x$CXXFLAGS_set_by_user != xyes], [
+    YAT_CXX_ADD_FLAG([CXXFLAGS],[-O3])
+  ])
+])
+
+AC_ARG_ENABLE([assert],
+  [AS_HELP_STRING([--enable-assert], [turn on assertions])])
+
+# if assert not enabled/disabled explicitly, default behaviour is to
+# enable assert in debug mode and disable otherwise
+test "${enable_assert+set}" = set || enable_assert=$enable_debug
+
+# FIXME perhaps we should AC_DEFINE NDEBUG instead but then we need to
+# include config.h in all source files.
+#
+# propagate enable_assert to CPPFLAGS
+AS_IF([test x$enable_assert != xyes],[YAT_CPP_ADD_FLAG([CPPFLAGS],[-DNDEBUG])])
 
 AC_MSG_CHECKING([g++ deprecation attribute])