X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/15c17078871c69f16f10b087af6a8389e1eba862..1db8b61de7fd31b9c7b02918e6c194255979f030:/configure.in diff --git a/configure.in b/configure.in index 16b188a1..1f131e5e 100644 --- a/configure.in +++ b/configure.in @@ -5,6 +5,12 @@ AC_CONFIG_SRCDIR([byteorder.h]) AC_CONFIG_HEADER(config.h) AC_PREREQ(2.52) +RSYNC_VERSION=2.5.1pre3 +AC_SUBST(RSYNC_VERSION) +AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) + +AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version]) + LDFLAGS=${LDFLAGS-""} AC_CANONICAL_TARGET([]) @@ -13,11 +19,13 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL +AC_PROG_CC_STDC AC_SUBST(SHELL) -RSYNC_VERSION=2.4.7pre3 -AC_SUBST(RSYNC_VERSION) -AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version]) +if test "$xac_cv_prog_cc_stdc" = xno +then + AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one]) +fi # compile with optimisation and without debugging by default, unless # --debug is given. We must decide this before testing the compiler. @@ -35,7 +43,7 @@ then else AC_MSG_RESULT([yes]) # leave CFLAGS alone; AC_PROG_CC will try to include -g if it can - AC_DEFINE(DEBUG, 1, [Define to turn on debugging code that may slow normal operation]) + dnl AC_DEFINE(DEBUG, 1, [Define to turn on debugging code that may slow normal operation]) dnl CFLAGS=${CFLAGS-"-g"} fi @@ -90,29 +98,15 @@ 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([--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_ARG_ENABLE(ipv6, + AC_HELP_STRING([--disable-ipv6], [don't even try to use IPv6])) + +if test "x$enable_ipv6" != xno +then AC_MSG_CHECKING([ipv6 stack type]) for i in inria kame linux-glibc linux-inet6 toshiba v6d zeta; do case $i in @@ -197,43 +191,10 @@ 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") + AC_SEARCH_LIBS(getaddrinfo, inet6) 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_REPLACE_FUNCS(getaddrinfo getnameinfo) - -AC_CHECK_MEMBER([struct sockaddr.sa_len], - [ AC_DEFINE(HAVE_SOCKADDR_LEN) ], - [], - [ -#include -#include -]) - AC_C_BIGENDIAN AC_HEADER_DIRENT AC_HEADER_TIME @@ -305,7 +266,33 @@ 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_FUNCS(inet_ntop, , AC_LIBOBJ(lib/inet_ntop)) +AC_CHECK_FUNCS(inet_pton, , AC_LIBOBJ(lib/inet_pton)) + +AC_CHECK_FUNCS(getaddrinfo, , AC_LIBOBJ(lib/getaddrinfo)) +AC_CHECK_FUNCS(getnameinfo, , AC_LIBOBJ(lib/getnameinfo)) + +AC_CHECK_MEMBER([struct sockaddr.sa_len], + [ AC_DEFINE(HAVE_SOCKADDR_LEN) ], + [], + [ +#include +#include +]) + +AC_MSG_CHECKING(struct sockaddr_storage) +AC_TRY_COMPILE([#include +#include ], +[struct sockaddr_storage x;], + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, + [Define if you have strct sockaddr_storage.] ), + AC_MSG_RESULT(no)) + # if we can't find strcasecmp, look in -lresolv (for Unixware at least) # AC_CHECK_FUNCS(strcasecmp) @@ -313,7 +300,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no"; then AC_CHECK_LIB(resolv, strcasecmp) fi -AC_FUNC_MEMCMP +dnl At the moment we don't test for a broken memcmp(), because all we +dnl need to do is test for equality, not comparison, and it seems that +dnl every platform has a memcmp that can do at least that. +dnl 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) @@ -321,12 +312,14 @@ AC_CHECK_FUNCS(memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk) AC_CHECK_FUNCS(strlcat strlcpy mtrace) AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[ -AC_TRY_RUN([#include - #include - main() { - int fd[2]; - exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1); - }], +AC_TRY_RUN([ +#include +#include + +main() { + int fd[2]; + exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1); +}], rsync_cv_HAVE_SOCKETPAIR=yes,rsync_cv_HAVE_SOCKETPAIR=no,rsync_cv_HAVE_SOCKETPAIR=cross)]) if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then AC_DEFINE(HAVE_SOCKETPAIR, 1, [ ])