From 5f88d3440efc4364b8d3f4c5efec0dccb3c2e21c Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 15 Oct 2003 16:57:57 +1000
Subject:  - (dtucker) [acconfig.h configure.ac dns.c
 openbsd-compat/getrrsetbyname.c    openbsd-compat/getrrsetbyname.h] DNS
 fingerprint support is now always    compiled in but disabled in config.

---
 configure.ac | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 44808f7e..3d230a6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.172 2003/10/07 10:35:57 dtucker Exp $
+# $Id: configure.ac,v 1.173 2003/10/15 06:57:57 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -1961,28 +1961,18 @@ if test x$opensc_config_prefix != x ; then
   fi
 fi
 
-# Check whether user wants DNS support
-DNS_MSG="no" 
-AC_ARG_WITH(dns,
-	[  --with-dns              Support for fetching keys from DNS (experimental)],
+# Check libraries needed by DNS fingerprint support
+AC_SEARCH_LIBS(getrrsetbyname, resolv, 
+	[AC_DEFINE(HAVE_GETRRSETBYNAME)],
 	[
-		if test "x$withval" != "xno" ; then
-			DNS_MSG="yes"
-			AC_DEFINE(DNS)
-			AC_SEARCH_LIBS(getrrsetbyname, resolv, 
-				[AC_DEFINE(HAVE_GETRRSETBYNAME)],
-				[
-					# Needed by our getrrsetbyname()
-					AC_SEARCH_LIBS(res_query, resolv)
-					AC_SEARCH_LIBS(dn_expand, resolv)
-					AC_CHECK_FUNCS(_getshort _getlong)
-					AC_CHECK_MEMBER(HEADER.ad,
-						[AC_DEFINE(HAVE_HEADER_AD)],,
-						[#include <arpa/nameser.h>])
-				])
-		fi
-	]
-)
+		# Needed by our getrrsetbyname()
+		AC_SEARCH_LIBS(res_query, resolv)
+		AC_SEARCH_LIBS(dn_expand, resolv)
+		AC_CHECK_FUNCS(_getshort _getlong)
+		AC_CHECK_MEMBER(HEADER.ad,
+			[AC_DEFINE(HAVE_HEADER_AD)],,
+			[#include <arpa/nameser.h>])
+	])
 
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no" 
-- 
cgit v1.2.3