autoconf-archive-maintainers | |
[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/4] ax_cflags_*: Use AX_APPEND_FLAG macro
From: |
Maarten Bosmans |
Subject: |
[PATCH 4/4] ax_cflags_*: Use AX_APPEND_FLAG macro |
Date: |
Sat, 2 Jul 2011 12:06:34 +0200 |
---
m4/ax_cflags_force_c89.m4 | 15 +++++----------
m4/ax_cflags_no_writable_strings.m4 | 15 +++++----------
m4/ax_cflags_strict_prototypes.m4 | 15 +++++----------
m4/ax_cflags_warn_all.m4 | 15 +++++----------
4 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/m4/ax_cflags_force_c89.m4 b/m4/ax_cflags_force_c89.m4
index b9f1a73..70fc36f 100644
--- a/m4/ax_cflags_force_c89.m4
+++ b/m4/ax_cflags_force_c89.m4
@@ -23,6 +23,8 @@
# - $3 action-if-found : add value to shellvariable
# - $4 action-if-not-found : nothing
#
+# NOTE: These macros depend on AX_APPEND_FLAG.
+#
# LICENSE
#
# Copyright (c) 2009 Guido U. Draheim <address@hidden>
@@ -80,18 +82,11 @@ done
FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE
])
+AS_VAR_POPDEF([FLAGS])dnl
case ".$VAR" in
.ok|.ok,*) m4_ifvaln($3,$3) ;;
- .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
- AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
- *) m4_ifvaln($3,$3,[
- if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
- then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
- else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
- fi ]) ;;
+ .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;;
+ *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;;
esac
AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
])
diff --git a/m4/ax_cflags_no_writable_strings.m4
b/m4/ax_cflags_no_writable_strings.m4
index e1bf0ba..14e72c5 100644
--- a/m4/ax_cflags_no_writable_strings.m4
+++ b/m4/ax_cflags_no_writable_strings.m4
@@ -24,6 +24,8 @@
# - $3 action-if-found : add value to shellvariable
# - $4 action-if-not-found : nothing
#
+# NOTE: These macros depend on AX_APPEND_FLAG.
+#
# LICENSE
#
# Copyright (c) 2008 Guido U. Draheim <address@hidden>
@@ -96,20 +98,13 @@ case ".$VAR" in
esac
FLAGS="$ac_save_[]FLAGS"
])
+AS_VAR_POPDEF([FLAGS])dnl
case ".$VAR" in
.ok|.ok,*) m4_ifvaln($3,$3) ;;
- .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
- AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
- *) m4_ifvaln($3,$3,[
- if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
- then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
- else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
- fi ]) ;;
+ .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;;
+ *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;;
esac
AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
])dnl AX_FLAGS_NO_WRITABLE_STRINGS
AC_DEFUN([AX_CFLAGS_NO_WRITABLE_STRINGS],[dnl
diff --git a/m4/ax_cflags_strict_prototypes.m4
b/m4/ax_cflags_strict_prototypes.m4
index 4d0fa0c..0a76fda 100644
--- a/m4/ax_cflags_strict_prototypes.m4
+++ b/m4/ax_cflags_strict_prototypes.m4
@@ -26,6 +26,8 @@
# - $3 action-if-found : add value to shellvariable
# - $4 action-if-not-found : nothing
#
+# NOTE: These macros depend on AX_APPEND_FLAG.
+#
# LICENSE
#
# Copyright (c) 2008 Guido U. Draheim <address@hidden>
@@ -93,20 +95,13 @@ then VAR="no, suppressed, signal.h," ; fi ; fi],
esac
FLAGS="$ac_save_[]FLAGS"
])
+AS_VAR_POPDEF([FLAGS])dnl
case ".$VAR" in
.ok|.ok,*) m4_ifvaln($3,$3) ;;
- .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
- AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
- *) m4_ifvaln($3,$3,[
- if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
- then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
- else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
- fi ]) ;;
+ .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;;
+ *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;;
esac
AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
])dnl AX_FLAGS_STRICT_PROTOTYPES
AC_DEFUN([AX_CFLAGS_STRICT_PROTOTYPES],[dnl
diff --git a/m4/ax_cflags_warn_all.m4 b/m4/ax_cflags_warn_all.m4
index e411d04..0c29d66 100644
--- a/m4/ax_cflags_warn_all.m4
+++ b/m4/ax_cflags_warn_all.m4
@@ -25,6 +25,8 @@
# - $3 action-if-found : add value to shellvariable
# - $4 action-if-not-found : nothing
#
+# NOTE: These macros depend on AX_APPEND_FLAG.
+#
# LICENSE
#
# Copyright (c) 2008 Guido U. Draheim <address@hidden>
@@ -81,20 +83,13 @@ do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e
's,%%.*,,' -e 's,%,,'`
done
FLAGS="$ac_save_[]FLAGS"
])
+AS_VAR_POPDEF([FLAGS])dnl
case ".$VAR" in
.ok|.ok,*) m4_ifvaln($3,$3) ;;
- .|.no|.no,*) m4_ifvaln($4,$4,[m4_ifval($2,[
- AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $2"])]) ;;
- *) m4_ifvaln($3,$3,[
- if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
- then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
- else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
- fi ]) ;;
+ .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;;
+ *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;;
esac
AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
])dnl AX_FLAGS_WARN_ALL
dnl implementation tactics:
dnl the for-argument contains a list of options. The first part of
--
1.7.4.1