aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2022-03-31 15:09:12 +0900
committerNIIBE Yutaka <[email protected]>2022-03-31 15:09:12 +0900
commit2db5b5e995c21c5bd9cd193c2ed1109ba9b1a440 (patch)
tree6a1fff693d8ae7ba87d9d8123425714a0c4ada78
parent67b36154f88ebe271a40c3f3f7b963943c656b71 (diff)
downloadlibgcrypt-2db5b5e995c21c5bd9cd193c2ed1109ba9b1a440.tar.gz
libgcrypt-2db5b5e995c21c5bd9cd193c2ed1109ba9b1a440.tar.bz2
libgcrypt-2db5b5e995c21c5bd9cd193c2ed1109ba9b1a440.zip
build: When no gpg-error-config, not install libgcrypt-config.
* configure.ac (USE_GPGRT_CONFIG): New. * src/Makefile.am [USE_GPGRT_CONFIG]: Conditionalize the install of libgcrypt-config. -- When system will migrate use of gpgrt-config and removal of gpg-error-config, libgcrypt-config will not be installed (but use libgcrypt.pc by gpgrt-config). Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am4
2 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index c4fc8ce4..e214082b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -774,6 +774,9 @@ fi
AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GCRYPT,
[The default error source for libgcrypt.])
+AM_CONDITIONAL(USE_GPGRT_CONFIG, [test -n "$GPGRT_CONFIG" \
+ -a "$ac_cv_path_GPG_ERROR_CONFIG" = no])
+
#
# Check whether pthreads is available
#
diff --git a/src/Makefile.am b/src/Makefile.am
index b8bb187a..5e003bf0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,11 @@ pkgconfig_DATA = libgcrypt.pc
EXTRA_DIST = libgcrypt-config.in libgcrypt.m4 libgcrypt.vers \
gcrypt.h.in libgcrypt.def libgcrypt.pc.in gen-note-integrity.sh
+if USE_GPGRT_CONFIG
+noinst_SCRIPTS = libgcrypt-config
+else
bin_SCRIPTS = libgcrypt-config
+endif
m4datadir = $(datadir)/aclocal
m4data_DATA = libgcrypt.m4
nodist_include_HEADERS = gcrypt.h