X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/620bbabc610b8d1e1efbd8f9048f79fcdd865d8d..fcb69e5cdcfdfd0bdcea2127e5f4c9133a2282b9:/configure.in diff --git a/configure.in b/configure.in index a1feacf0..4f399435 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.6cvs +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,10 +19,21 @@ dnl Checks for programs. AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL +AC_PROG_CC_STDC AC_SUBST(SHELL) -# compile with optimisation and without debugging by default, unless -# --debug is given. We must decide this before testing the compiler. +AC_DEFINE([_GNU_SOURCE], 1, + [Define _GNU_SOURCE so that we get all necessary prototypes]) + +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 + +# We must decide this before testing the compiler. + +# Please allow this to default to yes, so that your users have more +# chance of getting a useful stack trace if problems occur. AC_MSG_CHECKING([whether to include debugging symbols]) AC_ARG_ENABLE(debug, @@ -31,12 +48,44 @@ 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 + + + +AC_ARG_ENABLE(profile, + AC_HELP_STRING([--enable-profile], + [turn on CPU profiling (default no)], + [], [])) +if test x"$enable_profile" = xyes +then + CFLAGS="$CFLAGS -pg" +fi + + +# Specifically, this turns on panic_action handling. +AC_ARG_ENABLE(maintainer-mode, + AC_HELP_STRING([--enable-maintainer-mode], + [turn on extra debug features], + [], [])) +if test x"$enable_maintainer_mode" = xyes +then + CFLAGS="$CFLAGS -DMAINTAINER_MODE" +fi + + +# This is needed for our included version of popt. Kind of silly, but +# I don't want our version too far out of sync. CFLAGS="$CFLAGS -DHAVE_CONFIG_H" +# If GCC, turn on warnings. +if test "x$GCC" = "xyes" +then + CFLAGS="$CFLAGS -Wall -W" +fi + AC_ARG_WITH(included-popt, [ --with-included-popt use bundled popt library, not from system]) @@ -44,11 +93,26 @@ AC_ARG_WITH(rsync-path, [ --with-rsync-path=PATH set default --rsync-path to PATH (default: \"rsync\")], [ RSYNC_PATH="$with_rsync_path" ], [ RSYNC_PATH="rsync" ]) -AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [ ]) + +AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine]) + +AC_ARG_WITH(rsh, + AC_HELP_STRING([--with-rsh=CMD], [set rsh command to CMD (default: \"remsh\" or \"rsh\")])) AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0) -AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH, [ ]) +AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH, [remote shell is remsh not rsh]) +if test x"$with_rsh" != x +then + RSYNC_RSH="$with_rsh" +elif test x"$HAVE_REMSH" = x1 +then + RSYNC_RSH="remsh" +else + RSYNC_RSH="rsh" +fi + +AC_DEFINE_UNQUOTED(RSYNC_RSH, "$RSYNC_RSH", [default -e command]) # arrgh. libc in the current debian stable screws up the largefile # stuff, getting byte range locking wrong @@ -86,29 +150,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([--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_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 @@ -120,7 +170,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 +180,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 +191,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 +200,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 +213,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 +224,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 +235,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 +243,9 @@ 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 + AC_SEARCH_LIBS(getaddrinfo, inet6) 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 @@ -343,8 +253,10 @@ AC_HEADER_TIME 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(sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h sys/un.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_HEADERS(malloc.h) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) @@ -407,7 +319,45 @@ if test x"$ac_cv_func_connect" = x"no"; then fi fi -# +AC_CHECK_LIB(resolv, inet_ntop) + +dnl 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)) + +# Tru64 UNIX has getaddrinfo() but has it renamed in libc as +# something else so we must include to get the +# redefinition. +AC_CHECK_FUNCS(getaddrinfo, , + [AC_MSG_CHECKING([for getaddrinfo by including ]) + AC_TRY_LINK([#include + #include + #include ],[getaddrinfo(NULL, NULL, NULL, NULL);], + [AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_GETADDRINFO, 1, + [Define if you have the `getaddrinfo' function.])], + [AC_MSG_RESULT([no]) + 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) @@ -415,20 +365,26 @@ 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(waitpid wait4 getcwd strdup strerror chown chmod mknod mkfifo) 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(strlcat strlcpy mtrace mallinfo setgroups) 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, [ ]) @@ -634,3 +590,7 @@ AC_SUBST(BUILD_POPT) AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT + +AC_MSG_RESULT() +AC_MSG_RESULT([ rsync ${RSYNC_VERSION} configuration successful]) +AC_MSG_RESULT()