configure.ac, mpc.m4, Makefile.am: add warning flags directly to CFLAGS

git-svn-id: svn://scm.gforge.inria.fr/svn/mpc/trunk@1020 211d60ee-9f03-0410-a15a-8952a2c7a4e4

4 files changed, 22 insertions, 28 deletions

diff --git a/configure.ac b/configure.ac
index a5cb05c..7ae89e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include "gmp.h"
 ]])],[AC_MSG_RESULT(yes)],[
  AC_MSG_RESULT(no)
- AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
+ AC_MSG_ERROR([gmp.h cannot be found or is unusable.])
 ])
 
 # Check for GMP CFLAGS in gmp.h
@@ -199,7 +199,7 @@ esac
 
 
 # Checks if compiler accepts warning flags.
-MPC_PROG_CC_WARNINGCFLAGS([WARNINGCFLAGS])
+MPC_C_CHECK_WARNINGCFLAGS
 
 # Checks for gcc version, result in GCC_VERSION inside config.log, for instance
 AX_GCC_VERSION
diff --git a/m4/mpc.m4 b/m4/mpc.m4
index dbdc5ea..c5fccb3 100644
--- a/m4/mpc.m4
+++ b/m4/mpc.m4
@@ -87,15 +87,11 @@ AC_DEFUN([MPC_COMPLEX_H], [
 #
 # DESCRIPTION
 #
-# Checks if the C compiler accepts the flag FLAG together with the flags
-# already contained in ACCUMULATOR.
-# If yes, adds it to ACCUMULATOR.
+# Checks if the C compiler accepts the flag FLAG
+# If yes, adds it to CFLAGS.
 
 AC_DEFUN([MPC_C_CHECK_FLAG], [
-   old_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS $$2"
-   AX_C_CHECK_FLAG($1,,,[$2="$$2 $1"])
-   CFLAGS="$old_CFLAGS"
+   AX_C_CHECK_FLAG($1,,,[CFLAGS="$CFLAGS $1"])
 ])
 
 
@@ -103,14 +99,14 @@ AC_DEFUN([MPC_C_CHECK_FLAG], [
 # SYNOPSIS
 #
 #
-# MPC_PROG_CC_WARNINGFLAG([WARNINGCFLAGS])
+# MPC_C_CHECK_WARNINGFLAGS
 #
 # DESCRIPTION
 #
 # For development version only: Checks if gcc accepts warning flags.
-# Put accepted ones into WARNINGCFLAGS ($1).
+# Adds accepted ones to CFLAGS.
 #
-AC_DEFUN([MPC_PROG_CC_WARNINGCFLAGS], [
+AC_DEFUN([MPC_C_CHECK_WARNINGCFLAGS], [
   AC_REQUIRE([AC_PROG_GREP])
   if echo $VERSION | grep -c dev >/dev/null 2>&1 ; then
     if test "x$GCC" = "xyes" -a "x$compiler" != "xicc" -a "x$compiler" != "xg++"; then
@@ -118,20 +114,19 @@ AC_DEFUN([MPC_PROG_CC_WARNINGCFLAGS], [
          *darwin*) ;;
          *) MPC_C_CHECK_FLAG(-D_FORTIFY_SOURCE=2,$1) ;;
       esac
-      MPC_C_CHECK_FLAG(-g,$1)
-      MPC_C_CHECK_FLAG(-std=c99,$1)
-      MPC_C_CHECK_FLAG(-pedantic,$1)
-      MPC_C_CHECK_FLAG(-Wno-long-long,$1)
-      MPC_C_CHECK_FLAG(-Wall,$1)
-      MPC_C_CHECK_FLAG(-Wextra,$1)
-      MPC_C_CHECK_FLAG(-Werror,$1)
-      MPC_C_CHECK_FLAG(-Wdeclaration-after-statement,$1)
-      MPC_C_CHECK_FLAG(-Wundef,$1)
-      MPC_C_CHECK_FLAG(-Wshadow,$1)
-      MPC_C_CHECK_FLAG(-Wstrict-prototypes,$1)
-      MPC_C_CHECK_FLAG(-Wmissing-prototypes,$1)
-      MPC_C_CHECK_FLAG(-Wno-unused-value,$1)
-      AC_SUBST($1)
+      MPC_C_CHECK_FLAG(-g)
+      MPC_C_CHECK_FLAG(-std=c99)
+      MPC_C_CHECK_FLAG(-pedantic)
+      MPC_C_CHECK_FLAG(-Wno-long-long)
+      MPC_C_CHECK_FLAG(-Wall)
+      MPC_C_CHECK_FLAG(-Wextra)
+      MPC_C_CHECK_FLAG(-Werror)
+      MPC_C_CHECK_FLAG(-Wdeclaration-after-statement)
+      MPC_C_CHECK_FLAG(-Wundef)
+      MPC_C_CHECK_FLAG(-Wshadow)
+      MPC_C_CHECK_FLAG(-Wstrict-prototypes)
+      MPC_C_CHECK_FLAG(-Wmissing-prototypes)
+      MPC_C_CHECK_FLAG(-Wno-unused-value)
     fi
   fi
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index dd2b3ff..20af4e3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
 ## src/Makefile.am -- Process this file with automake to produce Makefile.in
-AM_CFLAGS=@WARNINGCFLAGS@
 
 lib_LTLIBRARIES = libmpc.la
 libmpc_la_LDFLAGS = -version-info 2:0:0
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2126d27..6e98999 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
-AM_CFLAGS=@WARNINGCFLAGS@
+
 AM_CPPFLAGS = -I$(top_srcdir)/src
 LDADD = libmpc-tests.la $(top_builddir)/src/libmpc.la
 # LOADLIBES (documented in the "GNU make" manual and equivalent to LDLIBS)