From a61798d8746238bffefec620ed6bc93e440df3e5 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 7 Dec 2009 17:12:28 +0000
Subject: [PATCH] Fix last configure change.

---
 ChangeLog    | 1 +
 common/pka.c | 2 +-
 configure.ac | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41de8baad..657d89a61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* configure.ac: Check for ADNS before checking for the BIND
 	resolver.
+	(USE_ADNS): Fallback macro for PKA and CERT lookups.
 
 2009-10-20  Marcus Brinkmann  <marcus@g10code.com>
 
diff --git a/common/pka.c b/common/pka.c
index e78f54367..4f0232324 100644
--- a/common/pka.c
+++ b/common/pka.c
@@ -1,5 +1,5 @@
 /* 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.
  *
diff --git a/configure.ac b/configure.ac
index 8797e7954..eb03419ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
      fi
   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
      # code parts which can be used with ADNS.
+     use_dns_cert=no
      if test x"$have_adns" = xyes ; then
-        DNSLIB="$ADNSLIBS"
+        DNSLIBS="$ADNSLIBS"
         AC_DEFINE(USE_ADNS,1,[Use ADNS as resolver library.])
 
         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
            AC_DEFINE(USE_DNS_PKA,1)
         fi
+     else
+        use_dns_srv=no
+        use_dns_pka=no
      fi
   fi