From patchwork Mon Mar 14 12:16:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 51946 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ABE5A385E455 for ; Mon, 14 Mar 2022 12:17:14 +0000 (GMT) X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id ACF213857411 for ; Mon, 14 Mar 2022 12:17:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ACF213857411 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from tarox.wildebeest.org (83-87-18-245.cable.dynamic.v4.ziggo.nl [83.87.18.245]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id EB279301B4D0; Mon, 14 Mar 2022 13:16:58 +0100 (CET) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id 72A4E425A46B; Mon, 14 Mar 2022 13:16:53 +0100 (CET) From: Mark Wielaard To: elfutils-devel@sourceware.org Subject: [COMMITTED] configure: Use AS_HELP_STRING instead of AC_HELP_STRING. Date: Mon, 14 Mar 2022 13:16:52 +0100 Message-Id: <20220314121652.4406-1-mark@klomp.org> X-Mailer: git-send-email 2.18.4 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , Cc: Mark Wielaard Errors-To: elfutils-devel-bounces+patchwork=sourceware.org@sourceware.org Sender: "Elfutils-devel" 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 --- ChangeLog | 4 ++++ configure.ac | 4 ++-- m4/ChangeLog | 5 +++++ m4/biarch.m4 | 2 +- m4/zip.m4 | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0ea04be..2f46f903 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2021-03-14 Mark Wielaard + + * configure.ac: Use AS_HELP_STRING instead of AC_HELP_STRING. + 2021-03-11 Mark Wielaard * NEWS: Document new --relative option for addr2line. diff --git a/configure.ac b/configure.ac index 52882fa9..1aff9f30 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 32832693..d4c3c28c 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2022-03-14 Mark Wielaard + + * biarch.m4: Use AS_HELP_STRING instead of AC_HELP_STRING. + * zip.m4: Likewise. + 2020-12-15 Dmitry V. Levin * .gitignore: New file. diff --git a/m4/biarch.m4 b/m4/biarch.m4 index c238d8d1..68618473 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 ab6fd57e..8affa3fa 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],