diff options
| author | NIIBE Yutaka <[email protected]> | 2024-06-13 05:46:08 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2024-06-13 05:46:08 +0000 |
| commit | 14b035034ab52c73f8d1aab2c475b3e8709600b4 (patch) | |
| tree | 6a2b233c5216fe625c6b233420ddc06c11d41ee9 | |
| parent | qt: Allow specifying import options when importing keys (diff) | |
| download | gpgme-14b035034ab52c73f8d1aab2c475b3e8709600b4.tar.gz gpgme-14b035034ab52c73f8d1aab2c475b3e8709600b4.zip | |
gpgme.m4: Fix setting/using GPG_ERROR_CONFIG.
gpgm4.m4 (_AM_PATH_GPGRT_CONFIG): Don't set GPG_ERROR_CONFIG and
gpg_error_config_version.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | src/gpgme.m4 | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gpgme.m4 b/src/gpgme.m4 index bcfcc79e..4cfe8990 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 @@ -83,17 +83,16 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl fi if test -n "$gpgrt_libdir"; then + # Add the --libdir option to GPGRT_CONFIG GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" - if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then - GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" - AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) - gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` - else - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` + # Make sure if gpgrt-config really works, by testing config gpg-error + if ! $GPGRT_CONFIG gpg-error --exists; then + # If it doesn't work, clear the GPGRT_CONFIG variable. unset GPGRT_CONFIG fi - elif test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` + else + # GPGRT_CONFIG found but no suitable dir for --libdir found. + # This is a failure. Clear the GPGRT_CONFIG variable. unset GPGRT_CONFIG fi ]) |