[Pkg-gnupg-commit] [libassuan] 367/437: accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 2e037baefdc40da6961721ad56fc7c38d4e492a8
Author: Jim Meyering <jim at meyering.net>
Date:   Mon Nov 28 13:44:58 2011 +0100

    accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix
    
    * m4/gpg-error.m4: Update from git master.
---
 ChangeLog       |  5 +++++
 m4/gpg-error.m4 | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd6f2c5..ee8e140 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-08-10  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Use http://bugs.gnupg.org as bug reporting
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index ef07fd7..f0b9f1f 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git