diff options
| author | Werner Koch <[email protected]> | 2013-02-26 12:33:28 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-02-26 15:15:02 +0000 |
| commit | 863c0f2a3eaf2a5d46c5518e5ac3486cc1a49bd3 (patch) | |
| tree | 975f89790b93af1d69cf92fa1053d7ee345c0cb5 /m4/gpg-error.m4 | |
| parent | Update helper scripts. (diff) | |
| download | gpgme-863c0f2a3eaf2a5d46c5518e5ac3486cc1a49bd3.tar.gz gpgme-863c0f2a3eaf2a5d46c5518e5ac3486cc1a49bd3.zip | |
Update GnuPG related m4 files.
* m4/gpg-error.m4: Update from libgpg-error.
* m4/libassuan.m4: Update from libassuan.
Diffstat (limited to 'm4/gpg-error.m4')
| -rw-r--r-- | m4/gpg-error.m4 | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 index ef07fd7c..feb963c6 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 @@ -15,10 +15,21 @@ 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], - [prefix where GPG Error is installed (optional)]), - gpg_error_config_prefix="$withval", gpg_error_config_prefix="") + 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"]) + + 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"]) + 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 |