X-Git-Url: http://git.samba.org/samba.git/?p=rsync.git;a=blobdiff_plain;f=configure.in;h=50668ed52505e1aa8a1ab306058cebb8cb5358b3;hp=2931927d233aab6575c7c90b073411297b7e1f35;hb=7be73df4e7c9978b619c7e849b3f8ac2987cb667;hpb=4775934364a15296fe874339d3f48c938cb24dd7 diff --git a/configure.in b/configure.in index 2931927d..50668ed5 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h]) AC_CONFIG_HEADER(config.h) AC_PREREQ(2.52) -RSYNC_VERSION=2.5.1-dev +RSYNC_VERSION=2.6.1pre-1 AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -18,17 +18,20 @@ AC_CANONICAL_TARGET([]) dnl Checks for programs. AC_PROG_CC AC_PROG_CPP +AC_PROG_EGREP AC_PROG_INSTALL AC_PROG_CC_STDC AC_SUBST(SHELL) -if test "$xac_cv_prog_cc_stdc" = xno +AC_DEFINE([_GNU_SOURCE], 1, + [Define _GNU_SOURCE so that we get all necessary prototypes]) + +if test "x$ac_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. +# 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. @@ -50,26 +53,85 @@ else 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" + CFLAGS="$CFLAGS -Wall -W" fi AC_ARG_WITH(included-popt, [ --with-included-popt use bundled popt library, not from system]) AC_ARG_WITH(rsync-path, - [ --with-rsync-path=PATH set default --rsync-path to PATH (default: \"rsync\")], + [ --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(rsyncd-conf, + AC_HELP_STRING([--with-rsyncd-conf=PATH], [set configuration file for rsync server to PATH (default: /etc/rsyncd.conf)]), + [ if test ! -z "$with_rsyncd_conf" ; then + case $with_rsyncd_conf in + yes|no) + RSYNCD_SYSCONF="/etc/rsyncd.conf" + ;; + /*) + RSYNCD_SYSCONF="$with_rsyncd_conf" + ;; + *) + AC_MSG_ERROR(You must specify an absolute path to --with-rsyncd-conf=PATH) + ;; + esac + else + RSYNCD_SYSCONF="/etc/rsyncd.conf" + fi ], + [ RSYNCD_SYSCONF="/etc/rsyncd.conf" ]) + +AC_DEFINE_UNQUOTED(RSYNCD_SYSCONF, "$RSYNCD_SYSCONF", [location of configuration file for rsync server]) + +AC_ARG_WITH(rsh, + AC_HELP_STRING([--with-rsh=CMD], [set remote shell command to CMD (default: ssh)])) 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" +else + RSYNC_RSH="ssh" +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 @@ -81,7 +143,7 @@ AC_TRY_RUN([ #include #include -int main(void) +int main(void) { struct flock lock; int status; @@ -111,7 +173,7 @@ ipv6type=unknown ipv6lib=none ipv6trylibc=yes -AC_ARG_ENABLE(ipv6, +AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--disable-ipv6], [don't even try to use IPv6])) if test "x$enable_ipv6" != xno @@ -137,7 +199,7 @@ yes #ifdef __KAME__ yes #endif], - [ipv6type=$i; + [ipv6type=$i; AC_DEFINE(INET6, 1, [true if you have IPv6])]) ;; linux-glibc) @@ -204,16 +266,26 @@ yes AC_SEARCH_LIBS(getaddrinfo, inet6) fi +AC_MSG_CHECKING([whether to call shutdown on all sockets]) +case $host_os in + *cygwin* ) AC_MSG_RESULT(yes) + AC_DEFINE(SHUTDOWN_ALL_SOCKETS, 1, + [Define if sockets need to be shutdown]) + ;; + * ) AC_MSG_RESULT(no);; +esac + AC_C_BIGENDIAN AC_HEADER_DIRENT 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 sys/sysctl.h arpa/inet.h arpa/nameser.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 mcheck.h sys/sysctl.h arpa/inet.h arpa/nameser.h) AC_CHECK_HEADERS(netdb.h) AC_CHECK_HEADERS(malloc.h) +AC_CHECK_HEADERS(float.h) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) @@ -268,7 +340,7 @@ if test x"$ac_cv_func_connect" = x"no"; then esac dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value dnl has been cached. - if test x"$ac_cv_lib_socket_connect" = x"yes" || + if test x"$ac_cv_lib_socket_connect" = x"yes" || test x"$ac_cv_lib_inet_connect" = x"yes"; then # ac_cv_func_connect=yes # don't! it would cause AC_CHECK_FUNC to succeed next time configure is run @@ -278,20 +350,59 @@ fi AC_CHECK_LIB(resolv, inet_ntop) -AC_MSG_NOTICE([Looking in libraries: $LIBS]) +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)]) -AC_CHECK_FUNCS(inet_ntop, , AC_LIBOBJ(lib/inet_ntop)) -AC_CHECK_FUNCS(inet_pton, , AC_LIBOBJ(lib/inet_pton)) +# Irix 6.5 has getaddrinfo but not the corresponding defines, so use +# builtin getaddrinfo if one of the defines don't exist +AC_CACHE_CHECK([whether defines needed by getaddrinfo exist], + rsync_cv_HAVE_GETADDR_DEFINES,[ + AC_EGREP_CPP(yes, [ + #include + #include + #include + #ifdef AI_PASSIVE + yes + #endif], + rsync_cv_HAVE_GETADDR_DEFINES=yes, + rsync_cv_HAVE_GETADDR_DEFINES=no)]) +if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes"; then + # 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)]) +else + AC_LIBOBJ(lib/getaddrinfo) + AC_LIBOBJ(lib/getnameinfo) +fi -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, 1, [Do we have sockaddr.sa_len?]) ], + [], + [ +#include +#include +]) -AC_CHECK_MEMBER([struct sockaddr.sa_len], - [ AC_DEFINE(HAVE_SOCKADDR_LEN) ], +AC_CHECK_MEMBER([struct sockaddr_in.sin_len], + [ AC_DEFINE(HAVE_SOCKADDR_IN_LEN, 1, [Do we have sockaddr_in.sin_len?]) ], [], [ #include #include +#include ]) AC_MSG_CHECKING(struct sockaddr_storage) @@ -299,10 +410,19 @@ AC_TRY_COMPILE([#include #include ], [struct sockaddr_storage x;], AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, + AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [Define if you have strct sockaddr_storage.] ), AC_MSG_RESULT(no)) +AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id], + [ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID, 1, [Do we have sockaddr_in6.sin6_scope_id?]) ], + [], + [ +#include +#include +#include +]) + # if we can't find strcasecmp, look in -lresolv (for Unixware at least) # AC_CHECK_FUNCS(strcasecmp) @@ -312,14 +432,15 @@ fi 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 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) -AC_CHECK_FUNCS(memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk) -AC_CHECK_FUNCS(strlcat strlcpy mtrace mallinfo) +AC_FUNC_ALLOCA +AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod mkfifo \ + fchmod fstat strchr readlink link utime utimes strftime mtrace \ + memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk \ + strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid) AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[ AC_TRY_RUN([ @@ -335,15 +456,6 @@ if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then AC_DEFINE(HAVE_SOCKETPAIR, 1, [ ]) fi -AC_CACHE_CHECK([for working fnmatch],rsync_cv_HAVE_FNMATCH,[ -AC_TRY_RUN([#include -main() { exit((fnmatch("*.o", "x.o", FNM_PATHNAME) == 0 && - fnmatch("a/b/*", "a/b/c/d", FNM_PATHNAME) != 0) ? 0: 1); }], -rsync_cv_HAVE_FNMATCH=yes,rsync_cv_HAVE_FNMATCH=no,rsync_cv_HAVE_FNMATCH=cross)]) -if test x"$rsync_cv_HAVE_FNMATCH" = x"yes"; then - AC_DEFINE(HAVE_FNMATCH, 1, [ ]) -fi - if test x"$with_included_popt" != x"yes" then AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) @@ -355,6 +467,12 @@ then AC_MSG_RESULT($srcdir/popt) BUILD_POPT='$(popt_OBJS)' CFLAGS="$CFLAGS -I$srcdir/popt" + if test x"$ALLOCA" != x + then + # this can be removed when/if we add an included alloca.c; + # see autoconf documentation on AC_FUNC_ALLOCA + AC_MSG_WARN([included libpopt will use malloc, not alloca (which wastes a small amount of memory)]) + fi else AC_MSG_RESULT(no) fi @@ -428,7 +546,7 @@ AC_CACHE_CHECK([for C99 vsnprintf],rsync_cv_HAVE_C99_VSNPRINTF,[ AC_TRY_RUN([ #include #include -void foo(const char *format, ...) { +void foo(const char *format, ...) { va_list ap; int len; char buf[5]; @@ -455,10 +573,10 @@ AC_TRY_RUN([#include #include #include #include -main() { +main() { struct stat st; - char tpl[20]="/tmp/test.XXXXXX"; - int fd = mkstemp(tpl); + char tpl[20]="/tmp/test.XXXXXX"; + int fd = mkstemp(tpl); if (fd == -1) exit(1); unlink(tpl); if (fstat(fd, &st) != 0) exit(1); @@ -481,7 +599,7 @@ AC_TRY_RUN([ #include main() { struct in_addr ip; ip.s_addr = 0x12345678; if (strcmp(inet_ntoa(ip),"18.52.86.120") && - strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(1); } + strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(1); } exit(0);}], rsync_cv_REPLACE_INET_NTOA=no,rsync_cv_REPLACE_INET_NTOA=yes,rsync_cv_REPLACE_INET_NTOA=cross)]) if test x"$rsync_cv_REPLACE_INET_NTOA" = x"yes"; then @@ -495,7 +613,7 @@ AC_TRY_RUN([ #include #include #include -main() { struct in_addr ip; +main() { struct in_addr ip; if (inet_aton("example", &ip) == 0) exit(0); exit(1);}], rsync_cv_REPLACE_INET_ATON=no,rsync_cv_REPLACE_INET_ATON=yes,rsync_cv_REPLACE_INET_ATON=cross)]) if test x"$rsync_cv_REPLACE_INET_ATON" = x"yes"; then @@ -535,3 +653,22 @@ AC_SUBST(BUILD_POPT) AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT + +if test x"$with_rsh" = x; then + if test x"$HAVE_REMSH" = x1; then + rmsh1='remsh:' + rmsh2='=remsh' + else + rmsh1='rsh: ' + rmsh2='=rsh ' + fi + AC_MSG_RESULT() + AC_MSG_RESULT([ **********************************************************************]) + AC_MSG_RESULT([ * As of v2.6.0, the default remote shell is ssh instead of rsh!! *]) + AC_MSG_RESULT([ * To use previous default of $rmsh1 ./configure --with-rsh$rmsh2 *]) + AC_MSG_RESULT([ **********************************************************************]) +fi + +AC_MSG_RESULT() +AC_MSG_RESULT([ rsync ${RSYNC_VERSION} configuration successful]) +AC_MSG_RESULT()