From 2b8d9bf3dbb345ab523dc0452619b68473478b68 Mon Sep 17 00:00:00 2001
From: Sylvain Henry <sylvain@haskus.fr>
Date: Fri, 12 Feb 2021 16:38:29 +0100
Subject: Replace more autotools obsolete macros (#19189)

(cherry picked from commit 42ab06f793c0164e2b60acc018ca37d91b46999a)
---
 aclocal.m4                  | 2 +-
 configure.ac                | 3 ---
 libraries/base/aclocal.m4   | 6 +++---
 libraries/base/configure.ac | 7 ++-----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index b2f0f9e6f1..88f82e70fe 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -852,7 +852,7 @@ AC_SUBST(ContextDiffCmd, [$fp_cv_context_diff])
 # is supported in autoconf versions 2.50 up to the actual 2.57, so there is
 # little risk.
 AC_DEFUN([FP_COMPUTE_INT],
-[_AC_COMPUTE_INT([$1], [$2], [$3], [$4])[]dnl
+[AC_COMPUTE_INT([$2], [$1], [$3], [$4])[]dnl
 ])# FP_COMPUTE_INT
 
 
diff --git a/configure.ac b/configure.ac
index b4dc8e250e..c680bf04b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -917,9 +917,6 @@ dnl --------------------------------------------------
 dnl * Platform header file and syscall feature tests
 dnl ### checking the state of the local header files and syscalls ###
 
-dnl ** check for full ANSI header (.h) files
-AC_HEADER_STDC
-
 dnl ** Enable large file support.  NB. do this before testing the type of
 dnl    off_t, because it will affect the result of that test.
 AC_SYS_LARGEFILE
diff --git a/libraries/base/aclocal.m4 b/libraries/base/aclocal.m4
index 528eac5d21..573c635ea2 100644
--- a/libraries/base/aclocal.m4
+++ b/libraries/base/aclocal.m4
@@ -1,4 +1,4 @@
-# FP_COMPUTE_INT(EXPRESSION, VARIABLE, INCLUDES, IF-FAILS)
+# FP_COMPUTE_INT(VARIABLE, EXPRESSION, INCLUDES, IF-FAILS)
 # --------------------------------------------------------
 # Assign VARIABLE the value of the compile-time EXPRESSION using INCLUDES for
 # compilation. Execute IF-FAILS when unable to determine the value. Works for
@@ -10,7 +10,7 @@
 # The public AC_COMPUTE_INT macro isn't supported by some versions of
 # autoconf.
 AC_DEFUN([FP_COMPUTE_INT],
-[_AC_COMPUTE_INT([$2], [$1], [$3], [$4])[]dnl
+[AC_COMPUTE_INT([$1], [$2], [$3], [$4])[]dnl
 ])# FP_COMPUTE_INT
 
 
@@ -33,7 +33,7 @@ AS_VAR_POPDEF([fp_Cache])[]dnl
 # ---------------------------------------
 # autoheader helper for FP_CHECK_CONSTS
 m4_define([FP_CHECK_CONSTS_TEMPLATE],
-[AC_FOREACH([fp_Const], [$1],
+[m4_foreach_w([fp_Const], [$1],
   [AH_TEMPLATE(AS_TR_CPP(CONST_[]fp_Const),
                [The value of ]fp_Const[.])])[]dnl
 ])# FP_CHECK_CONSTS_TEMPLATE
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index 127b18c5e7..eae152e682 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -22,9 +22,6 @@ AC_MSG_RESULT($WINDOWS)
 # do we have long longs?
 AC_CHECK_TYPES([long long])
 
-dnl ** check for full ANSI header (.h) files
-AC_HEADER_STDC
-
 # check for specific header (.h) files that we are interested in
 AC_CHECK_HEADERS([ctype.h errno.h fcntl.h inttypes.h limits.h signal.h sys/file.h sys/resource.h sys/select.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/wait.h termios.h time.h unistd.h utime.h windows.h winsock.h langinfo.h poll.h sys/epoll.h sys/event.h sys/eventfd.h sys/socket.h])
 
@@ -100,13 +97,13 @@ dnl * Deal with arguments telling us iconv is somewhere odd
 dnl--------------------------------------------------------------------
 
 AC_ARG_WITH([iconv-includes],
-  [AC_HELP_STRING([--with-iconv-includes],
+  [AS_HELP_STRING([--with-iconv-includes],
     [directory containing iconv.h])],
     [ICONV_INCLUDE_DIRS=$withval; CPPFLAGS="-I$withval $CPPFLAGS"],
     [ICONV_INCLUDE_DIRS=])
 
 AC_ARG_WITH([iconv-libraries],
-  [AC_HELP_STRING([--with-iconv-libraries],
+  [AS_HELP_STRING([--with-iconv-libraries],
     [directory containing iconv library])],
     [ICONV_LIB_DIRS=$withval; LDFLAGS="-L$withval $LDFLAGS"],
     [ICONV_LIB_DIRS=])
-- 
cgit v1.2.1