[PATCH gnupg] accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix

[Jim Meyering]

* 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 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
--
1.7.8.rc3.31.g017d1