Fix last configure change.

This commit is contained in:
Werner Koch 2009-12-07 17:12:28 +00:00
parent 85d778b9f6
commit a61798d874
3 changed files with 7 additions and 5 deletions

View File

@ -2,6 +2,7 @@
* configure.ac: Check for ADNS before checking for the BIND * configure.ac: Check for ADNS before checking for the BIND
resolver. resolver.
(USE_ADNS): Fallback macro for PKA and CERT lookups.
2009-10-20 Marcus Brinkmann <marcus@g10code.com> 2009-10-20 Marcus Brinkmann <marcus@g10code.com>

View File

@ -1,5 +1,5 @@
/* pka.c - DNS Public Key Association RR access /* pka.c - DNS Public Key Association RR access
* Copyright (C) 2005 Free Software Foundation, Inc. * Copyright (C) 2005, 2009 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *

View File

@ -829,13 +829,11 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes \
AC_DEFINE(BIND_8_COMPAT,1,[an Apple OSXism]) AC_DEFINE(BIND_8_COMPAT,1,[an Apple OSXism])
fi fi
else else
use_dns_srv=no
use_dns_pka=no
use_dns_cert=no
# If we have no resolver library but ADNS (e.g. under W32) enable the # If we have no resolver library but ADNS (e.g. under W32) enable the
# code parts which can be used with ADNS. # code parts which can be used with ADNS.
use_dns_cert=no
if test x"$have_adns" = xyes ; then if test x"$have_adns" = xyes ; then
DNSLIB="$ADNSLIBS" DNSLIBS="$ADNSLIBS"
AC_DEFINE(USE_ADNS,1,[Use ADNS as resolver library.]) AC_DEFINE(USE_ADNS,1,[Use ADNS as resolver library.])
if test x"$use_dns_srv" = xyes ; then if test x"$use_dns_srv" = xyes ; then
@ -845,6 +843,9 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes \
if test x"$use_dns_pka" = xyes ; then if test x"$use_dns_pka" = xyes ; then
AC_DEFINE(USE_DNS_PKA,1) AC_DEFINE(USE_DNS_PKA,1)
fi fi
else
use_dns_srv=no
use_dns_pka=no
fi fi
fi fi