summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2005-10-27 03:24:53 +0000
committerKen Raeburn <raeburn@mit.edu>2005-10-27 03:24:53 +0000
commit7fc3e9f2d4aeb7e636cd67d4b6b8c2f44d3f92de (patch)
tree191443a09d5f6516e0bc584bdad19393e0c87bac
parent15478bc990f3414aad2b87e608b813748e378667 (diff)
downloadkrb5-7fc3e9f2d4aeb7e636cd67d4b6b8c2f44d3f92de.tar.gz
krb5-7fc3e9f2d4aeb7e636cd67d4b6b8c2f44d3f92de.tar.xz
krb5-7fc3e9f2d4aeb7e636cd67d4b6b8c2f44d3f92de.zip
* aclocal.m4 (KRB5_AC_INET6): Drop enable/disable-ipv6 option; emit a warning for it for
now, and always do use-if-available. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17455 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/ChangeLog5
-rw-r--r--src/aclocal.m414
2 files changed, 7 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7bba21c60..670162146 100644
--- 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 dfcbdca1f..90c0ecdfa 100644
--- 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,[