diff options
| author | Werner Koch <wk@gnupg.org> | 2013-02-22 15:07:36 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-02-22 15:07:36 +0100 |
| commit | 056cc2d0dfef023fda47ce377d3ee544612526a3 (patch) | |
| tree | e6eefb42063b32ce2f52630ac94b25913b4d6ad7 /src/gpg-error.m4 | |
| parent | 3977201d2a82fcbe0341660e07a3b0d5c790f927 (diff) | |
| download | libgpg-error-056cc2d0dfef023fda47ce377d3ee544612526a3.tar.gz | |
Fix the alias mechanism for --with-libgpg-error-prefix.
* src/gpg-error.m4: Do not use the no-action branch in AC_ARG_WITH.
--
This fixes commit aaa3f534. The bug was that --with-gpg-error-prefix
always reset the value from --with-libgpg-error-prefix.
Diffstat (limited to 'src/gpg-error.m4')
| -rw-r--r-- | src/gpg-error.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 index f0b9f1f..feb963c 100644 --- a/src/gpg-error.m4 +++ b/src/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 |