From c4f57cebfd9dc867bdbda1e74105dd340da9dc18 Mon Sep 17 00:00:00 2001 From: dave-w1hkj Date: Thu, 16 May 2024 09:08:11 -0500 Subject: [PATCH] autotools * update m4 macros --- m4/debug.m4 | 9 ++++----- m4/macosx.m4 | 3 +-- m4/np-compat.m4 | 2 +- m4/opt.m4 | 3 +-- m4/pkg-config.m4 | 2 +- m4/static.m4 | 2 +- m4/win32.m4 | 3 +-- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/m4/debug.m4 b/m4/debug.m4 index fe6c1ad..bbfcfcf 100644 --- a/m4/debug.m4 +++ b/m4/debug.m4 @@ -3,12 +3,12 @@ AC_DEFUN([AC_FL_RDYNAMIC], [ LDFLAGS="$LDFLAGS -rdynamic" AC_MSG_CHECKING([whether $CC supports -rdynamic]) - AC_TRY_LINK([], [], [ac_cv_rdynamic=yes], [ac_cv_rdynamic=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_rdynamic=yes],[ac_cv_rdynamic=no]) AC_MSG_RESULT([$ac_cv_rdynamic]) AC_LANG_PUSH(C++) AC_MSG_CHECKING([whether $CXX supports -rdynamic]) - AC_TRY_LINK([], [], [ac_cv_rdynamic=yes], [ac_cv_rdynamic=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[ac_cv_rdynamic=yes],[ac_cv_rdynamic=no]) AC_MSG_RESULT([$ac_cv_rdynamic]) AC_LANG_POP(C++) @@ -19,7 +19,7 @@ AC_DEFUN([AC_FL_RDYNAMIC], [ AC_DEFUN([AC_FL_DEBUG], [ AC_REQUIRE([AC_FL_OPT]) AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], [turn on debugging]), + AS_HELP_STRING([--enable-debug],[turn on debugging]), [case "${enableval}" in yes|no) ac_cv_debug="${enableval}" ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;; @@ -29,8 +29,7 @@ AC_DEFUN([AC_FL_DEBUG], [ AC_ARG_VAR([BFD_CFLAGS], [C compiler flags for libbfd]) AC_ARG_VAR([BFD_LIBS], [linker flags for libbfd]) AC_ARG_WITH([bfd], - AC_HELP_STRING([--with-bfd@<:@=DIR@:>@], - [search for libbfd in DIR/include and DIR/lib @<:@mingw32 only@:>@]), + AS_HELP_STRING([--with-bfd@<:@=DIR@:>@],[search for libbfd in DIR/include and DIR/lib @<:@mingw32 only@:>@]), [ac_cv_want_bfd="$withval"], [ac_cv_want_bfd=yes]) diff --git a/m4/macosx.m4 b/m4/macosx.m4 index 78bb8b2..1a984de 100644 --- a/m4/macosx.m4 +++ b/m4/macosx.m4 @@ -8,8 +8,7 @@ case "$target_os" in ;; esac -AC_ARG_ENABLE([mac-universal], AC_HELP_STRING([--enable-mac-universal], - [build a universal binary on Mac OS X @<:@no@:>@]), +AC_ARG_ENABLE([mac-universal], AS_HELP_STRING([--enable-mac-universal],[build a universal binary on Mac OS X @<:@no@:>@]), [case "${enableval}" in yes|no) ac_cv_mac_universal="${enableval}" ;; *) AC_MSG_ERROR([bad value "${enableval}" for --enable-mac-universal]) ;; diff --git a/m4/np-compat.m4 b/m4/np-compat.m4 index 20aaad5..fa0efc8 100644 --- a/m4/np-compat.m4 +++ b/m4/np-compat.m4 @@ -3,7 +3,7 @@ AC_DEFUN([AC_FLMSG_NP_COMPAT], [ AC_REQUIRE([AC_FL_WIN32]) AC_ARG_WITH([clock_gettime], - AC_HELP_STRING([--without-clock_gettime], [Do not use clock_gettime lib]), + AS_HELP_STRING([--without-clock_gettime],[Do not use clock_gettime lib]), [case "${withval}" in yes|no) ac_cv_with_clock_gettime="${withval}" ;; *) AC_MSG_ERROR([bad value ${withval} for --without-clock_gettime]) ;; diff --git a/m4/opt.m4 b/m4/opt.m4 index 460d23b..35de2ae 100644 --- a/m4/opt.m4 +++ b/m4/opt.m4 @@ -1,7 +1,6 @@ AC_DEFUN([AC_FL_OPT], [ AC_ARG_ENABLE([optimizations], - AC_HELP_STRING([--enable-optimizations], - [use x86 optimizations (none|sse|sse2|sse3|native) @<:@none@:>@]), + AS_HELP_STRING([--enable-optimizations],[use x86 optimizations (none|sse|sse2|sse3|native) @<:@none@:>@]), [case "${enableval}" in none|sse|sse2|sse3|native) ac_cv_opt="${enableval}" ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-optimizations]) ;; diff --git a/m4/pkg-config.m4 b/m4/pkg-config.m4 index e1f03d3..923191c 100644 --- a/m4/pkg-config.m4 +++ b/m4/pkg-config.m4 @@ -4,7 +4,7 @@ AC_DEFUN([AC_FLMSG_PKG_CHECK], [ m4_define([PKG_NAME_UC], m4_translit([$1], [a-z], [A-Z])) m4_if([$3], [yes], - [ AC_ARG_WITH($1, AC_HELP_STRING([--with-[]$1], [$5]), + [ AC_ARG_WITH($1, AS_HELP_STRING([--with-[]$1],[$5]), [case "${withval}" in yes|no) ac_cv_want_[]$1="${withval}" ;; *) AC_MSG_ERROR([bad value "${withval}" for --with-[]$1]) ;; diff --git a/m4/static.m4 b/m4/static.m4 index 8c5bdd2..0a02034 100644 --- a/m4/static.m4 +++ b/m4/static.m4 @@ -1,6 +1,6 @@ AC_DEFUN([AC_FL_STATIC], [ AC_ARG_ENABLE([static], - AC_HELP_STRING([--enable-static], [enable static linking for some libraries]), + AS_HELP_STRING([--enable-static],[enable static linking for some libraries]), [case "${enableval}" in yes|no) ac_cv_static="${enableval}" ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-static]) ;; diff --git a/m4/win32.m4 b/m4/win32.m4 index 0f5b409..e1342b2 100644 --- a/m4/win32.m4 +++ b/m4/win32.m4 @@ -37,8 +37,7 @@ AC_ARG_VAR([PTW32_CFLAGS], [C compiler flags for pthreads-w32]) AC_ARG_VAR([PTW32_LIBS], [linker flags for pthreads-w32]) AC_ARG_WITH([ptw32], - AC_HELP_STRING([--with-ptw32@<:@=DIR@:>@], - [search for pthreads-w32 in DIR/include and DIR/lib @<:@mingw32 only@:>@]), + AS_HELP_STRING([--with-ptw32@<:@=DIR@:>@],[search for pthreads-w32 in DIR/include and DIR/lib @<:@mingw32 only@:>@]), [ac_cv_want_ptw32="$withval"], [ac_cv_want_ptw32=no])