diff options
| author | NIIBE Yutaka <[email protected]> | 2018-10-25 10:32:17 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-10-25 10:32:17 +0000 |
| commit | e06af32bdde0b4ce8c97193472961f31c5b55ddf (patch) | |
| tree | 096fbf0828cda306d3edaecc7e56db78b9992df2 | |
| parent | build: Update gpg-error.m4 and gpgrt.m4. (diff) | |
| download | libgpg-error-e06af32bdde0b4ce8c97193472961f31c5b55ddf.tar.gz libgpg-error-e06af32bdde0b4ce8c97193472961f31c5b55ddf.zip | |
build: Set GPGRT_CONFIG in gpg-error.m4.
* src/gpg-error.m4: Detect gpgrt-config to set GPGRT_CONFIG.
--
Set GPGRT_CONFIG when there is no gpg-error-config or gpg-error-config
reports version >= 1.33.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | src/gpg-error.m4 | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 index 0f46cd6..f89a4ee 100644 --- a/src/gpg-error.m4 +++ b/src/gpg-error.m4 @@ -62,15 +62,21 @@ AC_DEFUN([AM_PATH_GPG_ERROR], AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) min_gpg_error_version=ifelse([$1], ,1.33,$1) - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ok=no - if test "$GPG_ERROR_CONFIG" != "no" \ - && test -f "$GPG_ERROR_CONFIG" ; then + if test "$GPG_ERROR_CONFIG" = "no"; then + AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) + if CC=$CC $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then + GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" + gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --modversion` + fi + else + gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --version` + fi + if test "$GPG_ERROR_CONFIG" != "no"; then req_major=`echo $min_gpg_error_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` req_minor=`echo $min_gpg_error_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --version` major=`echo $gpg_error_config_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` minor=`echo $gpg_error_config_version | \ @@ -84,7 +90,14 @@ AC_DEFUN([AM_PATH_GPG_ERROR], fi fi fi + if test -z "$GPGRT_CONFIG"; then + if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then + AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) + GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" + fi + fi fi + AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) if test $ok = yes; then GPG_ERROR_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG --cflags` GPG_ERROR_LIBS=`CC=$CC $GPG_ERROR_CONFIG --libs` |