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

diff --git a/configure.in b/configure.in
index 7e592a48..9b8d00f6 100644
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,10 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_SUBST(SHELL)
 
+RSYNC_VERSION=2.4.7pre3
+AC_SUBST(RSYNC_VERSION)
+AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version])
+
 # compile with optimisation and without debugging by default, unless
 # --debug is given.  We must decide this before testing the compiler.
 
@@ -92,44 +96,17 @@ AC_DEFINE(ss_family, __ss_family, [KAME hack])
 AC_DEFINE(ss_len, __ss_len, [KAME hack])
 
 CFLAGS="$CFLAGS"
-AC_MSG_CHECKING([whether IPv6 is explicitly enabled])
 AC_ARG_ENABLE(ipv6,
-[  --enable-ipv6		Enable ipv6 (with ipv4) support
-  --disable-ipv6		Disable ipv6 support],
-[ case "$enableval" in
-  no)
-       AC_MSG_RESULT(no)
-       ipv6=no
-       ;;
-  *)   
-       AC_MSG_RESULT(yes)
-       AC_DEFINE(ENABLE_IPV6)
-       ipv6=yes
-       ;;
-  esac ],
-  [
-  AC_MSG_RESULT(no)
-  dnl not specified; let's try
-  AC_MSG_CHECKING([whether IPv6 works anyhow])
-  AC_TRY_COMPILE([ 
-#include <sys/types.h>
-#include <sys/socket.h>
-], 
-[
-main()
-{
- if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-   exit(1);
- else
-   exit(0);
-}
-],
-  [ 
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(ENABLE_IPV6)
-  ipv6=yes],
-  [AC_MSG_RESULT(no)
-  ipv6=no])])
+	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
@@ -147,7 +124,8 @@ if test "$ipv6" = "yes"; then
 yes
 #endif],
 				[ipv6type=$i;
-				CFLAGS="-DINET6 $CFLAGS"])
+				AC_DEFINE(INET6, 1, [true if you have IPv6])
+				])
 			;;
 		kame)
 			# http://www.kame.net/
@@ -156,8 +134,8 @@ yes
 #ifdef __KAME__
 yes
 #endif],
-				[ipv6type=$i;
-				CFLAGS="-DINET6 $CFLAGS"])
+				[ipv6type=$i; 
+				AC_DEFINE(INET6, 1, [true if you have IPv6])])
 			;;
 		linux-glibc)
 			# http://www.v6.linux.or.jp/
@@ -167,7 +145,7 @@ yes
 yes
 #endif],
 				[ipv6type=$i;
-				CFLAGS="-DINET6 $CFLAGS"])
+AC_DEFINE(INET6, 1, [true if you have IPv6])])
 			;;
 		linux-inet6)
 			# http://www.v6.linux.or.jp/
@@ -176,7 +154,8 @@ yes
 				ipv6lib=inet6
 				ipv6libdir=/usr/inet6/lib
 				ipv6trylibc=yes;
-				CFLAGS="-DINET6 -I/usr/inet6/include $CFLAGS"
+				AC_DEFINE(INET6, 1, [true if you have IPv6])
+				CFLAGS="-I/usr/inet6/include $CFLAGS"
 			fi
 			;;
 		toshiba)
@@ -188,7 +167,7 @@ yes
 				[ipv6type=$i;
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib;
-				CFLAGS="-DINET6 $CFLAGS"])
+				AC_DEFINE(INET6, 1, [true if you have IPv6])])
 			;;
 		v6d)
 			AC_EGREP_CPP(yes, [
@@ -199,7 +178,7 @@ yes
 				[ipv6type=$i;
 				ipv6lib=v6;
 				ipv6libdir=/usr/local/v6/lib;
-				CFLAGS="-I/usr/local/v6/include $CFLAGS"])
+				AC_DEFINE(INET6, 1, [true if you have IPv6])])
 			;;
 		zeta)
 			AC_EGREP_CPP(yes, [
@@ -210,7 +189,7 @@ yes
 				[ipv6type=$i;
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib;
-				CFLAGS="-DINET6 $CFLAGS"])
+				AC_DEFINE(INET6, 1, [true if you have IPv6])])
 			;;
 		esac
 		if test "$ipv6type" != "unknown"; then
@@ -235,15 +214,12 @@ 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"
-		echo "You have $ipv6lib library, using it"
+		AC_MSG_NOTICE([You have $ipv6lib library, using it])
 	else
 		if test "$ipv6trylibc" = "yes"; then
-			echo "You do not have $ipv6lib library, using libc"
+			AC_MSG_WARN([You do not have $ipv6lib library, using libc])
 		else
-			echo 'Fatal: no $ipv6lib library found.  cannot continue.'
-			echo "You need to fetch lib$ipv6lib.a from appropriate"
-			echo 'ipv6 kit and compile beforehand.'
-			exit 1
+			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
@@ -345,13 +321,9 @@ buggygetaddrinfo=yes)
 
 if test "$buggygetaddrinfo" = "yes"; then
 	if test "$ipv6" = "yes" -a "$ipv6type" != "linux"; then
-		echo 'Fatal: You must get working getaddrinfo() function.'
-		echo '       or you can specify "--disable-ipv6"'.
-		exit 1
+		AC_MSG_ERROR([You must get working getaddrinfo() function or you can specify "--disable-ipv6"])
 	elif test "$ipv6type" = "linux"; then
-		echo 'Warning: getaddrinfo() implementation on your system seems be buggy.'
-		echo '         Better upgreade your system library to newest version'
-		echo '         of GNU C library (aka glibc).'
+		AC_MSG_ERROR([getaddrinfo() implementation on your system seems be buggy.  Better upgrade your system library to newest version of GNU C library (aka glibc).])
 	fi
 fi
 AC_REPLACE_FUNCS(getaddrinfo getnameinfo)
@@ -371,7 +343,7 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h unistd.h utime.h grp.h)
 AC_CHECK_HEADERS(compat.h sys/param.h ctype.h sys/wait.h sys/ioctl.h)
 AC_CHECK_HEADERS(sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h)
-AC_CHECK_HEADERS(glob.h alloca.h mcheck.h)
+AC_CHECK_HEADERS(glob.h alloca.h mcheck.h sys/sysctl.h arpa/inet.h arpa/nameser.h)
 
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)