Make sure that the warning flags are set in maintainer mode, even if the optimization...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6417 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/acmacro/compiler-flags.m4 b/acmacro/compiler-flags.m4
index 8a585c9..c9d6169 100644 (file)
--- a/acmacro/compiler-flags.m4
+++ b/acmacro/compiler-flags.m4
@@ -35,7 +35,8 @@ AC_DEFUN([SG_COMPILE_FLAGS],[
       fi;;
     esac
 
-  if test "x$enable_compile_warnings" = "xyes" ; then
+  if test "x$enable_compile_warnings" = "xyes" ||
+     test "x$force_compile_warnings" = "xyes"; then
     AC_MSG_CHECKING(the warning flags for this compiler)
     warnCFLAGS=
     if test "x$CC" = "xgcc" || test "x$GCC" = "xyes" ; then
@@ -49,14 +50,12 @@ AC_DEFUN([SG_COMPILE_FLAGS],[
       
       ## -Wformat=2 chokes on the snprintf replacement because the format is passed to real sprintf
       ## -Wshadow chokes on try{ try{} } constructs
-      if test "x$enable_compile_warnings" = "xyes"; then
-        warnCFLAGS=`echo $warnCFLAGS  -Wmissing-prototypes -Wmissing-declarations \
+      warnCFLAGS=`echo $warnCFLAGS  -Wmissing-prototypes -Wmissing-declarations \
         -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings \
         -Wno-unused-function  -Wno-strict-aliasing -Wno-format-nonliteral \
         -Werror \
        | sed 's/ +/ /g'`
        # -Wno-unused-variable  -Wno-unused-label
-      fi
     fi
     AC_MSG_RESULT($warnCFLAGS)
     # placed before since gcc remembers the last one on conflict

diff --git a/configure.ac b/configure.ac
index 15d8652..3abcab9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -380,7 +380,7 @@ AM_MAINTAINER_MODE
 if test x$USE_MAINTAINER_MODE = xyes 
 then
    # Maintainers have no choice ! I'm a BOFH, and I plainly assume. [Mt]
-   enable_compile_warnings=yes   
+   force_compile_warnings=yes   
 fi
 SG_COMPILE_FLAGS