diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
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 |