* aclocal.m4 (KRB5_AC_INET6): Drop enable/disable-ipv6 option; emit a warning for...

now, and always do use-if-available.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 7bba21c6062275649355390a509de2ca8342b9c8..670162146e0403c699678dc80961291891c198eb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * aclocal.m4 (KRB5_AC_INET6): Drop enable/disable-ipv6 option;
+       emit a warning for it for now, and always do use-if-available.
+
 2005-10-04  Ken Raeburn  <raeburn@mit.edu>
 
        * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute DYNOBJEXT

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index dfcbdca1feef3c9316cd1b7f8977384e8b45a8e5..90c0ecdfa72840baa3df20a907c24aa348646142 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -393,18 +393,8 @@ if test $ac_cv_func_getaddrinfo = yes; then
 fi
 dnl
 AC_REQUIRE([KRB5_SOCKADDR_SA_LEN])dnl
-AC_ARG_ENABLE([ipv6],
-AC_HELP_STRING([--enable-ipv6],[turn on IPv6 support])
-AC_HELP_STRING([--disable-ipv6],[turn off IPv6 support @<:@enabled if available@:>@]), ,enableval=try)dnl
-case "$enableval" in
-  yes | try)
-       KRB5_AC_CHECK_INET6
-       if test "$enableval/$krb5_cv_inet6" = yes/no ; then
-         AC_MSG_ERROR(IPv6 support does not appear to be available)
-       fi ;;
-  no)  ;;
-  *)   AC_MSG_ERROR(bad value "$enableval" for enable-ipv6 option) ;;
-esac
+AC_ARG_ENABLE([ipv6], , AC_MSG_WARN(enable/disable-ipv6 option is deprecated))dnl
+KRB5_AC_CHECK_INET6
 ])dnl
 dnl
 AC_DEFUN(KRB5_AC_CHECK_TYPE_WITH_HEADERS,[