[PATCH 5/7] ax_cflags_*_option.m4: Use AX_APPEND_FLAG macro to append the flag

[Maarten Bosmans]

---
 m4/ax_cflags_aix_option.m4  |   17 ++++-------------
 m4/ax_cflags_gcc_option.m4  |   17 ++++-------------
 m4/ax_cflags_hpux_option.m4 |   17 ++++-------------
 m4/ax_cflags_irix_option.m4 |   17 ++++-------------
 m4/ax_cflags_sun_option.m4  |   17 ++++-------------
 5 files changed, 20 insertions(+), 65 deletions(-)

diff --git a/m4/ax_cflags_aix_option.m4 b/m4/ax_cflags_aix_option.m4
index 36219f1..0b22e3e 100644
--- a/m4/ax_cflags_aix_option.m4
+++ b/m4/ax_cflags_aix_option.m4
@@ -67,19 +67,10 @@
 
 AC_DEFUN([AX_FLAGS_AIX_OPTION_PRIVATE], [dnl
 AX_CHECK_COMPILE_FLAG([$1], [flag_ok="yes"], [flag_ok="no"], [-qlanglvl=ansi 
-qsrcmsg])
-AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl
-case ".$flag_ok" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   VAR="$1"
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([FLAGS])dnl
+AS_CASE([".$flag_ok"],
+  [.ok|.ok,*], [$3],
+  [.|.no|.no,*], [$4],
+  [m4_default($3,[AX_APPEND_FLAG([$1],[$2])])])
 ])
 
 AC_DEFUN([AX_CFLAGS_AIX_OPTION],[
diff --git a/m4/ax_cflags_gcc_option.m4 b/m4/ax_cflags_gcc_option.m4
index 58b4564..6b0fb8d 100644
--- a/m4/ax_cflags_gcc_option.m4
+++ b/m4/ax_cflags_gcc_option.m4
@@ -78,19 +78,10 @@ AC_DEFUN([AX_FLAGS_GCC_OPTION_PRIVATE], [dnl
 AX_CHECK_COMPILE_FLAG([$1], [flag_ok="yes"], [flag_ok="no"], [-pedantic 
-Werror])
 AS_IF([test "x$flag_ok" == "xno"],
   [AX_CHECK_COMPILE_FLAG([$1], [flag_ok="no, obsolete"], [flag_ok="no"], 
[-pedantic])])
-AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl
-case ".$flag_ok" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   var="$1"
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([FLAGS])dnl
+AS_CASE([".$flag_ok"],
+  [.ok|.ok,*], [$3],
+  [.|.no|.no,*], [$4],
+  [m4_default($3,[AX_APPEND_FLAG([$1],[$2])])])
 ])
 
 AC_DEFUN([AX_CFLAGS_GCC_OPTION],[
diff --git a/m4/ax_cflags_hpux_option.m4 b/m4/ax_cflags_hpux_option.m4
index 2b0594b..758dee3 100644
--- a/m4/ax_cflags_hpux_option.m4
+++ b/m4/ax_cflags_hpux_option.m4
@@ -67,19 +67,10 @@
 
 AC_DEFUN([AX_FLAGS_HPUX_OPTION_PRIVATE], [dnl
 AX_CHECK_COMPILE_FLAG([$1], [flag_ok="yes"], [flag_ok="no"], [+ESlit +w1 -Aa])
-AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl
-case ".$flag_ok" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   VAR="$1"
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([FLAGS])dnl
+AS_CASE([".$flag_ok"],
+  [.ok|.ok,*], [$3],
+  [.|.no|.no,*], [$4],
+  [m4_default($3,[AX_APPEND_FLAG([$1],[$2])])])
 ])
 
 AC_DEFUN([AX_CFLAGS_HPUX_OPTION],[
diff --git a/m4/ax_cflags_irix_option.m4 b/m4/ax_cflags_irix_option.m4
index d6fb783..d66461d 100644
--- a/m4/ax_cflags_irix_option.m4
+++ b/m4/ax_cflags_irix_option.m4
@@ -67,19 +67,10 @@
 
 AC_DEFUN([AX_FLAGS_IRIX_OPTION_PRIVATE], [dnl
 AX_CHECK_COMPILE_FLAG([$1], [flag_ok="yes"], [flag_ok="no"], [-fullwarn 
-use_readonly_const])
-AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl
-case ".$flag_ok" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   VAR="$1"
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([FLAGS])dnl
+AS_CASE([".$flag_ok"],
+  [.ok|.ok,*], [$3],
+  [.|.no|.no,*], [$4],
+  [m4_default($3,[AX_APPEND_FLAG([$1],[$2])])])
 ])
 
 AC_DEFUN([AX_CFLAGS_IRIX_OPTION],[
diff --git a/m4/ax_cflags_sun_option.m4 b/m4/ax_cflags_sun_option.m4
index d25cf28..7cbc980 100644
--- a/m4/ax_cflags_sun_option.m4
+++ b/m4/ax_cflags_sun_option.m4
@@ -67,19 +67,10 @@
 
 AC_DEFUN([AX_FLAGS_SUN_OPTION_PRIVATE], [dnl
 AX_CHECK_COMPILE_FLAG([$1], [flag_ok="yes"], [flag_ok="no"], [+xstrconst -Xc])
-AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl
-case ".$flag_ok" in
-     .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   var="$1"
-   if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"])
-                      m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([FLAGS])dnl
+AS_CASE([".$flag_ok"],
+  [.ok|.ok,*], [$3],
+  [.|.no|.no,*], [$4],
+  [m4_default($3,[AX_APPEND_FLAG([$1],[$2])])])
 ])
 
 AC_DEFUN([AX_CFLAGS_SUN_OPTION],[
-- 
1.7.4.1