bug-gnulib@gnu.org mirror (unofficial)
 help / color / mirror / Atom feed
* libgcrypt.m4 gnulib/libgcrypt unsync
@ 2020-09-30 16:59 Karl Berry
  2020-10-01  0:13 ` Bruno Haible
  0 siblings, 1 reply; 3+ messages in thread
From: Karl Berry @ 2020-09-30 16:59 UTC (permalink / raw)
  To: bug-gnulib; +Cc: wk

Looks like libgcrypt.m4 was modified in gnulib a couple days ago (from
AC_HELP_STRING to AS_HELP_STRING), but in theory it's supposed to be
synced with the libgcrypt repository. Help?

--- libgcrypt/src/libgcrypt.m4	2020-03-31 09:57:48.000000000 -0700
+++ gnulib/m4/libgcrypt.m4	2020-09-28 00:24:10.741933569 -0700
@@ -1,3 +1,3 @@
 # 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
 #
@@ -11,3 +11,3 @@
 #
-# Last-changed: 2018-11-13
+# Last-changed: 2020-09-27
 
@@ -32,3 +32,3 @@
   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)]),


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: libgcrypt.m4 gnulib/libgcrypt unsync
  2020-09-30 16:59 libgcrypt.m4 gnulib/libgcrypt unsync Karl Berry
@ 2020-10-01  0:13 ` Bruno Haible
  0 siblings, 0 replies; 3+ messages in thread
From: Bruno Haible @ 2020-10-01  0:13 UTC (permalink / raw)
  To: wk; +Cc: Gavin Smith, bug-gnulib, Karl Berry

Werner (or Simon),

Karl Berry wrote:
> Looks like libgcrypt.m4 was modified in gnulib a couple days ago (from
> AC_HELP_STRING to AS_HELP_STRING), but in theory it's supposed to be
> synced with the libgcrypt repository. Help?

Karl is right. Can the following patch be applied upstream, please?


2020-09-27  Gavin Smith  <gavinsmith0123@gmail.com>

	Avoid "warning: The macro `AC_HELP_STRING' is obsolete".
	* m4/libgcrypt.m4 (AM_PATH_LIBGCRYPT): Use AS_HELP_STRING instead
	of AC_HELP_STRING.

diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index f56cc1b..19d514f 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



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: libgcrypt.m4 gnulib/libgcrypt unsync
@ 2020-11-14 22:12 Karl Berry
  0 siblings, 0 replies; 3+ messages in thread
From: Karl Berry @ 2020-11-14 22:12 UTC (permalink / raw)
  To: wk, bug-gnulib

Hi Werner - libgcrypt.m4 was modified in gnulib back in September (from
AC_HELP_STRING to AS_HELP_STRING). In theory it's supposed to be synced
with the libgcrypt repository. Should I give up on that, or can you (or
someone) take the change back in libgcrypt? Or maybe you already did and
I don't know where the current development repository? Please advise.

Thanks,
Karl

--- libgcrypt/src/libgcrypt.m4	2020-03-31 09:57:48.000000000 -0700
+++ gnulib/m4/libgcrypt.m4	2020-09-28 00:24:10.741933569 -0700
@@ -1,3 +1,3 @@
 # 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
 #
@@ -11,3 +11,3 @@
 #
-# Last-changed: 2018-11-13
+# Last-changed: 2020-09-27
 
@@ -32,3 +32,3 @@
   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)]),




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-14 22:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-30 16:59 libgcrypt.m4 gnulib/libgcrypt unsync Karl Berry
2020-10-01  0:13 ` Bruno Haible
  -- strict thread matches above, loose matches on Subject: below --
2020-11-14 22:12 Karl Berry

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).