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. --- configure.ac | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c8999d923..29592fd41 100644 --- a/configure.ac +++ b/configure.ac @@ -233,18 +233,6 @@ test -n "$GNUPG_DIRMNGR_LDAP_PGM" \ && show_gnupg_dirmngr_ldap_pgm="$GNUPG_DIRMNGR_LDAP_PGM" -# -# For a long time gpg 2.x was installed as gpg2. This changed with -# 2.2. This option can be used to install gpg under the name gpg2. -# -AC_ARG_ENABLE(gpg-is-gpg2, - AS_HELP_STRING([--enable-gpg-is-gpg2],[Set installed name of gpg to gpg2]), - gpg_is_gpg2=$enableval) -if test "$gpg_is_gpg2" = "yes"; then - AC_DEFINE(USE_GPG2_HACK, 1, [Define to install gpg as gpg2]) -fi -AM_CONDITIONAL(USE_GPG2_HACK, test "$gpg_is_gpg2" = "yes") - # SELinux support includes tracking of sensitive files to avoid # leaking their contents through processing these files by gpg itself -- cgit v1.2.3