[git] GPG-ERROR - branch, master, updated. libgpg-error-1.10-26-gaaa3f53

[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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  aaa3f53457369125bcfa6eeaf283df77df87d4f9 (commit)
      from  eec4aff343af43b09b6e4f4ef786bd7f0511a42c (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 aaa3f53457369125bcfa6eeaf283df77df87d4f9
Author: Jim Meyering <jim at meyering.net>
Date:   Mon Nov 28 13:44:09 2011 +0100

    accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix
    
    * src/gpg-error.m4 (AM_PATH_GPG_ERROR): Also accept
    --with-libgpg-error-prefix=PFX, for consistency with our three
    library sibling packages.

diff --git a/ChangeLog b/ChangeLog
index ecf78dd..b838b86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-28  Jim Meyering  <meyering at redhat.com>
+
+	accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix
+	* src/gpg-error.m4 (AM_PATH_GPG_ERROR): Also accept
+	--with-libgpg-error-prefix=PFX, for consistency with our three
+	library sibling packages.
+
 2011-08-23  Werner Koch  <wk at g10code.com>
 
 	* src/err-codes.h.in: Add GPG_ERR_DUP_KEY and GPG_ERR_AMBIGUOUS.
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index ef07fd7..f0b9f1f 100644
--- a/src/gpg-error.m4
+++ b/src/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        |    7 +++++++
 src/gpg-error.m4 |   14 ++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org