diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-19 11:24:44 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-23 04:07:37 +0000 |
commit | fad15654b1900a9af59d9dabf705060c6f9f058d (patch) | |
tree | e3da6735b367467b09f3b0b8865ad3d54357714b /acinclude.m4 | |
parent | 9e1128bfb6ca2cc75563813304e4feb9780f14f7 (diff) |
Remove configure --enable-ipv6 option
It's an ancient obsolete option with a confusing name.
Change-Id: Ib10330cf859cdea18fed2077c6539e56350ef380
Reviewed-on: https://code.wireshark.org/review/11967
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 118 |
1 files changed, 0 insertions, 118 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2a0caea975..91b76cf6a3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -148,124 +148,6 @@ fi # -# AC_WIRESHARK_IPV6_STACK -# -# By Jun-ichiro "itojun" Hagino, <itojun@iijlab.net> -# -AC_DEFUN([AC_WIRESHARK_IPV6_STACK], -[ - v6type=unknown - v6lib=none - - AC_MSG_CHECKING([ipv6 stack type]) - for i in v6d toshiba kame inria zeta linux linux-glibc solaris; do - case $i in - v6d) - AC_EGREP_CPP(yes, [ -#include </usr/local/v6/include/sys/types.h> -#ifdef __V6D__ -yes -#endif], - [v6type=$i; v6lib=v6; - v6libdir=/usr/local/v6/lib; - # - # XXX - this doesn't define INET6; - # is that a mistake? - # - CPPFLAGS="-I/usr/local/v6/include $CPPFLAGS"]) - ;; - toshiba) - AC_EGREP_CPP(yes, [ -#include <sys/param.h> -#ifdef _TOSHIBA_INET6 -yes -#endif], - [v6type=$i; v6lib=inet6; - v6libdir=/usr/local/v6/lib; - AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) - ;; - kame) - AC_EGREP_CPP(yes, [ -#include <netinet/in.h> -#ifdef __KAME__ -yes -#endif], - [v6type=$i; v6lib=inet6; - v6libdir=/usr/local/v6/lib; - AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) - ;; - inria) - AC_EGREP_CPP(yes, [ -#include <netinet/in.h> -#ifdef IPV6_INRIA_VERSION -yes -#endif], - [v6type=$i; - AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) - ;; - zeta) - AC_EGREP_CPP(yes, [ -#include <sys/param.h> -#ifdef _ZETA_MINAMI_INET6 -yes -#endif], - [v6type=$i; v6lib=inet6; - v6libdir=/usr/local/v6/lib; - AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) - ;; - linux) - if test -d /usr/inet6; then - v6type=$i - v6lib=inet6 - v6libdir=/usr/inet6 - AC_DEFINE(INET6, 1, [Define if the platform supports IPv6]) - fi - ;; - linux-glibc) - AC_EGREP_CPP(yes, [ -#include <features.h> -#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) -#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || __GLIBC__ > 2 -yes -#endif -#endif], - [v6type=$i; v6lib=inet6; - AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) - ;; - solaris) - # - # There's nothing we can check for in the header - # file, so we just check for SunOS (pre-SunOS 5 - # versions didn't include IPv6 support, so we - # just check the OS, not the version). - # - if test "`uname -s`" = "SunOS"; then - v6type=$i - v6lib=inet6 - AC_DEFINE(INET6, 1, [Define if the platform supports IPv6]) - fi - ;; - esac - if test "$v6type" != "unknown"; then - break - fi - done - - if test "$v6lib" != "none"; then - for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do - if test -d $dir -a -f $dir/lib$v6lib.a; then - LIBS="-L$dir $LIBS -l$v6lib" - break - fi - done - enable_ipv6="yes" - else - enable_ipv6="no" - fi - AC_MSG_RESULT(["$v6type, $v6lib"]) -]) - -# # AC_WIRESHARK_GETADDRINFO_LIB_CHECK # # Checks whether we have "getaddrinfo()" and whether we need "-lnsl" to get it. |