Run autoupdate on configure.ac and aclocal.m4

3 files changed, 16 insertions, 13 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 0cf7269..cfc3858 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
 # Local macros for help2man
 
-# Copyright (C) 2012, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2012, 2014, 2022 Free Software Foundation, Inc.
 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -18,7 +18,7 @@ AC_DEFUN(LOCAL_PROG_PERL,
 [# find perl binary
 AC_MSG_CHECKING([for perl])
 AC_CACHE_VAL(ac_cv_prog_PERL,
-[ifelse([$1],,,[echo "configure:__oline__: ...version $1 required" >&AC_FD_CC
+[ifelse([$1],,,[echo "configure:__oline__: ...version $1 required" >&AS_MESSAGE_LOG_FD
   ])# allow user to override
   if test -n "$PERL"; then
     ac_try="$PERL"
@@ -27,9 +27,9 @@ AC_CACHE_VAL(ac_cv_prog_PERL,
   fi
 
   for ac_prog in $ac_try; do
-    echo "configure:__oline__: trying $ac_prog" >&AC_FD_CC
+    echo "configure:__oline__: trying $ac_prog" >&AS_MESSAGE_LOG_FD
     if ($ac_prog -e 'printf "found version %g\n",$RIGHT_BRACKET dnl
-ifelse([$1],,,[;exit($RIGHT_BRACKET<$1)])') 1>&AC_FD_CC 2>&1; then
+ifelse([$1],,,[;exit($RIGHT_BRACKET<$1)])') 1>&AS_MESSAGE_LOG_FD 2>&1; then
       ac_cv_prog_PERL=$ac_prog
       break
     fi
@@ -50,8 +50,8 @@ AC_DEFUN(LOCAL_PERL_MODULE,
 AC_MSG_CHECKING([for module $1])
 define([AC_CV_NAME], translit([ac_cv_module_$1], [:], [_]))dnl
 AC_CACHE_VAL(AC_CV_NAME,
-[ifelse([$2],,,[echo "configure:__oline__: ...version $2 required" >&AC_FD_CC
-  ])if ($PERL -m$1[]ifelse([$2],,,[=$2]) -e 1) 1>&AC_FD_CC 2>&1; then
+[ifelse([$2],,,[echo "configure:__oline__: ...version $2 required" >&AS_MESSAGE_LOG_FD
+  ])if ($PERL -m$1[]ifelse([$2],,,[=$2]) -e 1) 1>&AS_MESSAGE_LOG_FD 2>&1; then
     AC_CV_NAME=yes
   else
     AC_CV_NAME=no
diff --git a/configure.ac b/configure.ac
index 61967d6..ee1d271 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 2012, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2012, 2014, 2022 Free Software Foundation, Inc.
 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -9,8 +9,8 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Written by Brendan O'Dea <bod@debian.org>
 
-AC_INIT([GNU help2man], m4_esyscmd_s([./help2man.PL --version]),
-	[bug-help2man@gnu.org])
+AC_INIT([GNU help2man], [m4_esyscmd_s(./help2man.PL --version)],
+        [bug-help2man@gnu.org])
 
 AC_CONFIG_SRCDIR(help2man.PL)
 AC_CONFIG_AUX_DIR([build-aux])
@@ -32,9 +32,10 @@ test -z "$MSGFMT" && nls_default=no
 test "x$ac_cv_search_dlsym" = xno && nls_default=no
 test "x$ac_cv_search_bindtextdomain" = xno && nls_default=no
 
-AC_ARG_ENABLE([nls], AC_HELP_STRING([--enable-nls],
-	[enable support for generating localised pages]),
-	[ac_cv_enable_nls=$enableval], [ac_cv_enable_nls=$nls_default])
+AC_ARG_ENABLE([nls],
+	      AS_HELP_STRING([--enable-nls],
+			     [enable support for generating localised pages]),
+	      [ac_cv_enable_nls=$enableval], [ac_cv_enable_nls=$nls_default])
 
 AC_SUBST(extra_make_all, '')
 AC_SUBST(extra_make_install, '')
diff --git a/debian/changelog b/debian/changelog
index f12dd23..0e87ef9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ help2man (1.49.1) unstable; urgency=medium
     Perl's Encode module (closes: #894126).
   * Defer encoding of variables in .TH and encode the whole header.
   * Remove translation of "GNU" from po/sr.po.
+  * Run autoupdate on configure.ac and aclocal.m4 to replace some obsolete
+    macros.
 
- -- Brendan O'Dea <bod@debian.org>  Tue, 15 Feb 2022 11:12:47 +1100
+ -- Brendan O'Dea <bod@debian.org>  Tue, 15 Feb 2022 11:46:50 +1100
 
 help2man (1.48.5) unstable; urgency=medium