From 9de02ca16d30a3501a9333e48934b008fcd94f8f Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 31 Mar 2022 11:08:31 +0900 Subject: build: When no gpg-error-config, not install libassuan-config. * configure.ac (USE_GPGRT_CONFIG): New. * src/Makefile.am [USE_GPGRT_CONFIG]: Conditionalize the install of libassuan-config. -- When system will migrate use of gpgrt-config and removal of gpg-error-config, libassuan-config will not be installed (but use libassuan.pc by gpgrt-config). Signed-off-by: NIIBE Yutaka --- configure.ac | 2 ++ src/Makefile.am | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index acf1264..ec26580 100644 --- a/configure.ac +++ b/configure.ac @@ -384,6 +384,8 @@ AM_CONDITIONAL(USE_DESCRIPTOR_PASSING, test "$use_descriptor_passing" = "yes") # Checking for libgpg-error. AM_PATH_GPG_ERROR(1.17,, AC_MSG_ERROR([libgpg-error was not found])) +AM_CONDITIONAL(USE_GPGRT_CONFIG, [test -n "$GPGRT_CONFIG" \ + -a "$ac_cv_path_GPG_ERROR_CONFIG" = no]) # # Checks for library functions. diff --git a/src/Makefile.am b/src/Makefile.am index 0edd514..6882db2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,11 @@ EXTRA_DIST = libassuan-config.in libassuan.m4 libassuan.vers \ libassuan.pc.in AM_CPPFLAGS = -I.. +if USE_GPGRT_CONFIG +noinst_SCRIPTS = libassuan-config +else bin_SCRIPTS = libassuan-config +endif m4datadir = $(datadir)/aclocal m4data_DATA = libassuan.m4 lib_LTLIBRARIES = libassuan.la -- cgit v1.2.3