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

diff --git a/configure.in b/configure.in
index 7e592a48..71bb5c2f 100644
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,10 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_SUBST(SHELL)
 
+RSYNC_VERSION=2.4.7pre2
+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