X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a037edaccd8bc706f8d170c5d2c5a637b3ca5ad5..9a689986c6d416c66195d2a16f54fcb74dc7d805:/configure.in

diff --git a/configure.in b/configure.in
index eb0fc34a..4c2f1dba 100644
--- a/configure.in
+++ b/configure.in
@@ -90,29 +90,10 @@ if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then
    AC_SYS_LARGEFILE
 fi
 
-
-
-dnl AC_DEFINE(ss_family, __ss_family, [KAME hack])
-dnl AC_DEFINE(ss_len, __ss_len, [KAME hack])
-
-CFLAGS="$CFLAGS"
-AC_ARG_ENABLE(ipv6,
-	AC_HELP_STRING([--enable-ipv6], [try to support IPv6]))
-AC_MSG_CHECKING([whether IPv6 is requested])
-if test "$xenable_ipv6" = xyes
-then
-	AC_MSG_RESULT(yes)
-	ipv6=yes
-else
-	AC_MSG_RESULT(no)
-	ipv6=no
-fi
-
 ipv6type=unknown
 ipv6lib=none
-ipv6trylibc=no
+ipv6trylibc=yes
 
-if test "$ipv6" = "yes"; then
 	AC_MSG_CHECKING([ipv6 stack type])
 	for i in inria kame linux-glibc linux-inet6 toshiba v6d zeta; do
 		case $i in
@@ -197,32 +178,8 @@ yes
 		fi
 	done
 	AC_MSG_RESULT($ipv6type)
-fi
 
-if test "$ipv6" = "yes" -a -f /usr/local/v6/lib/libinet6.a; then
-	ac_inet6_LDFLAGS="inet6"
-	ipv6libdir=/usr/local/v6/lib
- 	LDFLAGS="$LDFLAGS -L/usr/local/v6/lib"
-	AC_CHECK_LIB(inet6, getaddrinfo, , ipv6lib="$ac_inet6_LDFLAGS")
-fi
-
-if test "$ipv6" = "yes" -a -f /usr/lib/libinet6.a; then
-	ac_inet6_LDFLAGS="inet6"
-	AC_CHECK_LIB(inet6, getaddrinfo, , ipv6lib="$ac_inet6_LDFLAGS")
-fi
-
-if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
-	if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
-		LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
-		AC_MSG_NOTICE([You have $ipv6lib library, using it])
-	else
-		if test "$ipv6trylibc" = "yes"; then
-			AC_MSG_WARN([You do not have $ipv6lib library, using libc])
-		else
-			AC_MSG_ERROR([No $ipv6lib library found.  cannot continue.  You need to fetch lib$ipv6lib.a from appropriate ipv6 kit and compile beforehand.])
-		fi
-	fi
-fi
+AC_SEARCH_LIBS(getaddrinfo, inet6)
 
 AC_C_BIGENDIAN
 AC_HEADER_DIRENT
@@ -313,12 +270,15 @@ if test x"$ac_cv_func_strcasecmp" = x"no"; then
     AC_CHECK_LIB(resolv, strcasecmp)
 fi
 
+AC_CHECK_LIB(resolv, inet_ntop)
+
 AC_FUNC_MEMCMP
 AC_FUNC_UTIME_NULL
 AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod)
 AC_CHECK_FUNCS(fchmod fstat strchr readlink link utime utimes strftime)
 AC_CHECK_FUNCS(memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk)
 AC_CHECK_FUNCS(strlcat strlcpy mtrace)
+AC_CHECK_FUNCS(inet_ntop inet_pton)
 
 AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
 AC_TRY_RUN([#include <sys/types.h>