diff options
| author | Jim Meyering <jim@meyering.net> | 2011-11-28 13:47:08 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-11-28 15:06:32 +0100 |
| commit | 77ee8fd55c9e599f41a3cad0ebaa23c72ca14409 (patch) | |
| tree | 3bc2df72cb8e7af6a159f209cbafbbbdda08f78f /m4/gpg-error.m4 | |
| parent | Improve ssh card key diagnostic message. (diff) | |
| download | gnupg2-77ee8fd55c9e599f41a3cad0ebaa23c72ca14409.tar.xz gnupg2-77ee8fd55c9e599f41a3cad0ebaa23c72ca14409.zip | |
accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix
* m4/gpg-error.m4: Update from git master.
Diffstat (limited to '')
| -rw-r--r-- | m4/gpg-error.m4 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 index 2e5a0abce..35cbc78ce 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 |