X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/620bbabc610b8d1e1efbd8f9048f79fcdd865d8d..740819ef7b3b96451e16b2fa3891d46cfc73ec64:/configure.in diff --git a/configure.in b/configure.in index a1feacf0..21bbab74 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. @@ -86,29 +90,10 @@ if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then AC_SYS_LARGEFILE fi - - -AC_DEFINE(ss_family, __ss_family, [KAME hack]) -AC_DEFINE(ss_len, __ss_len, [KAME hack]) - -CFLAGS="$CFLAGS" -AC_ARG_ENABLE(ipv6, - AC_HELP_STRING([--disable-ipv6], [do not try to support IPv6])) -AC_MSG_CHECKING([whether IPv6 is explicitly disabled]) -if test "$xenable_ipv6" = xyes -then - AC_MSG_RESULT(yes) - ipv6=no -else - AC_MSG_RESULT(no) - ipv6=yes -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 @@ -120,7 +105,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/ @@ -129,8 +115,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/ @@ -140,7 +126,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/ @@ -149,7 +135,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) @@ -161,7 +148,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, [ @@ -172,7 +159,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, [ @@ -183,7 +170,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 @@ -191,151 +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" - echo "You have $ipv6lib library, using it" - else - if test "$ipv6trylibc" = "yes"; then - echo "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 - fi - fi -fi - - -AC_MSG_CHECKING(getaddrinfo bug) -AC_TRY_RUN([ -#include -#include -#include -#include -#include - -main() -{ - int passive, gaierr, inet4 = 0, inet6 = 0; - struct addrinfo hints, *ai, *aitop; - char straddr[INET6_ADDRSTRLEN], strport[16]; - - for (passive = 0; passive <= 1; passive++) { - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; - hints.ai_flags = passive ? AI_PASSIVE : 0; - hints.ai_socktype = SOCK_STREAM; - if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) { - (void)gai_strerror(gaierr); - goto bad; - } - for (ai = aitop; ai; ai = ai->ai_next) { - if (ai->ai_addr == NULL || - ai->ai_addrlen == 0 || - getnameinfo(ai->ai_addr, ai->ai_addrlen, - straddr, sizeof(straddr), strport, sizeof(strport), - NI_NUMERICHOST|NI_NUMERICSERV) != 0) { - goto bad; - } - switch (ai->ai_family) { - case AF_INET: - if (strcmp(strport, "54321") != 0) { - goto bad; - } - if (passive) { - if (strcmp(straddr, "0.0.0.0") != 0) { - goto bad; - } - } else { - if (strcmp(straddr, "127.0.0.1") != 0) { - goto bad; - } - } - inet4++; - break; - case AF_INET6: - if (strcmp(strport, "54321") != 0) { - goto bad; - } - if (passive) { - if (strcmp(straddr, "::") != 0) { - goto bad; - } - } else { - if (strcmp(straddr, "::1") != 0) { - goto bad; - } - } - inet6++; - break; - case AF_UNSPEC: - goto bad; - break; - default: - /* another family support? */ - break; - } - } - } - - if (!(inet4 == 0 || inet4 == 2)) - goto bad; - if (!(inet6 == 0 || inet6 == 2)) - goto bad; - - if (aitop) - freeaddrinfo(aitop); - exit(0); - - bad: - if (aitop) - freeaddrinfo(aitop); - exit(1); -} -], -AC_MSG_RESULT(good) -buggygetaddrinfo=no, -AC_MSG_RESULT(buggy) -buggygetaddrinfo=yes, -AC_MSG_RESULT(buggy) -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 - 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).' - fi -fi -AC_REPLACE_FUNCS(getaddrinfo getnameinfo) - -AC_CHECK_MEMBER([struct sockaddr.sa_len], - [ AC_DEFINE(HAVE_SOCKADDR_LEN) ], - [], - [ -#include -#include -]) +AC_SEARCH_LIBS(getaddrinfo, inet6) AC_C_BIGENDIAN AC_HEADER_DIRENT @@ -344,7 +188,8 @@ 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_HEADERS(netdb.h) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) @@ -407,7 +252,24 @@ if test x"$ac_cv_func_connect" = x"no"; then fi fi -# +AC_CHECK_LIB(resolv, inet_ntop) + +AC_MSG_NOTICE([Looking in libraries: $LIBS]) + +AC_CHECK_FUNC(inet_ntop, , AC_LIBOBJ(lib/inet_ntop)) +AC_CHECK_FUNC(inet_pton, , AC_LIBOBJ(lib/inet_pton)) + +AC_CHECK_FUNC(getaddrinfo, , AC_LIBOBJ(lib/getaddrinfo)) +AC_CHECK_FUNC(getnameinfo, , AC_LIBOBJ(lib/getnameinfo)) + +AC_CHECK_MEMBER([struct sockaddr.sa_len], + [ AC_DEFINE(HAVE_SOCKADDR_LEN) ], + [], + [ +#include +#include +]) + # if we can't find strcasecmp, look in -lresolv (for Unixware at least) # AC_CHECK_FUNCS(strcasecmp)