From c22e3e25de0aa7841c4ef7c6b9e167b5685c2671 Mon Sep 17 00:00:00 2001 From: Matthieu Longo Date: Tue, 28 May 2024 10:49:40 +0100 Subject: autoupdate: replace obsolete macros AC_HELP_STRING - AC_HELP_STRING by AS_HELP_STRING https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fHELP_005fSTRING-1 Except for the ifdef in lib-prefix.m4, make the defun of AC_LIB_ARG_WITH unconditional. --- config/debuginfod.m4 | 2 +- config/enable.m4 | 2 +- config/lib-prefix.m4 | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/debuginfod.m4 b/config/debuginfod.m4 index c5077ac..a32cf2c 100644 --- a/config/debuginfod.m4 +++ b/config/debuginfod.m4 @@ -15,7 +15,7 @@ AC_DEFUN([AC_DEBUGINFOD], # Define HAVE_LIBDEBUGINFOD_FIND_SECTION if libdebuginfod is found with # version >= 0.188. AC_ARG_WITH([debuginfod], - AC_HELP_STRING([--with-debuginfod], [Enable debuginfo lookups with debuginfod (auto/yes/no)]), + AS_HELP_STRING([--with-debuginfod], [Enable debuginfo lookups with debuginfod (auto/yes/no)]), [], [with_debuginfod=auto]) AC_MSG_CHECKING([whether to use debuginfod]) AC_MSG_RESULT([$with_debuginfod]) diff --git a/config/enable.m4 b/config/enable.m4 index 88b29b8..119c370 100644 --- a/config/enable.m4 +++ b/config/enable.m4 @@ -11,7 +11,7 @@ dnl See docs/html/17_intro/configury.html#enable for documentation. dnl AC_DEFUN([GCC_ENABLE],[dnl m4_define([_g_switch],[--enable-$1])dnl -m4_define([_g_help],[AC_HELP_STRING(_g_switch$3,[$4 @<:@default=$2@:>@])])dnl +m4_define([_g_help],[AS_HELP_STRING([_g_switch$3],[$4 @<:@default=$2@:>@])])dnl AC_ARG_ENABLE($1,_g_help, m4_bmatch([$5], [^permit ], diff --git a/config/lib-prefix.m4 b/config/lib-prefix.m4 index c719bc8..0c6ce02 100644 --- a/config/lib-prefix.m4 +++ b/config/lib-prefix.m4 @@ -8,12 +8,9 @@ dnl the same distribution terms as the rest of that program. dnl From Bruno Haible. -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl AC_LIB_ARG_WITH is similar to AC_ARG_WITH except that it doesn't dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) +AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])]) dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed dnl to access previously installed libraries. The basic assumption is that -- cgit v1.1