diff --git a/Makefile.am b/Makefile.am index e5135f55c..574563e6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ RELEASE_ARCHIVE_SUFFIX = gnupg/v2.2 # Autoconf flags. ACLOCAL_AMFLAGS = -I m4 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \ - --enable-all-tests --enable-symcryptrun --enable-g13 \ + --enable-all-tests --enable-g13 \ --enable-gpgtar --enable-wks-tools --disable-ntbtls GITLOG_TO_CHANGELOG=gitlog-to-changelog diff --git a/configure.ac b/configure.ac index 6835a4681..33903199b 100644 --- a/configure.ac +++ b/configure.ac @@ -125,7 +125,6 @@ GNUPG_BUILD_PROGRAM(scdaemon, yes) GNUPG_BUILD_PROGRAM(g13, no) GNUPG_BUILD_PROGRAM(dirmngr, yes) GNUPG_BUILD_PROGRAM(doc, yes) -GNUPG_BUILD_PROGRAM(symcryptrun, no) # We use gpgtar to unpack test data, hence we always build it. If the # user opts out, we simply don't install it. GNUPG_BUILD_PROGRAM(gpgtar, yes) @@ -975,7 +974,7 @@ AC_DEFINE_UNQUOTED(FUSERMOUNT, # -# Checks for symcryptrun: +# Checks formerly used for symcryptrun. # # libutil has openpty() and login_tty(). @@ -1779,7 +1778,6 @@ AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes") AM_CONDITIONAL(BUILD_G13, test "$build_g13" = "yes") AM_CONDITIONAL(BUILD_DIRMNGR, test "$build_dirmngr" = "yes") AM_CONDITIONAL(BUILD_DOC, test "$build_doc" = "yes") -AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes") AM_CONDITIONAL(BUILD_GPGTAR, test "$build_gpgtar" = "yes") AM_CONDITIONAL(BUILD_WKS_TOOLS, test "$build_wks_tools" = "yes") diff --git a/tools/Makefile.am b/tools/Makefile.am index 60bd1e271..05bee1937 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -60,12 +60,6 @@ if HAVE_USTAR noinst_SCRIPTS = gpg-zip endif -if BUILD_SYMCRYPTRUN - symcryptrun = symcryptrun -else - symcryptrun = -endif - if BUILD_WKS_TOOLS gpg_wks_server = gpg-wks-server else @@ -74,7 +68,7 @@ endif libexec_PROGRAMS = gpg-wks-client -bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} +bin_PROGRAMS = gpgconf gpg-connect-agent if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit else @@ -139,11 +133,6 @@ gpgconf_w32_LDFLAGS = $(gpgconf_LDFLAGS) -Wl,-subsystem,windows gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h gpgparsemail_LDADD = -symcryptrun_SOURCES = symcryptrun.c -symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \ - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \ - $(LIBICONV) $(NETLIBS) $(W32SOCKLIBS) $(LIBASSUAN_LIBS) - watchgnupg_SOURCES = watchgnupg.c watchgnupg_LDADD = $(NETLIBS)