From e27169c15e96d17fca7c2f35be51e22c30dcffe2 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Fri, 11 May 2012 12:32:51 +0000 Subject: [PATCH] Rebuild for configure.in r177. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@178 13b04d17-f746-0410-82c6-800466cd88b0 --- configure | 128 +++++++++++++++++++++++++----------------------------- 1 file changed, 58 insertions(+), 70 deletions(-) diff --git a/configure b/configure index f8ae89d..c62b9c8 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 170 . +# From configure.in Revision: 177 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -13793,90 +13793,78 @@ if test "${enable_ipv6+set}" = set; then enableval="$enable_ipv6" case "$enableval" in yes) - case "$(uname -s)" in - Linux) - if test -d "/usr/inet6/include"; then - CFLAGS="$CFLAGS -I/usr/inet6/include" - LIBS="-L/usr/inet6/lib -linet6 $LIBS" - echo "$as_me:$LINENO: result: yes (libinet6)" >&5 -echo "${ECHO_T}yes (libinet6)" >&6 + cat >conftest.$ac_ext <<_ACEOF -cat >>confdefs.h <<\_ACEOF -#define IPV6 1 + #include + #include + #include + + int main() + { + struct sockaddr_in6 sin6; + + sin6.sin6_family = AF_INET6; + sin6.sin6_addr = in6addr_any; + + return sin6.sin6_addr.s6_addr[0]; + } _ACEOF - - else - if test -d "/usr/local/v6/lib"; then - LIBS="-L/usr/local/v6/lib -linet6 $LIBS" - echo "$as_me:$LINENO: result: yes (freebsd+kame)" >&5 -echo "${ECHO_T}yes (freebsd+kame)" >&6 - -cat >>confdefs.h <<\_ACEOF -#define IPV6 1 -_ACEOF - - else - if test "$cross_compiling" = yes; then - { echo "$as_me:$LINENO: WARNING: cross-compiling: assuming no ipv6" >&5 -echo "$as_me: WARNING: cross-compiling: assuming no ipv6" >&2;} -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - int main() - { - #if !defined(__GLIBC__) || (__GLIBC__ < 2) - #define NO_GLIBC_2 1 - #endif - - if (NO_GLIBC_2) - exit(0); - else - exit(1); - } -_ACEOF -rm -f conftest$ac_exeext +rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes (glibc2)" >&5 -echo "${ECHO_T}yes (glibc2)" >&6 + ac_cv_ipv6_type="native" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + if test -d "/usr/inet6/include"; then + CFLAGS="$CFLAGS -I/usr/inet6/include" + LIBS="-L/usr/inet6/lib -linet6 $LIBS" + ac_cv_ipv6_type="libinet6" + else + if test -d "/usr/local/v6/lib"; then + LIBS="-L/usr/local/v6/lib -linet6 $LIBS" + ac_cv_ipv6_type="freebsd+kame" + else + ac_cv_ipv6_type="none" + fi + fi +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + if test x"$ac_cv_ipv6_type" != x"none"; then + echo "$as_me:$LINENO: result: yes ($ac_cv_ipv6_type)" >&5 +echo "${ECHO_T}yes ($ac_cv_ipv6_type)" >&6 cat >>confdefs.h <<\_ACEOF #define IPV6 1 _ACEOF - -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - fi - fi - ;; - *) - echo "$as_me:$LINENO: result: no (ipv6 support can currently be enabled on Linux only)" >&5 -echo "${ECHO_T}no (ipv6 support can currently be enabled on Linux only)" >&6 - ;; - esac + else + echo "$as_me:$LINENO: result: none found" >&5 +echo "${ECHO_T}none found" >&6 + fi ;; no) echo "$as_me:$LINENO: result: no" >&5