summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2014-06-25 20:25:28 +0200
committerWerner Koch <wk@gnupg.org>2014-06-26 17:23:47 +0200
commitc0d1e7fca95629e1cddd7d129fa51b9a6556cb70 (patch)
treed77c8632426043ea860c3c32a3f56221cac2d9b2 /configure.ac
parentagent: Fix export of RSA keys to OpenPGP. (diff)
downloadgnupg2-c0d1e7fca95629e1cddd7d129fa51b9a6556cb70.tar.xz
gnupg2-c0d1e7fca95629e1cddd7d129fa51b9a6556cb70.zip
Enable DNS SRV records again.
* configure.ac (GPGKEYS_HKP, GPGKEYS_FINGER): Remove ac_subst. (use_dns_srv): Make test work.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac19
1 files changed, 4 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index 309b2bcf2..8b2317928 100644
--- a/configure.ac
+++ b/configure.ac
@@ -735,15 +735,6 @@ fi
# (These need to go after AC_PROG_CC so that $EXEEXT is defined)
AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any])
-if test x"$try_hkp" = xyes ; then
- AC_SUBST(GPGKEYS_HKP,"gpg2keys_hkp$EXEEXT")
-fi
-
-if test x"$try_finger" = xyes ; then
- AC_SUBST(GPGKEYS_FINGER,"gpg2keys_finger$EXEEXT")
-fi
-
-
#
# Checks for libraries.
@@ -925,12 +916,10 @@ AC_CHECK_FUNCS(adns_free)
#
# Now try for the resolver functions so we can use DNS for SRV, PA and CERT.
#
-if test x"$try_hkp" = xyes || test x"$try_http" = xyes ; then
- AC_ARG_ENABLE(dns-srv,
- AC_HELP_STRING([--disable-dns-srv],
- [disable the use of DNS SRV in HKP and HTTP]),
- use_dns_srv=$enableval,use_dns_srv=yes)
-fi
+AC_ARG_ENABLE(dns-srv,
+ AC_HELP_STRING([--disable-dns-srv],
+ [disable the use of DNS SRV in HKP and HTTP]),
+ use_dns_srv=$enableval,use_dns_srv=yes)
AC_ARG_ENABLE(dns-pka,
AC_HELP_STRING([--disable-dns-pka],