[git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-15-ge56e1de

by Jim Meyering cvs at cvs.gnupg.org
Mon Nov 28 15:59:55 CET 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".

The branch, master has been updated
       via  e56e1ded234f73a3c6286fb2b3cc652d8ebabbfa (commit)
      from  377ff84d2187e02e723068d2b14a25cdbc7f5755 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e56e1ded234f73a3c6286fb2b3cc652d8ebabbfa
Author: Jim Meyering <jim at meyering.net>
Date:   Mon Nov 28 13:46:16 2011 +0100

    accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix
    
    * m4/gpg-error.m4: Update from git master.

diff --git a/ChangeLog b/ChangeLog
index 4bd3ee2..8d3d04d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-28  Jim Meyering  <meyering at redhat.com>
+
+	accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix
+	* m4/gpg-error.m4: Update from git master.
+
 2011-09-15  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Bump LT version at C19/A0/R0 due to the ABI change.
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 8d82925..eb5d7c4 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -14,10 +14,21 @@ dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS
 dnl
 AC_DEFUN([AM_PATH_GPG_ERROR],
-[ AC_ARG_WITH(gpg-error-prefix,
-            AC_HELP_STRING([--with-gpg-error-prefix=PFX],
+[
+  dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
+  dnl since that is consistent with how our three siblings use the directory/
+  dnl package name in --with-$dir_name-prefix=PFX.
+  AC_ARG_WITH(libgpg-error-prefix,
+            AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
                            [prefix where GPG Error is installed (optional)]),
      gpg_error_config_prefix="$withval", gpg_error_config_prefix="")
+
+  dnl Accept --with-gpg-error-prefix and make it work the same as
+  dnl --with-libgpg-error-prefix above, for backwards compatibility,
+  dnl but do not document this old, inconsistently-named option.
+  AC_ARG_WITH(gpg-error-prefix,,
+     gpg_error_config_prefix="$withval", gpg_error_config_prefix="")
+
   if test x$gpg_error_config_prefix != x ; then
      if test x${GPG_ERROR_CONFIG+set} != xset ; then
         GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    5 +++++
 m4/gpg-error.m4 |   15 +++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org




More information about the Gnupg-commits mailing list