From 9bed21bd57dee1ed8bf1dba080b2d8f42012232e Mon Sep 17 00:00:00 2001
From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>
Date: Wed, 29 Apr 2020 18:36:06 +0200
Subject: [PATCH] Update m4 macros.
---
configure | 2 ++
m4/acx_fc_pp.m4 | 3 +--
m4/acx_lang_lib.m4 | 3 +--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 3386faec..7e1981f6 100755
--- a/configure
+++ b/configure
@@ -15677,6 +15677,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_fcflags_srcext=$acx_fcflags_srcext_save
ac_ext=$acx_ext_save
fi
+
if test -n "$acx_cv_fc_pp_srcext_f90"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_fc_pp_srcext_f90" >&5
$as_echo "$acx_cv_fc_pp_srcext_f90" >&6; }
@@ -16092,6 +16093,7 @@ fi
rm -f conftest.$ac_ext
LIBS=$acx_save_LIBS
fi
+
if ${acx_cv_c_lib_func_tcase_create+:} false; then :
if test -n "$acx_cv_c_lib_func_tcase_create"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_c_lib_func_tcase_create" >&5
diff --git a/m4/acx_fc_pp.m4 b/m4/acx_fc_pp.m4
index 47659d34..e1eebcb9 100644
--- a/m4/acx_fc_pp.m4
+++ b/m4/acx_fc_pp.m4
@@ -44,8 +44,7 @@ AC_DEFUN([ACX_FC_PP_SRCEXT],
m4_pushdef([acx_cache_var], [acx_cv_fc_pp_srcext_$1])dnl
AC_MSG_CHECKING([for Fortran compiler flag needed to compile dnl
preprocessed .$1 files])
- AS_VAR_SET_IF([acx_cache_var],
- [AS_ECHO_N(["(cached) "]) >&AS_MESSAGE_FD],
+ AC_CACHE_VAL([acx_cache_var],
[acx_cache_var=unknown
acx_ext_save=$ac_ext
acx_fcflags_srcext_save=$ac_fcflags_srcext
diff --git a/m4/acx_lang_lib.m4 b/m4/acx_lang_lib.m4
index 0af38a72..c8f824e1 100644
--- a/m4/acx_lang_lib.m4
+++ b/m4/acx_lang_lib.m4
@@ -108,8 +108,7 @@ m4_define([ACX_LANG_LIB_SEARCH()],
[m4_pushdef([acx_cache_var],
[acx_cv_[]_AC_LANG_ABBREV[]_lib_func_[]AS_TR_SH([$2])])dnl
AC_MSG_CHECKING([for linker flags enabling _AC_LANG function $2])
- AS_VAR_SET_IF([acx_cache_var],
- [AS_ECHO_N(["(cached) "]) >&AS_MESSAGE_FD],
+ AC_CACHE_VAL([acx_cache_var],
[AC_LANG_CONFTEST([m4_default([$6], [AC_LANG_CALL([], [$2])])])
acx_save_LIBS=$LIBS
AS_VAR_SET_IF([$1], [set dummy "AS_VAR_GET([$1])"], [set dummy '' $3])
--
GitLab