From 2125f228d36c0882a87bce433a18253154653d50 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 11 Sep 2024 10:46:00 +0200 Subject: build: Remove configure option --enable-gpg-is-gpg2 * configure.ac (--enable-gpg-is-gpg2): Remove option. (USE_GPG2_HACK): Remove var. * common/homedir.c (gnupg_module_name): Remove code for gpg2 installation option. * g10/keygen.c (generate_keypair): Ditto. * g10/Makefile.am (noinst_PROGRAMS): Ditto. * doc/gpg.texi: Ditto. * doc/gpgv.texi: Ditto. -- This option and all its build stuff does not make anymore sense. gpg1 is way too old for anyone to use on a regualar base along with a standard gpg. It is better to rename that single gpg (1.4) binary to gpg1 and adjust any scripts. --- common/homedir.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'common') diff --git a/common/homedir.c b/common/homedir.c index 392910867..a73182e30 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -1864,20 +1864,10 @@ gnupg_module_name (int which) X(bindir, "sm", "gpgsm"); case GNUPG_MODULE_NAME_GPG: -#if USE_GPG2_HACK - if (! gnupg_build_directory) - X(bindir, "g10", GPG_NAME "2"); - else -#endif - X(bindir, "g10", GPG_NAME); + X(bindir, "g10", GPG_NAME); case GNUPG_MODULE_NAME_GPGV: -#if USE_GPG2_HACK - if (! gnupg_build_directory) - X(bindir, "g10", GPG_NAME "v2"); - else -#endif - X(bindir, "g10", GPG_NAME "v"); + X(bindir, "g10", GPG_NAME "v"); case GNUPG_MODULE_NAME_CONNECT_AGENT: X(bindir, "tools", "gpg-connect-agent"); -- cgit v1.2.3