X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/58cadc8608fbb2cbc7b74578cd92de4337a4b887..16edf86595a5a990a942fa045dfb523dae1fe6cb:/configure.in diff --git a/configure.in b/configure.in index ff4bf748..f95b7fe4 100644 --- a/configure.in +++ b/configure.in @@ -3,9 +3,9 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT() AC_CONFIG_SRCDIR([byteorder.h]) AC_CONFIG_HEADER(config.h) -AC_PREREQ(2.52) +AC_PREREQ(2.59) -RSYNC_VERSION=2.5.7 +RSYNC_VERSION=3.0.0cvs AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -18,6 +18,7 @@ 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) @@ -25,8 +26,7 @@ AC_SUBST(SHELL) 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 +if test x"$ac_cv_prog_cc_stdc" = x"no"; then AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one]) fi @@ -37,12 +37,10 @@ fi AC_MSG_CHECKING([whether to include debugging symbols]) AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug], - [including debugging symbols and features (default yes)]), - [], []) + AC_HELP_STRING([--disable-debug], + [turn off debugging symbols and features])) -if test x"$enable_debug" = x"no" -then +if test x"$enable_debug" = x"no"; then AC_MSG_RESULT(no) CFLAGS=${CFLAGS-"-O"} else @@ -53,25 +51,19 @@ else fi - - AC_ARG_ENABLE(profile, - AC_HELP_STRING([--enable-profile], - [turn on CPU profiling (default no)], - [], [])) -if test x"$enable_profile" = xyes -then + AC_HELP_STRING([--enable-profile], + [turn on CPU profiling])) +if test x"$enable_profile" = x"yes"; 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 + AC_HELP_STRING([--enable-maintainer-mode], + [turn on extra debug features])) +if test x"$enable_maintainer_mode" = x"yes"; then CFLAGS="$CFLAGS -DMAINTAINER_MODE" fi @@ -81,40 +73,77 @@ fi CFLAGS="$CFLAGS -DHAVE_CONFIG_H" # If GCC, turn on warnings. -if test "x$GCC" = "xyes" -then +if test x"$GCC" = x"yes"; then CFLAGS="$CFLAGS -Wall -W" fi AC_ARG_WITH(included-popt, - [ --with-included-popt use bundled popt library, not from system]) + AC_HELP_STRING([--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\")], + AC_HELP_STRING([--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", [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 rsh command to CMD (default: \"remsh\" or \"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, [remote shell is remsh not rsh]) +if test x$HAVE_REMSH = x1; then + AC_DEFINE(HAVE_REMSH, 1, [Define to 1 if remote shell is remsh, not rsh]) +fi -if test x"$with_rsh" != x -then +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" + 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 +AC_ARG_WITH(nobody-group, + AC_HELP_STRING([--with-nobody-group=GROUP], + [set the default unprivileged group (default nobody or nogroup)]), + [ NOBODY_GROUP="$with_nobody_group" ]) + +if test x"$with_nobody_group" = x; then + AC_MSG_CHECKING([the group for user "nobody"]) + if grep '^nobody:' /etc/group >/dev/null 2>&1; then + NOBODY_GROUP=nobody + elif grep '^nogroup:' /etc/group >/dev/null 2>&1; then + NOBODY_GROUP=nogroup + else + NOBODY_GROUP=nobody # test for others? + fi + AC_MSG_RESULT($NOBODY_GROUP) +fi + +AC_DEFINE_UNQUOTED(NOBODY_USER, "nobody", [unprivileged user--e.g. nobody]) +AC_DEFINE_UNQUOTED(NOBODY_GROUP, "$NOBODY_GROUP", [unprivileged group for unprivileged user]) + +# arrgh. libc in some old debian version screwed up the largefile # stuff, getting byte range locking wrong AC_CACHE_CHECK([for broken largefile support],rsync_cv_HAVE_BROKEN_LARGEFILE,[ AC_TRY_RUN([ @@ -124,24 +153,29 @@ AC_TRY_RUN([ #include #include -int main(void) +int main(void) { struct flock lock; - int status; - int fd = open("conftest.dat", O_CREAT|O_RDWR, 0600); + int status; + char tpl[32] = "/tmp/locktest.XXXXXX"; + int fd = mkstemp(tpl); + if (fd < 0) { + strcpy(tpl, "conftest.dat"); + fd = open(tpl, O_CREAT|O_RDWR, 0600); + } + lock.l_type = F_WRLCK; lock.l_whence = SEEK_SET; lock.l_start = 0; lock.l_len = 1; lock.l_pid = 0; - fcntl(fd,F_SETLK,&lock); if (fork() == 0) { - lock.l_start = 1; - exit(fcntl(fd,F_SETLK,&lock) == 0); - } - wait(&status); - unlink("conftest.dat"); + lock.l_start = 1; + _exit(fcntl(fd,F_SETLK,&lock) == 0); + } + wait(&status); + unlink(tpl); exit(WEXITSTATUS(status)); } ], @@ -154,11 +188,10 @@ ipv6type=unknown ipv6lib=none ipv6trylibc=yes -AC_ARG_ENABLE(ipv6, - AC_HELP_STRING([--disable-ipv6], [don't even try to use IPv6])) - -if test "x$enable_ipv6" != xno -then +AC_ARG_ENABLE(ipv6, + AC_HELP_STRING([--disable-ipv6], + [don't even try to use IPv6])) +if test x"$enable_ipv6" != x"no"; then AC_MSG_CHECKING([ipv6 stack type]) for i in inria kame linux-glibc linux-inet6 toshiba v6d zeta; do case $i in @@ -180,7 +213,7 @@ yes #ifdef __KAME__ yes #endif], - [ipv6type=$i; + [ipv6type=$i; AC_DEFINE(INET6, 1, [true if you have IPv6])]) ;; linux-glibc) @@ -247,11 +280,21 @@ yes AC_SEARCH_LIBS(getaddrinfo, inet6) fi +dnl Do you want to disable use of locale functions +AC_ARG_ENABLE([locale], + AC_HELP_STRING([--disable-locale], + [turn off locale features])) +AH_TEMPLATE([CONFIG_LOCALE], +[Undefine if you don't want locale features. By default this is defined.]) +if test x"$enable_locale" != x"no"; then + AC_DEFINE(CONFIG_LOCALE) +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_DEFINE(SHUTDOWN_ALL_SOCKETS, 1, + [Define to 1 if sockets need to be shutdown]) ;; * ) AC_MSG_RESULT(no);; esac @@ -260,19 +303,52 @@ 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 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_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \ + unistd.h utime.h grp.h compat.h sys/param.h ctype.h sys/wait.h \ + sys/ioctl.h sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h \ + sys/un.h glob.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \ + netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h) +AC_HEADER_MAJOR + +AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[ +AC_TRY_RUN([ +#include +#ifdef MAJOR_IN_MKDEV +#include +# if !defined makedev && (defined mkdev || defined _WIN32 || defined __WIN32__) +# define makedev mkdev +# endif +#elif defined MAJOR_IN_SYSMACROS +#include +#endif + +int main(void) +{ + dev_t dev = makedev(0, 5, 7); + if (major(dev) != 5 || minor(dev) != 7) + exit(1); + return 0; +} +], +rsync_cv_MAKEDEV_TAKES_3_ARGS=yes,rsync_cv_MAKEDEV_TAKES_3_ARGS=no,rsync_cv_MAKEDEV_TAKES_3_ARGS=no)]) +if test x"$rsync_cv_MAKEDEV_TAKES_3_ARGS" = x"yes"; then + AC_DEFINE(MAKEDEV_TAKES_3_ARGS, 1, [Define to 1 if makedev() takes 3 args]) +fi AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(int16_t) +AC_CHECK_SIZEOF(uint16_t) +AC_CHECK_SIZEOF(int32_t) +AC_CHECK_SIZEOF(uint32_t) +AC_CHECK_SIZEOF(int64_t) +AC_CHECK_SIZEOF(off_t) +AC_CHECK_SIZEOF(off64_t) AC_C_INLINE +AC_C_LONG_DOUBLE AC_TYPE_SIGNAL AC_TYPE_UID_T @@ -283,14 +359,13 @@ AC_TYPE_PID_T AC_TYPE_GETGROUPS AC_CHECK_MEMBERS([struct stat.st_rdev]) -AC_CHECK_TYPE([ino_t], [unsigned]) TYPE_SOCKLEN_T AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [ AC_TRY_COMPILE([#include ],[int i = errno], rsync_cv_errno=yes,rsync_cv_have_errno_decl=no)]) if test x"$rsync_cv_errno" = x"yes"; then - AC_DEFINE(HAVE_ERRNO_DECL, 1, [ ]) + AC_DEFINE(HAVE_ERRNO_DECL, 1, [Define to 1 if errno is declared in errno.h]) fi # The following test taken from the cvs sources @@ -321,20 +396,46 @@ 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 - AC_DEFINE(HAVE_CONNECT, 1, [ ]) + AC_DEFINE(HAVE_CONNECT, 1, [Define to 1 if you have the "connect" function]) fi fi -AC_CHECK_LIB(resolv, inet_ntop) +AC_SEARCH_LIBS(inet_ntop, resolv) + +# Solaris and HP-UX weirdness: +# Search for libiconv_open (not iconv_open) to discover if -liconv is needed! +AC_SEARCH_LIBS(libiconv_open, iconv) + +AC_MSG_CHECKING([for iconv declaration]) +AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_TRY_COMPILE([ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` +AC_MSG_RESULT([$]{ac_t:- + }[$]am_cv_proto_iconv) +AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + [Define as const if the declaration of iconv() needs const.]) 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 @@ -346,7 +447,7 @@ AC_CACHE_CHECK([whether defines needed by getaddrinfo exist], #include #ifdef AI_PASSIVE yes - #endif], + #endif], rsync_cv_HAVE_GETADDR_DEFINES=yes, rsync_cv_HAVE_GETADDR_DEFINES=no)]) if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes"; then @@ -360,22 +461,39 @@ if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes"; then #include ],[getaddrinfo(NULL, NULL, NULL, NULL);], [AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_GETADDRINFO, 1, - [Define if you have the `getaddrinfo' function.])], + [Define to 1 if you have the "getaddrinfo" function.])], [AC_MSG_RESULT([no]) AC_LIBOBJ(lib/getaddrinfo)])]) - AC_CHECK_FUNCS(getnameinfo, , AC_LIBOBJ(lib/getnameinfo)) + AC_CHECK_FUNCS(getnameinfo, , [AC_LIBOBJ(lib/getnameinfo)]) else AC_LIBOBJ(lib/getaddrinfo) AC_LIBOBJ(lib/getnameinfo) fi +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_in.sin_len], + [ AC_DEFINE(HAVE_SOCKADDR_IN_LEN, 1, [Do we have sockaddr_in.sin_len?]) ], + [], + [ +#include +#include +#include +]) -AC_CHECK_MEMBER([struct sockaddr.sa_len], - [ AC_DEFINE(HAVE_SOCKADDR_LEN) ], +AC_CHECK_MEMBER([struct sockaddr_un.sun_len], + [ AC_DEFINE(HAVE_SOCKADDR_UN_LEN, 1, [Do we have sockaddr_un.sun_len?]) ], [], [ #include #include +#include ]) AC_MSG_CHECKING(struct sockaddr_storage) @@ -383,12 +501,12 @@ 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_DEFINE(HAVE_SOCKADDR_STORAGE, 1, + [Define to 1 if you have struct sockaddr_storage.] ), AC_MSG_RESULT(no)) AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id], - [ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID) ], + [ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID, 1, [Do we have sockaddr_in6.sin6_scope_id?]) ], [], [ #include @@ -396,6 +514,27 @@ AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id], #include ]) +AC_MSG_CHECKING(struct stat64) +AC_TRY_COMPILE([#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +],[struct stat64 st;], + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_STRUCT_STAT64,1,[Define to 1 if you have struct stat64.]), + AC_MSG_RESULT(no)) + # if we can't find strcasecmp, look in -lresolv (for Unixware at least) # AC_CHECK_FUNCS(strcasecmp) @@ -403,17 +542,87 @@ if test x"$ac_cv_func_strcasecmp" = x"no"; then AC_CHECK_LIB(resolv, strcasecmp) fi +AC_CHECK_FUNCS(aclsort) +if test x"$ac_cv_func_aclsort" = x"no"; then + AC_CHECK_LIB(sec, aclsort) +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_FUNC_ALLOCA -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 strtol mtrace mallinfo setgroups) +AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \ + fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \ + memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \ + strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \ + setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \ + strerror putenv iconv_open locale_charset nl_langinfo \ + sigaction sigprocmask) + +AC_CHECK_FUNCS(getpgrp tcgetpgrp) +if test $ac_cv_func_getpgrp = yes; then + AC_FUNC_GETPGRP +fi + +AC_CACHE_CHECK([whether chown() modifies symlinks],rsync_cv_chown_modifies_symlink,[ + AC_TRY_RUN([ +#if HAVE_UNISTD_H +# include +#endif +#include +#include + main() { + char const *dangling_symlink = "conftest.dangle"; + unlink(dangling_symlink); + if (symlink("conftest.no-such", dangling_symlink) < 0) abort(); + if (chown(dangling_symlink, getuid(), getgid()) < 0 && errno == ENOENT) exit(1); + exit(0); + }], + rsync_cv_chown_modifies_symlink=yes,rsync_cv_chown_modifies_symlink=no,rsync_cv_chown_modifies_symlink=no)]) +if test $rsync_cv_chown_modifies_symlink = yes; then + AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, [Define to 1 if chown modifies symlinks.]) +fi + +AC_CACHE_CHECK([whether link() can hard-link symlinks],rsync_cv_can_hardlink_symlink,[ + AC_TRY_RUN([ +#if HAVE_UNISTD_H +# include +#endif +#include +#include +#define FILENAME "conftest.dangle" + main() { + unlink(FILENAME); + if (symlink("conftest.no-such", FILENAME) < 0) abort(); + if (link(FILENAME, FILENAME "2") < 0) exit(1); + exit(0); + }], + rsync_cv_can_hardlink_symlink=yes,rsync_cv_can_hardlink_symlink=no,rsync_cv_can_hardlink_symlink=no)]) +if test $rsync_cv_can_hardlink_symlink = yes; then + AC_DEFINE(CAN_HARDLINK_SYMLINK, 1, [Define to 1 if link() can hard-link symlinks.]) +fi + +AC_CACHE_CHECK([whether link() can hard-link special files],rsync_cv_can_hardlink_special,[ + AC_TRY_RUN([ +#if HAVE_UNISTD_H +# include +#endif +#include +#include +#define FILENAME "conftest.fifi" + main() { + unlink(FILENAME); + if (mkfifo(FILENAME, 0777) < 0) abort(); + if (link(FILENAME, FILENAME "2") < 0) exit(1); + exit(0); + }], + rsync_cv_can_hardlink_special=yes,rsync_cv_can_hardlink_special=no,rsync_cv_can_hardlink_special=no)]) +if test $rsync_cv_can_hardlink_special = yes; then + AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.]) +fi AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[ AC_TRY_RUN([ @@ -426,17 +635,15 @@ main() { }], 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, [ ]) + AC_DEFINE(HAVE_SOCKETPAIR, 1, [Define to 1 if you have the "socketpair" function]) fi -if test x"$with_included_popt" != x"yes" -then +if test x"$with_included_popt" != x"yes"; then AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) fi AC_MSG_CHECKING([whether to use included libpopt]) -if test x"$with_included_popt" = x"yes" -then +if test x"$with_included_popt" = x"yes"; then AC_MSG_RESULT($srcdir/popt) BUILD_POPT='$(popt_OBJS)' CFLAGS="$CFLAGS -I$srcdir/popt" @@ -450,39 +657,11 @@ else AC_MSG_RESULT(no) fi -AC_CACHE_CHECK([for long long],rsync_cv_HAVE_LONGLONG,[ -AC_TRY_RUN([#include -main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); }], -rsync_cv_HAVE_LONGLONG=yes,rsync_cv_HAVE_LONGLONG=no,rsync_cv_HAVE_LONGLONG=cross)]) -if test x"$rsync_cv_HAVE_LONGLONG" = x"yes"; then - AC_DEFINE(HAVE_LONGLONG, 1, [ ]) -fi - -AC_CACHE_CHECK([for off64_t],rsync_cv_HAVE_OFF64_T,[ -AC_TRY_RUN([#include -#include -main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }], -rsync_cv_HAVE_OFF64_T=yes,rsync_cv_HAVE_OFF64_T=no,rsync_cv_HAVE_OFF64_T=cross)]) -if test x"$rsync_cv_HAVE_OFF64_T" = x"yes"; then - AC_DEFINE(HAVE_OFF64_T, 1, [ ]) -fi - -AC_CACHE_CHECK([for short ino_t],rsync_cv_HAVE_SHORT_INO_T,[ -AC_TRY_RUN([#include -#include -#include -main() { if (sizeof(ino_t) < sizeof(unsigned int)) return 0; return 1; }], -rsync_cv_HAVE_SHORT_INO_T=yes,rsync_cv_HAVE_SHORT_INO_T=no,rsync_cv_HAVE_SHORT_INO_T=cross)]) -if test x"$rsync_cv_HAVE_SHORT_INO_T" = x"yes"; then - AC_DEFINE(HAVE_SHORT_INO_T, 1, [ ]) -fi - -AC_CACHE_CHECK([for unsigned char],rsync_cv_HAVE_UNSIGNED_CHAR,[ -AC_TRY_RUN([#include -main() { char c; c=250; exit((c > 0)?0:1); }], -rsync_cv_HAVE_UNSIGNED_CHAR=yes,rsync_cv_HAVE_UNSIGNED_CHAR=no,rsync_cv_HAVE_UNSIGNED_CHAR=cross)]) -if test x"$rsync_cv_HAVE_UNSIGNED_CHAR" = x"yes"; then - AC_DEFINE(HAVE_UNSIGNED_CHAR, 1, [ ]) +AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[ +AC_TRY_COMPILE([],[signed char *s = ""], +rsync_cv_SIGNED_CHAR_OK=yes,rsync_cv_SIGNED_CHAR_OK=no)]) +if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then + AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type]) fi AC_CACHE_CHECK([for broken readdir],rsync_cv_HAVE_BROKEN_READDIR,[ @@ -493,33 +672,32 @@ if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 && di->d_name[0] == 0) exit(0); exit(1);} ], rsync_cv_HAVE_BROKEN_READDIR=yes,rsync_cv_HAVE_BROKEN_READDIR=no,rsync_cv_HAVE_BROKEN_READDIR=cross)]) if test x"$rsync_cv_HAVE_BROKEN_READDIR" = x"yes"; then - AC_DEFINE(HAVE_BROKEN_READDIR, 1, [ ]) + AC_DEFINE(HAVE_BROKEN_READDIR, 1, [Define to 1 if readdir() is broken]) fi AC_CACHE_CHECK([for utimbuf],rsync_cv_HAVE_UTIMBUF,[ AC_TRY_COMPILE([#include #include ], [struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));], -rsync_cv_HAVE_UTIMBUF=yes,rsync_cv_HAVE_UTIMBUF=no,rsync_cv_HAVE_UTIMBUF=cross)]) +rsync_cv_HAVE_UTIMBUF=yes,rsync_cv_HAVE_UTIMBUF=no)]) if test x"$rsync_cv_HAVE_UTIMBUF" = x"yes"; then - AC_DEFINE(HAVE_UTIMBUF, 1, [ ]) + AC_DEFINE(HAVE_UTIMBUF, 1, [Define to 1 if you have the "struct utimbuf" type]) fi AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[ -AC_TRY_RUN([ -#include -#include -main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}], - rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes,rsync_cv_HAVE_GETTIMEOFDAY_TZ=no,rsync_cv_HAVE_GETTIMEOFDAY_TZ=cross)]) -if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then - AC_DEFINE(HAVE_GETTIMEOFDAY_TZ, 1, [ ]) +AC_TRY_COMPILE([#include +#include ], +[struct timeval tv; exit(gettimeofday(&tv, NULL));], +rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes,rsync_cv_HAVE_GETTIMEOFDAY_TZ=no)]) +if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" != x"no"; then + AC_DEFINE(HAVE_GETTIMEOFDAY_TZ, 1, [Define to 1 if gettimeofday() takes a time-zone arg]) fi 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]; @@ -537,7 +715,7 @@ main() { foo("hello"); } ], rsync_cv_HAVE_C99_VSNPRINTF=yes,rsync_cv_HAVE_C99_VSNPRINTF=no,rsync_cv_HAVE_C99_VSNPRINTF=cross)]) if test x"$rsync_cv_HAVE_C99_VSNPRINTF" = x"yes"; then - AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [ ]) + AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [Define to 1 if vsprintf has a C99-compatible return value]) fi @@ -546,10 +724,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); @@ -560,37 +738,46 @@ rsync_cv_HAVE_SECURE_MKSTEMP=yes, rsync_cv_HAVE_SECURE_MKSTEMP=no, rsync_cv_HAVE_SECURE_MKSTEMP=cross)]) if test x"$rsync_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then - AC_DEFINE(HAVE_SECURE_MKSTEMP, 1, [ ]) + case $target_os in + hpux*) + dnl HP-UX has a broken mkstemp() implementation they refuse to fix, + dnl so we noisily skip using it. See HP change request JAGaf34426 + dnl for details. (sbonds) + AC_MSG_WARN(Skipping broken HP-UX mkstemp() -- using mktemp() instead) + ;; + *) + AC_DEFINE(HAVE_SECURE_MKSTEMP, 1, [Define to 1 if mkstemp() is available and works right]) + ;; + esac fi -AC_CACHE_CHECK([for broken inet_ntoa],rsync_cv_REPLACE_INET_NTOA,[ +AC_CACHE_CHECK([if mknod creates FIFOs],rsync_cv_MKNOD_CREATES_FIFOS,[ AC_TRY_RUN([ #include -#include -#include -#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); } -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 - AC_DEFINE(REPLACE_INET_NTOA, 1, [ ]) +#include +#include +main() { int rc, ec; char *fn = "fifo-test"; +unlink(fn); rc = mknod(fn,S_IFIFO,0600); ec = errno; unlink(fn); +if (rc) {printf("(%d %d) ",rc,ec); return ec;} +return 0;}], + rsync_cv_MKNOD_CREATES_FIFOS=yes,rsync_cv_MKNOD_CREATES_FIFOS=no,rsync_cv_MKNOD_CREATES_FIFOS=cross)]) +if test x"$rsync_cv_MKNOD_CREATES_FIFOS" = x"yes"; then + AC_DEFINE(MKNOD_CREATES_FIFOS, 1, [Define to 1 if mknod() can create FIFOs.]) fi - -AC_CACHE_CHECK([for broken inet_aton],rsync_cv_REPLACE_INET_ATON,[ +AC_CACHE_CHECK([if mknod creates sockets],rsync_cv_MKNOD_CREATES_SOCKETS,[ AC_TRY_RUN([ #include -#include -#include -#include -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 - AC_DEFINE(REPLACE_INET_ATON, 1, [ ]) +#include +#include +main() { int rc, ec; char *fn = "sock-test"; +unlink(fn); rc = mknod(fn,S_IFSOCK,0600); ec = errno; unlink(fn); +if (rc) {printf("(%d %d) ",rc,ec); return ec;} +return 0;}], + rsync_cv_MKNOD_CREATES_SOCKETS=yes,rsync_cv_MKNOD_CREATES_SOCKETS=no,rsync_cv_MKNOD_CREATES_SOCKETS=cross)]) +if test x"$rsync_cv_MKNOD_CREATES_SOCKETS" = x"yes"; then + AC_DEFINE(MKNOD_CREATES_SOCKETS, 1, [Define to 1 if mknod() can create sockets.]) fi # @@ -624,6 +811,126 @@ AC_SUBST(OBJ_RESTORE) AC_SUBST(CC_SHOBJ_FLAG) AC_SUBST(BUILD_POPT) +AC_CHECK_HEADERS(sys/acl.h acl/libacl.h) +AC_CHECK_FUNCS(_acl __acl _facl __facl) +################################################# +# check for ACL support + +AC_MSG_CHECKING([whether to support ACLs]) +AC_ARG_ENABLE(acl-support, + AC_HELP_STRING([--disable-acl-support], + [Turn off ACL support])) + +if test x"$enable_acl_support" = x"no"; then + AC_MSG_RESULT(no) +else + case "$host_os" in + *sysv5*) + AC_MSG_RESULT(Using UnixWare ACLs) + AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have UnixWare ACLs]) + AC_DEFINE(SUPPORT_ACLS, 1, [Define to 1 to add support for ACLs]) + ;; + *solaris*|*cygwin*) + AC_MSG_RESULT(Using solaris ACLs) + AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs]) + AC_DEFINE(SUPPORT_ACLS, 1) + ;; + *hpux*) + AC_MSG_RESULT(Using HPUX ACLs) + AC_DEFINE(HAVE_HPUX_ACLS, 1, [true if you have HPUX ACLs]) + AC_DEFINE(SUPPORT_ACLS, 1) + ;; + *irix*) + AC_MSG_RESULT(Using IRIX ACLs) + AC_DEFINE(HAVE_IRIX_ACLS, 1, [true if you have IRIX ACLs]) + AC_DEFINE(SUPPORT_ACLS, 1) + ;; + *aix*) + AC_MSG_RESULT(Using AIX ACLs) + AC_DEFINE(HAVE_AIX_ACLS, 1, [true if you have AIX ACLs]) + AC_DEFINE(SUPPORT_ACLS, 1) + ;; + *osf*) + AC_MSG_RESULT(Using Tru64 ACLs) + AC_DEFINE(HAVE_TRU64_ACLS, 1, [true if you have Tru64 ACLs]) + AC_DEFINE(SUPPORT_ACLS, 1) + LIBS="$LIBS -lpacl" + ;; + darwin*) + AC_MSG_RESULT(MacOS ACLs not yet supported) + ;; + *) + AC_MSG_RESULT(running tests:) + AC_CHECK_LIB(acl,acl_get_file) + AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[ + AC_TRY_LINK([#include +#include ], +[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);], +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)]) + AC_MSG_CHECKING(ACL test results) + if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then + AC_MSG_RESULT(Using posix ACLs) + AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs]) + AC_DEFINE(SUPPORT_ACLS, 1) + AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[ + AC_TRY_LINK([#include +#include ], +[ acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);], +samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)]) + if test x"$samba_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then + AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np]) + fi + else + if test x"$enable_acl_support" = x"yes"; then + AC_MSG_ERROR(Failed to find ACL support) + else + AC_MSG_RESULT(No ACL support found) + fi + fi + ;; + esac +fi + +AC_CHECK_HEADERS(attr/xattr.h) +AC_CHECK_HEADERS(sys/xattr.h) +AC_CHECK_HEADERS(sys/extattr.h) + +################################################# +# check for extended attribute support +AC_MSG_CHECKING(whether to support extended attributes) +AC_ARG_ENABLE(xattr-support, + AC_HELP_STRING([--disable-xattr-support], + [Turn off extended attribute support])) + +if test x"$enable_xattr_support" = x"no"; then + AC_MSG_RESULT(no) +else + case "$host_os" in + *linux*) + AC_MSG_RESULT(Using Linux xattrs) + AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs]) + AC_DEFINE(SUPPORT_XATTRS, 1, [Define to 1 to add support for extended attributes]) + ;; + darwin*) + AC_MSG_RESULT(Using OS X xattrs) + AC_DEFINE(HAVE_OSX_XATTRS, 1, [True if you have Mac OS X xattrs]) + AC_DEFINE(SUPPORT_XATTRS, 1) + ;; + freebsd*) + AC_MSG_RESULT(Using FreeBSD extattrs) + AC_DEFINE(HAVE_FREEBSD_XATTRS, 1, [True if you have FreeBSD xattrs]) + AC_DEFINE(SUPPORT_XATTRS, 1) + ;; + *) + if test x"$enable_xattr_support" = x"yes"; then + AC_MSG_ERROR(Failed to find extended attribute support) + else + AC_MSG_RESULT(No extended attribute support found) + fi + ;; + esac +fi + AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT