aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2013-02-22 14:17:22 +0000
committerWerner Koch <[email protected]>2013-02-22 14:17:22 +0000
commit97ce28a430129ce997783c6196ccfe737f5b3007 (patch)
treee3996ed14799868a360d896fa3794f629d25217d
parentUpdate helper scripts. (diff)
downloadlibassuan-97ce28a430129ce997783c6196ccfe737f5b3007.tar.gz
libassuan-97ce28a430129ce997783c6196ccfe737f5b3007.zip
Fix --with-{lib,}gpg-error-prefix.
* m4/gpg-error.m4: Update from current gpg-error git.
-rw-r--r--m4/gpg-error.m49
1 files changed, 5 insertions, 4 deletions
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index f0b9f1f..feb963c 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -15,19 +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])
+ gpg_error_config_prefix=""
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="")
+ AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
+ [prefix where GPG Error is installed (optional)]),
+ [gpg_error_config_prefix="$withval"])
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="")
+ [gpg_error_config_prefix="$withval"])
if test x$gpg_error_config_prefix != x ; then
if test x${GPG_ERROR_CONFIG+set} != xset ; then