[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-123-g77ee8fd

[by Jim Meyering]

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 Privacy Guard".

The branch, master has been updated
       via  77ee8fd55c9e599f41a3cad0ebaa23c72ca14409 (commit)
      from  781e9746dff21fc2721373205e63d1d09722d590 (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 77ee8fd55c9e599f41a3cad0ebaa23c72ca14409
Author: Jim Meyering <jim at meyering.net>
Date:   Mon Nov 28 13:47:08 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 bd02016..7e17ba8 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-23  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Remove check for gcry_kdf_derive.
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 2e5a0ab..35cbc78 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -15,10 +15,20 @@ dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS
 dnl
 AC_DEFUN([AM_PATH_GPG_ERROR],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
-  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 |   14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org