summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Smith <gavinsmith0123@gmail.com>2020-09-27 21:06:51 +0200
committerBruno Haible <bruno@clisp.org>2020-09-27 21:42:11 +0200
commitfd082b5cdd9f25000a30ba65e295805b8228df3b (patch)
tree8661d3f7a26db780656e035ea45a56f35db7d389
parent1079dc95fd2c8d5ed2819f30c9b14eee0e162d04 (diff)
downloadgnulib-fd082b5cdd9f25000a30ba65e295805b8228df3b.tar.gz
Avoid "warning: The macro `AC_HELP_STRING' is obsolete".
* m4/threadlib.m4 (gl_THREADLIB_EARLY_BODY): Use AS_HELP_STRING instead of AC_HELP_STRING. * m4/libgcrypt.m4 (AM_PATH_LIBGCRYPT): Likewise.
-rw-r--r--ChangeLog7
-rw-r--r--m4/libgcrypt.m46
-rw-r--r--m4/threadlib.m46
3 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 43e84b5180..428187f419 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-09-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Avoid "warning: The macro `AC_HELP_STRING' is obsolete".
+ * m4/threadlib.m4 (gl_THREADLIB_EARLY_BODY): Use AS_HELP_STRING instead
+ of AC_HELP_STRING.
+ * m4/libgcrypt.m4 (AM_PATH_LIBGCRYPT): Likewise.
+
2020-09-27 Bruno Haible <bruno@clisp.org>
Avoid "warning: $as_echo_n is obsolete" from autoconf 2.69c.
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index f56cc1bde4..19d514fd53 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -1,5 +1,5 @@
# libgcrypt.m4 - Autoconf macros to detect libgcrypt
-# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020 g10 Code GmbH
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -9,7 +9,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-# Last-changed: 2018-11-13
+# Last-changed: 2020-09-27
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -30,7 +30,7 @@ dnl
AC_DEFUN([AM_PATH_LIBGCRYPT],
[ AC_REQUIRE([AC_CANONICAL_HOST])
AC_ARG_WITH(libgcrypt-prefix,
- AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+ AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
[prefix where LIBGCRYPT is installed (optional)]),
libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
if test x"${LIBGCRYPT_CONFIG}" = x ; then
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
index 94441f680f..1da5fc089e 100644
--- a/m4/threadlib.m4
+++ b/m4/threadlib.m4
@@ -1,4 +1,4 @@
-# threadlib.m4 serial 27
+# threadlib.m4 serial 28
dnl Copyright (C) 2005-2020 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -398,8 +398,8 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY],
[m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
m4_divert_text([DEFAULTS], [gl_use_winpthreads_default=])
AC_ARG_ENABLE([threads],
-AC_HELP_STRING([--enable-threads={isoc|posix|isoc+posix|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
-AC_HELP_STRING([--disable-threads], [build without multithread safety])]),
+AS_HELP_STRING([--enable-threads={isoc|posix|isoc+posix|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
+AS_HELP_STRING([--disable-threads], [build without multithread safety])]),
[gl_use_threads=$enableval],
[if test -n "$gl_use_threads_default"; then
gl_use_threads="$gl_use_threads_default"