diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-06-26 18:19:43 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-06-26 18:19:43 +0000 |
| commit | ffc5183fd295776d01822e146260c36c01bd6e68 (patch) | |
| tree | af265db24891eef6cc61db416f15da31b853de66 /acinclude.m4 | |
| parent | 0426c05d4977abf276daf664412eebb7dd42d561 (diff) | |
| download | wireshark-ffc5183fd295776d01822e146260c36c01bd6e68.tar.gz | |
(Attempt to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8813 :
Enable INET6 checking on Solaris versions other than 5.8.
(Yes, theoretically this should be checking for Solaris 5.7 or later. I'm
going to go out on a limb and assume that no one is actually still using 5.7
or, if they are, they aren't trying to compile a modern Wireshark on it...)
svn path=/trunk/; revision=50173
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index c73a5e12fc..aadf07aa4f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -160,7 +160,7 @@ AC_DEFUN([AC_WIRESHARK_IPV6_STACK], v6lib=none AC_MSG_CHECKING([ipv6 stack type]) - for i in v6d toshiba kame inria zeta linux linux-glibc solaris8; do + for i in v6d toshiba kame inria zeta linux linux-glibc solaris; do case $i in v6d) AC_EGREP_CPP(yes, [ @@ -228,11 +228,11 @@ yes #endif], [v6type=$i; v6lib=inet6; CPPFLAGS="-DINET6 $CPPFLAGS"]) ;; - solaris8) - if test "`uname -s`" = "SunOS" && test "`uname -r`" = "5.8"; then + solaris) + if test "`uname -s`" = "SunOS"; then v6type=$i v6lib=inet6 - [CPPFLAGS="-DINET6 -DSOLARIS8_INET6 $CPPFLAGS"] + [CPPFLAGS="-DINET6 $CPPFLAGS"] fi ;; esac @@ -803,7 +803,7 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[ AC_MSG_CHECKING(Lua version) for i in 5.0 5.1 5.2 do - [[ -d "/usr/include/lua$i" ]] && lua_ver=$i + [[ -d "/usr/include/lua$i" ]] && lua_ver=$i done AC_MSG_RESULT(Lua ${lua_ver}) wireshark_save_CPPFLAGS="$CPPFLAGS" |