From 70c7949cfe2f07545e5eeb4291631916ab28d07f Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Wed, 27 Jan 2016 14:42:50 +0100 Subject: [PATCH] Update the configure script and INSTALL. Now that HAVE_IPV6 is gone remove all the references from the buildscript and documentation. --- INSTALL | 4 ---- acconfig.h | 1 - configure.ac | 33 --------------------------------- 3 files changed, 38 deletions(-) diff --git a/INSTALL b/INSTALL index 234c6cf6..4b20c1ba 100644 --- a/INSTALL +++ b/INSTALL @@ -29,10 +29,6 @@ configure options Build the irssi proxy (see startup-HOWTO). - --disable-ipv6 - - Disable IPv6 support. - --disable-ssl Disable SSL support. diff --git a/acconfig.h b/acconfig.h index 9ace70d8..53e268d7 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,5 +1,4 @@ /* misc.. */ -#undef HAVE_IPV6 #undef HAVE_SOCKS_H #undef HAVE_STATIC_PERL #undef HAVE_GMODULE diff --git a/configure.ac b/configure.ac index c0efd5e3..1a579911 100644 --- a/configure.ac +++ b/configure.ac @@ -140,15 +140,6 @@ AC_ARG_WITH(perl, fi, want_perl=static) -AC_ARG_ENABLE(ipv6, -[ --disable-ipv6 Disable IPv6 support], - if test x$enableval = xno; then - want_ipv6=no - else - want_ipv6=yes - fi, - want_ipv6=yes) - AC_ARG_ENABLE(dane, [ --enable-dane Enable DANE support], if test x$enableval = xno ; then @@ -577,29 +568,6 @@ COMMON_LIBS="$FE_COMMON_LIBS $COMMON_NOUI_LIBS" AC_SUBST(COMMON_NOUI_LIBS) AC_SUBST(COMMON_LIBS) -dnl ** -dnl ** IPv6 support -dnl ** - -have_ipv6=no -if test "x$want_ipv6" = "xyes"; then - AC_MSG_CHECKING([for IPv6]) - AC_CACHE_VAL(irssi_cv_type_in6_addr, - [AC_TRY_COMPILE([ - #include - #include - #include - #include - #include ], - [struct in6_addr i = in6addr_any; return &i == &i;], - have_ipv6=yes, - )]) - if test $have_ipv6 = yes; then - AC_DEFINE(HAVE_IPV6) - fi - AC_MSG_RESULT($have_ipv6) -fi - have_dane=no if test "x$want_dane" = "xyes"; then AC_MSG_CHECKING([for DANE]) @@ -742,7 +710,6 @@ echo "Install prefix ................... : $prefix" echo -echo "Building with IPv6 support ....... : $have_ipv6" echo "Building with SSL support ........ : $have_openssl" if test "x$have_openssl" = "xno" -a "x$enable_ssl" = "xyes"; then if test -f /etc/debian_version; then