[svn] GnuPG - r5215 - in trunk: . common

[svn author wk]

Author: wk
Date: 2009-12-07 18:12:28 +0100 (Mon, 07 Dec 2009)
New Revision: 5215

Modified:
   trunk/ChangeLog
   trunk/common/pka.c
   trunk/configure.ac
Log:
Fix last configure change.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-12-07 17:11:59 UTC (rev 5214)
+++ trunk/ChangeLog	2009-12-07 17:12:28 UTC (rev 5215)
@@ -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 at g10code.com>
 

Modified: trunk/common/pka.c
===================================================================
--- trunk/common/pka.c	2009-12-07 17:11:59 UTC (rev 5214)
+++ trunk/common/pka.c	2009-12-07 17:12:28 UTC (rev 5215)
@@ -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.
  *

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-12-07 17:11:59 UTC (rev 5214)
+++ trunk/configure.ac	2009-12-07 17:12:28 UTC (rev 5215)
@@ -829,13 +829,11 @@
         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 ; then
            AC_DEFINE(USE_DNS_PKA,1)
         fi
+     else
+        use_dns_srv=no
+        use_dns_pka=no
      fi
   fi