From 0c2cf532c8b637025c935a6e14f6b8804f97084c Mon Sep 17 00:00:00 2001
From: Thomas Jahns <jahns@dkrz.de>
Date: Mon, 5 Feb 2018 13:47:55 +0100
Subject: [PATCH] Use AS_FOR instead of for loop.
---
m4/acx_lang_check_include.m4 | 23 +++++++++++------------
m4/acx_option_search_libs.m4 | 19 +++++++++----------
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/m4/acx_lang_check_include.m4 b/m4/acx_lang_check_include.m4
index 3f9d04765..880cf58c2 100644
--- a/m4/acx_lang_check_include.m4
+++ b/m4/acx_lang_check_include.m4
@@ -90,18 +90,17 @@ AC_DEFUN([ACX_GENERIC_CHECK_INCLUDE_PATHS_IFELSE],
[AS_VAR_SET([save_flags],["@S|@$1"])
while :; do
m4_foreach([ACX_IncSet],[$9],
- [for ac_incdir in ''m4_ifval([$4],[ $4]); do
- AS_IF([test -z "$ac_incdir"],
- [ac_res="none required"
- $1="m4_ifval(ACX_IncSet,ACX_IncSet )$8 AS_VAR_GET([save_flags])"],
- [ac_res="$2$ac_incdir"
- $1="m4_ifval(ACX_IncSet,ACX_IncSet )$8 $ac_res AS_VAR_GET([save_flags])"])
- _ACX_LANG_CHECK_INCLUDE_IFELSE([$3],dnl
- [AS_IF([test -z "$ac_incdir"],dnl
- [AS_VAR_SET([acx_Include],["]m4_ifval(ACX_IncSet,ACX_IncSet )$8["])],dnl
- [AS_VAR_SET([acx_Include],["]m4_ifval(ACX_IncSet,ACX_IncSet )[$8 $2$ac_incdir"])])],,[$7])
- AS_VAR_SET_IF([acx_Include], [break])
- done
+ [AS_FOR([AC_INCDIR],[ac_incdir],['']m4_ifval([$4],[ $4]),
+ [AS_IF([test -z "$ac_incdir"],
+ [ac_res="none required"
+ $1="m4_ifval(ACX_IncSet,ACX_IncSet )$8 AS_VAR_GET([save_flags])"],
+ [ac_res="$2$ac_incdir"
+ $1="m4_ifval(ACX_IncSet,ACX_IncSet )$8 $ac_res AS_VAR_GET([save_flags])"])
+ _ACX_LANG_CHECK_INCLUDE_IFELSE([$3],dnl
+ [AS_IF([test -z "$ac_incdir"],dnl
+ [AS_VAR_SET([acx_Include],["]m4_ifval(ACX_IncSet,ACX_IncSet )$8["])],dnl
+ [AS_VAR_SET([acx_Include],["]m4_ifval(ACX_IncSet,ACX_IncSet )[$8 $2$ac_incdir"])])],,[$7])
+ AS_VAR_SET_IF([acx_Include], [break])])
AS_VAR_SET_IF([acx_Include], [break])
])
break
diff --git a/m4/acx_option_search_libs.m4 b/m4/acx_option_search_libs.m4
index 8fdb99cd2..93b2dda12 100644
--- a/m4/acx_option_search_libs.m4
+++ b/m4/acx_option_search_libs.m4
@@ -54,17 +54,16 @@ dnl is given or not.
AC_DEFUN([_ACX_OPTION_SEARCH_LIBS],
[acx_option_func_search_save_LIBS="$LIBS"
AC_LANG_CONFTEST([m4_ifval([$6],[AC_LANG_PROGRAM([$5],[$6])],[AC_LANG_CALL([$5], [$1])])])
- for ac_lib in '' $2; do
- AS_IF([test -z "$ac_lib"],
- [ac_res="none required"
- LIBS="m4_ifval([$4],[$4 ])m4_ifnblank($3,[$3 ])$acx_option_func_search_save_LIBS"],
- [ac_res="-l$ac_lib"
- LIBS="m4_ifval([$4],[$4 ])$ac_res m4_ifnblank($3,[$3 ])$acx_option_func_search_save_LIBS"])
- AC_LINK_IFELSE([], [AS_IF([test x"$ac_res" = x"none required"],dnl
+ AS_FOR([AC_LIB],[ac_lib],['' $2],
+ [AS_IF([test -z "]AC_LIB["],
+ [ac_res="none required"
+ LIBS="m4_ifval([$4],[$4 ])m4_ifnblank($3,[$3 ])$acx_option_func_search_save_LIBS"],
+ [ac_res="-l]AC_LIB["
+ LIBS="m4_ifval([$4],[$4 ])$ac_res m4_ifnblank($3,[$3 ])$acx_option_func_search_save_LIBS"])
+ AC_LINK_IFELSE([], [AS_IF([test x"$ac_res" = x"none required"],dnl
[AS_VAR_SET([ac_Search],["]m4_ifval([$4],[$4 ])[$3"])],dnl
- [AS_VAR_SET([ac_Search],["]m4_ifval([$4],[$4 ])[-l$ac_lib $3"])])])
- AS_VAR_SET_IF([ac_Search], [break])
- done
+ [AS_VAR_SET([ac_Search],["]m4_ifval([$4],[$4 ])[-l]AC_LIB[ $3"])])])
+ AS_VAR_SET_IF([ac_Search], [break])])
rm conftest.$ac_ext
LIBS="$acx_option_func_search_save_LIBS"])
dnl ACX_OPTION_SEARCH_LIBS(FUNCTION, SEARCH-LIBS,
--
GitLab