diff options
| author | Werner Koch <wk@gnupg.org> | 2015-04-12 19:58:28 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-04-12 19:58:28 +0200 |
| commit | eb54282e39fe4bc7bea447e6f0d1f446c529b482 (patch) | |
| tree | eeb48b75af828e1e986ab44a840a01694159d3e3 /m4 | |
| parent | Post release updates. (diff) | |
| download | gnupg2-eb54282e39fe4bc7bea447e6f0d1f446c529b482.tar.xz gnupg2-eb54282e39fe4bc7bea447e6f0d1f446c529b482.zip | |
build: Update gpg-error.m4.
--
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gpg-error.m4 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 index 136270919..1661204c2 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 @@ -26,19 +26,20 @@ dnl is added to the gpg_config_script_warn variable. 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}" = x ; then if test x"${gpg_error_config_prefix}" != x ; then @@ -63,7 +64,8 @@ AC_DEFUN([AM_PATH_GPG_ERROR], min_gpg_error_version=ifelse([$1], ,0.0,$1) AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ok=no - if test "$GPG_ERROR_CONFIG" != "no" ; then + if test "$GPG_ERROR_CONFIG" != "no" \ + && test -f "$GPG_ERROR_CONFIG" ; then req_major=`echo $min_gpg_error_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` req_minor=`echo $min_gpg_error_version | \ |