build: Only install gpg-error-config when enabled.

* configure.ac (INSTALL_GPG_ERROR_CONFIG): New.
* src/Makefile.am (bin_SCRIPTS, noinst_SCRIPTS): Conditionalize.

--

GnuPG-bug-id: 5683
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

3 files changed, 19 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index 46a7a56..3b55448 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 Noteworthy changes in version 1.46 (unreleased) [C33/A33/R_]
 -----------------------------------------------
 
+ * The gpg-error-config command is not installed by default, because
+   it is now replaced by use of pkg-config/gpgrt-config with
+   gpg-error.pc.  Supply --enable-install-gpg-error-config configure
+   option, if it's really needed.
+
  Release-info: https://dev.gnupg.org/T5923
 
 
diff --git a/configure.ac b/configure.ac
index b457178..af57678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,15 @@ AH_BOTTOM([
 #define GPGRT_ENABLE_ARGPARSE_MACROS 1
 ])
 
+# We used to provide gpg-error-config command always.  Now, it's
+# gpgrt-config command with gpg-error.pc configuration file, which
+# does same thing.  gpg-error-config command is deprecated.
+AC_ARG_ENABLE(install-gpg-error-config,
+  AS_HELP_STRING([--enable-install-gpg-error-config],
+                 [install gpg-error-config command]),
+  install_gpg_error_config=$enableval)
+AM_CONDITIONAL(INSTALL_GPG_ERROR_CONFIG,
+               test "$install_gpg_error_config" = "yes")
 
 # Note, that autogen.sh greps for the next line.
 AM_GNU_GETTEXT_VERSION([0.19.3])
diff --git a/src/Makefile.am b/src/Makefile.am
index ded4f0b..c61adde 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,7 +78,12 @@ lock_obj_pub = \
 
 lib_LTLIBRARIES = libgpg-error.la
 nodist_include_HEADERS = gpg-error.h gpgrt.h
+if INSTALL_GPG_ERROR_CONFIG
 bin_SCRIPTS = gpgrt-config gpg-error-config
+else
+bin_SCRIPTS = gpgrt-config
+noinst_SCRIPTS = gpg-error-config
+endif
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gpg-error.m4 gpgrt.m4