X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1be77f8336cdaf138fb7a9b7e9d38ee3cc69257c..a41a1e87182410ec6c2eeaddb0cd961ec554c404:/configure.in diff --git a/configure.in b/configure.in index c1d617e3..b964efe7 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.6.1cvs +RSYNC_VERSION=2.6.3 AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -97,6 +97,27 @@ AC_ARG_WITH(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)])) @@ -125,21 +146,26 @@ AC_TRY_RUN([ 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)); } ], @@ -258,13 +284,12 @@ 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 \ + netdb.h malloc.h float.h) +AC_HEADER_MAJOR AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) @@ -367,13 +392,30 @@ else AC_LIBOBJ(lib/getnameinfo) fi - AC_CHECK_MEMBER([struct sockaddr.sa_len], - [ AC_DEFINE(HAVE_SOCKADDR_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_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) @@ -386,7 +428,7 @@ AC_TRY_COMPILE([#include 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 @@ -408,10 +450,11 @@ 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 geteuid) +AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod mkfifo \ + fchmod fstat strchr readlink link utime utimes strftime mtrace ftruncate \ + memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk setmode \ + strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \ + open64 mkstemp64) AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[ AC_TRY_RUN([ @@ -509,7 +552,7 @@ AC_TRY_RUN([ #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 +if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" != x"no"; then AC_DEFINE(HAVE_GETTIMEOFDAY_TZ, 1, [ ]) fi @@ -591,6 +634,34 @@ if test x"$rsync_cv_REPLACE_INET_ATON" = x"yes"; then AC_DEFINE(REPLACE_INET_ATON, 1, [ ]) fi +AC_CACHE_CHECK([if mknod creates FIFOs],rsync_cv_MKNOD_CREATES_FIFOS,[ +AC_TRY_RUN([ +#include +#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\n",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([if mknod creates sockets],rsync_cv_MKNOD_CREATES_SOCKETS,[ +AC_TRY_RUN([ +#include +#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\n",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 + # # The following test was mostly taken from the tcl/tk plus patches #