From: Mark Wielaard <mark@klomp.org>
Date: Mon, 14 Mar 2022 12:13:34 +0000 (+0100)
Subject: configure: Use AS_HELP_STRING instead of AC_HELP_STRING.
X-Git-Tag: elfutils-0.187~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a36370010df049b1d301a5531246ec7a693b95b;p=thirdparty%2Felfutils.git

configure: Use AS_HELP_STRING instead of AC_HELP_STRING.

In most places we already used AS_HELP_STRING. A few places used
AC_HELP_STRING. Which has been deprecated for a long time. Use
AS_HELP_STRING instead of AC_HELP_STRING everywhere.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/ChangeLog b/ChangeLog
index f0ea04be2..2f46f903d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-03-14  Mark Wielaard  <mark@klomp.org>
+
+	* configure.ac: Use AS_HELP_STRING instead of AC_HELP_STRING.
+
 2021-03-11  Mark Wielaard  <mark@klomp.org>
 
 	* NEWS: Document new --relative option for addr2line.
diff --git a/configure.ac b/configure.ac
index 52882fa92..1aff9f30a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -744,7 +744,7 @@ AC_CHECK_PROG(HAVE_ZSTD, zstd, yes, no)
 AM_CONDITIONAL([HAVE_ZSTD],[test "x$HAVE_ZSTD" = "xyes"])
 
 # Look for libcurl for libdebuginfod minimum version as per rhel7.
-AC_ARG_ENABLE([libdebuginfod],AC_HELP_STRING([--enable-libdebuginfod], [Build debuginfod client library (can be =dummy)]))
+AC_ARG_ENABLE([libdebuginfod],AS_HELP_STRING([--enable-libdebuginfod], [Build debuginfod client library (can be =dummy)]))
 AS_IF([test "x$enable_libdebuginfod" != "xno"], [
     if test "x$enable_libdebuginfod" != "xdummy"; then
       AC_MSG_NOTICE([checking libdebuginfod dependencies, --disable-libdebuginfod or --enable-libdebuginfo=dummy to skip])
@@ -771,7 +771,7 @@ AM_CONDITIONAL([DUMMY_LIBDEBUGINFOD],[test "x$enable_libdebuginfod" = "xdummy"])
 
 # Look for libmicrohttpd, libarchive, sqlite for debuginfo server
 # minimum versions as per rhel7.
-AC_ARG_ENABLE([debuginfod],AC_HELP_STRING([--enable-debuginfod], [Build debuginfod server]))
+AC_ARG_ENABLE([debuginfod],AS_HELP_STRING([--enable-debuginfod], [Build debuginfod server]))
 AS_IF([test "x$enable_debuginfod" != "xno"], [
     AC_MSG_NOTICE([checking debuginfod C++11 support, --disable-debuginfod to skip])
     AX_CXX_COMPILE_STDCXX(11, noext, mandatory)
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 32832693a..d4c3c28c8 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2022-03-14  Mark Wielaard  <mark@klomp.org>
+
+	* biarch.m4: Use AS_HELP_STRING instead of AC_HELP_STRING.
+	* zip.m4: Likewise.
+
 2020-12-15  Dmitry V. Levin  <ldv@altlinux.org>
 
 	* .gitignore: New file.
diff --git a/m4/biarch.m4 b/m4/biarch.m4
index c238d8d1d..686184733 100644
--- a/m4/biarch.m4
+++ b/m4/biarch.m4
@@ -28,7 +28,7 @@ biarch_CC="$biarch_CC $utrace_biarch"])])
 AC_DEFUN([utrace_BIARCH], [AC_REQUIRE([utrace_HOST64])
 utrace_biarch_forced=no
 AC_ARG_WITH([biarch],
-	    AC_HELP_STRING([--with-biarch],
+	    AS_HELP_STRING([--with-biarch],
 			   [enable biarch tests despite build problems]),
 	    [AS_IF([test "x$with_biarch" != xno], [utrace_biarch_forced=yes])])
 AS_IF([test $utrace_biarch_forced = yes], [dnl
diff --git a/m4/zip.m4 b/m4/zip.m4
index ab6fd57e9..8affa3fa5 100644
--- a/m4/zip.m4
+++ b/m4/zip.m4
@@ -4,7 +4,7 @@ dnl and sets AC_DEFINE(USE_$2) and LIBS.
 
 AC_DEFUN([eu_ZIPLIB], [dnl
 AC_ARG_WITH([[$1]],
-AC_HELP_STRING([--with-[$1]], [support [$1] compression in libdwfl]),,
+AS_HELP_STRING([--with-[$1]], [support [$1] compression in libdwfl]),,
 	    [with_[$1]=default])
 if test $with_[$1] != no; then
   AC_SEARCH_LIBS([$4], [$3], [with_[$1]=yes],