From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 26 Aug 2003 17:09:54 +0000 (+0000)
Subject: * aclocal.m4 (KRB5_AC_ENABLE_DNS): Drop --enable-dns and --enable-dns-for-kdc
X-Git-Tag: krb5-1.4-beta1~757
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d708e5529997a492b006dab07795c43544f38fc;p=krb5.git

* aclocal.m4 (KRB5_AC_ENABLE_DNS): Drop --enable-dns and --enable-dns-for-kdc
options; turn them on always.

ticket: 1724

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15792 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b76778773..d845289a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,8 @@
 	(CONFIG_RULES): Do the non-useless parts directly here.
 	(V5_SET_TOPDIR): Work quietly.
 	(WITH_KRB4): Use AC_MSG_NOTICE.
+	(KRB5_AC_ENABLE_DNS): Drop --enable-dns and --enable-dns-for-kdc
+	options; turn them on always.
 
 2003-07-15  Ken Raeburn  <raeburn@mit.edu>
 
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 9859d6c6d..afcd22285 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1205,51 +1205,19 @@ dnl
 dnl KRB5_AC_ENABLE_DNS
 dnl
 AC_DEFUN(KRB5_AC_ENABLE_DNS, [
-AC_MSG_CHECKING(if DNS Kerberos lookup support should be compiled in)
-
-  AC_ARG_ENABLE([dns],
-[  --enable-dns            build in support for Kerberos-related DNS lookups], ,
-[enable_dns=default])
-
-  AC_ARG_ENABLE([dns-for-kdc],
-[  --enable-dns-for-kdc    enable DNS lookups of Kerberos KDCs (default=YES)], ,
-[case "$enable_dns" in
-  yes | no) enable_dns_for_kdc=$enable_dns ;;
-  *) enable_dns_for_kdc=yes ;;
-esac])
-  if test "$enable_dns_for_kdc" = yes; then
-    AC_DEFINE(KRB5_DNS_LOOKUP_KDC,1,[Define to enable DNS lookups of Kerberos KDCs])
-  fi
+enable_dns=yes
+enable_dns_for_kdc=yes
+AC_DEFINE(KRB5_DNS_LOOKUP_KDC,1,[Define to enable DNS lookups of Kerberos KDCs])
 
   AC_ARG_ENABLE([dns-for-realm],
 [  --enable-dns-for-realm  enable DNS lookups of Kerberos realm names], ,
-[case "$enable_dns" in
-  yes | no) enable_dns_for_realm=$enable_dns ;;
-  *) enable_dns_for_realm=no ;;
-esac])
+[enable_dns_for_realm=no])
   if test "$enable_dns_for_realm" = yes; then
     AC_DEFINE(KRB5_DNS_LOOKUP_REALM,1,[Define to enable DNS lookups of Kerberos realm names])
   fi
 
-  if test "$enable_dns_for_kdc,$enable_dns_for_realm" != no,no
-  then
-    # must compile in the support code
-    if test "$enable_dns" = no ; then
-      AC_MSG_ERROR(cannot both enable some DNS options and disable DNS support)
-    fi
-    enable_dns=yes
-  fi
-  if test "$enable_dns" = yes ; then
-    AC_DEFINE(KRB5_DNS_LOOKUP, 1,[Define for DNS support of locating realms and KDCs])
-  else
-    enable_dns=no
-  fi
+AC_DEFINE(KRB5_DNS_LOOKUP, 1,[Define for DNS support of locating realms and KDCs])
 
-AC_MSG_RESULT($enable_dns)
-dnl AC_MSG_CHECKING(if DNS should be used to find KDCs by default)
-dnl AC_MSG_RESULT($enable_dns_for_kdc)
-dnl AC_MSG_CHECKING(if DNS should be used to find realm name by default)
-dnl AC_MSG_RESULT($enable_dns_for_realm)
 ])
 dnl
 dnl