mpc.m4: modularise checking for warning flags

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

1 files changed, 37 insertions, 17 deletions

diff --git a/m4/mpc.m4 b/m4/mpc.m4
index 2405ae3..682d8e7 100644
--- a/m4/mpc.m4
+++ b/m4/mpc.m4
@@ -24,7 +24,7 @@ MA 02111-1307, USA. */
 # SYNOPSIS
 #
 #
-MPC_COMPLEX_H
+#MPC_COMPLEX_H
 #
 # DESCRIPTION
 #
@@ -83,12 +83,32 @@ AC_DEFUN([MPC_COMPLEX_H], [
 # SYNOPSIS
 #
 #
-MPC_PROG_CC_WARNINGFLAG([CFLAG-VAR])
+#MPC_C_CHECK_FLAG([FLAG,ACCUMULATOR])
+#
+# DESCRIPTION
+#
+# Checks if the C compiler accepts the flag FLAG together with the flags
+# already contained in ACCUMULATOR.
+# If yes, adds it to ACCUMULATOR.
+
+AC_DEFUN([MPC_C_CHECK_FLAG], [
+   old_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS $$2"
+   AX_C_CHECK_FLAG($1,,,[$2="$$2 $1"])
+   CFLAGS="$old_CFLAGS"
+])
+
+
+#
+# SYNOPSIS
+#
+#
+#MPC_PROG_CC_WARNINGFLAG([WARNINGCFLAGS])
 #
 # DESCRIPTION
 #
 # For development version only: Checks if gcc accepts warning flags.
-# Put accepted ones into CFLAG-VAR.
+# Put accepted ones into WARNINGCFLAGS ($1).
 #
 AC_DEFUN([MPC_PROG_CC_WARNINGCFLAGS], [
   AC_REQUIRE([AC_PROG_GREP])
@@ -96,21 +116,21 @@ AC_DEFUN([MPC_PROG_CC_WARNINGCFLAGS], [
     if test "x$GCC" = "xyes" -a "x$compiler" != "xicc" -a "x$compiler" != "xg++"; then
       case $host in
          *darwin*) ;;
-         *) AX_C_CHECK_FLAG(-D_FORTIFY_SOURCE=2,,,$1="$$1 -D_FORTIFY_SOURCE=2",) ;;
+         *) MPC_C_CHECK_FLAG(-D_FORTIFY_SOURCE=2,$1) ;;
       esac
-      AX_C_CHECK_FLAG(-g,,,$1="$$1 -g",)
-      AX_C_CHECK_FLAG(-std=c99,,,$1="$$1 -std=c99",)
-      AX_C_CHECK_FLAG(-pedantic,,,$1="$$1 -pedantic",)
-      AX_C_CHECK_FLAG(-Wno-long-long,,,$1="$$1 -Wno-long-long",)
-      AX_C_CHECK_FLAG(-Wall,,,$1="$$1 -Wall",)
-      AX_C_CHECK_FLAG(-Wextra,,,$1="$$1 -Wextra",)
-      AX_C_CHECK_FLAG(-Werror,,,$1="$$1 -Werror",)
-      AX_C_CHECK_FLAG(-Wdeclaration-after-statement,,,$1="$$1 -Wdeclaration-after-statement",)
-      AX_C_CHECK_FLAG(-Wundef,,,$1="$$1 -Wundef",)
-      AX_C_CHECK_FLAG(-Wshadow,,,$1="$$1 -Wshadow",)
-      AX_C_CHECK_FLAG(-Wstrict-prototypes,,,$1="$$1 -Wstrict-prototypes",)
-      AX_C_CHECK_FLAG(-Wmissing-prototypes,,,$1="$$1 -Wmissing-prototypes",)
-      AX_C_CHECK_FLAG(-Wno-unused-value,,,$1="$$1 -Wno-unused-value",)
+      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)
     fi
   fi