diff options
| author | NIIBE Yutaka <[email protected]> | 2024-05-14 01:30:47 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2024-05-14 01:30:47 +0000 |
| commit | 882ccc8ea77a8bcb7628674e9fad6541f915094b (patch) | |
| tree | 3ef5dabaf2c9c82104c21019b41fafd9de18c1b9 /src | |
| parent | cpp: Handle smart card op failure status messages (diff) | |
| download | gpgme-882ccc8ea77a8bcb7628674e9fad6541f915094b.tar.gz gpgme-882ccc8ea77a8bcb7628674e9fad6541f915094b.zip | |
gpgme.m4: Update _AM_PATH_GPGRT_CONFIG macro from gpg-error.m4.
* src/gpgme.m4 (_AM_PATH_GPGRT_CONFIG): Update.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpgme.m4 | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gpgme.m4 b/src/gpgme.m4 index f2906c16..25d1e531 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 @@ -9,7 +9,7 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# Last-changed: 2022-11-25 +# Last-changed: 2024-05-14 dnl @@ -73,12 +73,9 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl fi if test -n "$gpgrt_libdir"; then break; fi done - if test -z "$libdir_candidates"; then - # No valid pkgconfig dir in any of the system directories, fallback - gpgrt_libdir=${possible_libdir1} - fi - else - # When we cannot determine system libdir-format, use this: + fi + if test -z "$gpgrt_libdir"; then + # No valid pkgconfig dir in any of the system directories, fallback gpgrt_libdir=${possible_libdir1} fi else @@ -92,6 +89,7 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl 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` unset GPGRT_CONFIG fi elif test "$GPG_ERROR_CONFIG" != "no"; then |