diff options
| author | NIIBE Yutaka <[email protected]> | 2018-10-26 00:17:49 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-10-26 00:17:49 +0000 |
| commit | bb9a89bf5defa793ae9c1939d9476f6dfd46d448 (patch) | |
| tree | 705125452a65243791b9f4684f64bf8fc022f115 | |
| parent | build: Fix previous commit. (diff) | |
| download | libassuan-bb9a89bf5defa793ae9c1939d9476f6dfd46d448.tar.gz libassuan-bb9a89bf5defa793ae9c1939d9476f6dfd46d448.zip | |
build: Improve libassuan.m4.
* src/libassuan.m4: Don't try gpgrt-config when LIBASSUAN_CONFIG set.
Fall back to detecting libassuan-config, when gpgrt-config doesn't
work well.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | src/libassuan.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libassuan.m4 b/src/libassuan.m4 index 798e458..a39ed76 100644 --- a/src/libassuan.m4 +++ b/src/libassuan.m4 @@ -26,13 +26,13 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], fi fi - if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then + use_gpgrt_config="" + if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then if CC=$CC $GPGRT_CONFIG libassuan >/dev/null 2>&1; then LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan" - else - LIBASSUAN_CONFIG=no + use_gpgrt_config=yes fi - else + if test -z "$use_gpgrt_config"; then AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no) fi |