Diff for /embedaddon/rsync/configure.ac between versions 1.1 and 1.1.1.3

version 1.1, 2012/02/17 15:09:30 version 1.1.1.3, 2016/11/01 09:54:32
Line 1 Line 1
 dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
   
AC_INIT()AC_INIT([rsync],[3.1.2],[http://rsync.samba.org/bugzilla.html])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([byteorder.h])  AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)  AC_CONFIG_HEADER(config.h)
AC_PREREQ(2.59)AC_PREREQ([2.69])
   
RSYNC_VERSION=3.0.9AC_SUBST(RSYNC_VERSION, $PACKAGE_VERSION)
AC_SUBST(RSYNC_VERSION)AC_MSG_NOTICE([Configuring rsync $PACKAGE_VERSION])
AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) 
   
AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version])AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$PACKAGE_VERSION"], [rsync release version])
   
 LDFLAGS=${LDFLAGS-""}  LDFLAGS=${LDFLAGS-""}
   
 AC_CANONICAL_HOST  AC_CANONICAL_HOST
   
   dnl define the directory for replacement function since AC_LIBOBJ does not
   dnl officially support subdirs and fails with automake
   AC_CONFIG_LIBOBJ_DIR([lib])
   
 # 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  # Please allow this to default to yes, so that your users have more
Line 22  AC_CANONICAL_HOST Line 27  AC_CANONICAL_HOST
   
 AC_MSG_CHECKING([whether to include debugging symbols])  AC_MSG_CHECKING([whether to include debugging symbols])
 AC_ARG_ENABLE(debug,  AC_ARG_ENABLE(debug,
        AC_HELP_STRING([--disable-debug],        AS_HELP_STRING([--disable-debug],[disable debugging symbols and features]))
                [disable debugging symbols and features])) 
   
 if test x"$enable_debug" = x"no"; then  if test x"$enable_debug" = x"no"; then
     AC_MSG_RESULT(no)      AC_MSG_RESULT(no)
Line 39  AC_PROG_CC Line 43  AC_PROG_CC
 AC_PROG_CPP  AC_PROG_CPP
 AC_PROG_EGREP  AC_PROG_EGREP
 AC_PROG_INSTALL  AC_PROG_INSTALL
   AC_PROG_MKDIR_P
 AC_PROG_CC_STDC  AC_PROG_CC_STDC
 AC_SUBST(SHELL)  AC_SUBST(SHELL)
   AC_PATH_PROG([PERL], [perl])
   
 AC_DEFINE([_GNU_SOURCE], 1,  AC_DEFINE([_GNU_SOURCE], 1,
           [Define _GNU_SOURCE so that we get all necessary prototypes])            [Define _GNU_SOURCE so that we get all necessary prototypes])
Line 50  if test x"$ac_cv_prog_cc_stdc" = x"no"; then Line 56  if test x"$ac_cv_prog_cc_stdc" = x"no"; then
 fi  fi
   
 AC_ARG_ENABLE(profile,  AC_ARG_ENABLE(profile,
        AC_HELP_STRING([--enable-profile],        AS_HELP_STRING([--enable-profile],[turn on CPU profiling]))
                [turn on CPU profiling])) 
 if test x"$enable_profile" = x"yes"; then  if test x"$enable_profile" = x"yes"; then
         CFLAGS="$CFLAGS -pg"          CFLAGS="$CFLAGS -pg"
 fi  fi
Line 59  fi Line 64  fi
   
 # Specifically, this turns on panic_action handling.  # Specifically, this turns on panic_action handling.
 AC_ARG_ENABLE(maintainer-mode,  AC_ARG_ENABLE(maintainer-mode,
        AC_HELP_STRING([--enable-maintainer-mode],        AS_HELP_STRING([--enable-maintainer-mode],[turn on extra debug features]))
                [turn on extra debug features])) 
 if test x"$enable_maintainer_mode" = x"yes"; then  if test x"$enable_maintainer_mode" = x"yes"; then
         CFLAGS="$CFLAGS -DMAINTAINER_MODE"          CFLAGS="$CFLAGS -DMAINTAINER_MODE"
 fi  fi
Line 76  if test x"$GCC" = x"yes"; then Line 80  if test x"$GCC" = x"yes"; then
 fi  fi
   
 AC_ARG_WITH(included-popt,  AC_ARG_WITH(included-popt,
        AC_HELP_STRING([--with-included-popt], [use bundled popt library, not from system]))        AS_HELP_STRING([--with-included-popt],[use bundled popt library, not from system]))
   
   AC_ARG_WITH(included-zlib,
           AS_HELP_STRING([--with-included-zlib],[use bundled zlib library, not from system]))
   
   AC_ARG_WITH(protected-args,
           AS_HELP_STRING([--with-protected-args],[make --protected-args option the default]))
   if test x"$with_protected_args" = x"yes"; then
           AC_DEFINE_UNQUOTED(RSYNC_USE_PROTECTED_ARGS, 1, [Define to 1 if --protected-args should be the default])
   fi
   
 AC_ARG_WITH(rsync-path,  AC_ARG_WITH(rsync-path,
        AC_HELP_STRING([--with-rsync-path=PATH], [set default --rsync-path to PATH (default: rsync)]),        AS_HELP_STRING([--with-rsync-path=PATH],[set default --rsync-path to PATH (default: rsync)]),
         [ RSYNC_PATH="$with_rsync_path" ],          [ RSYNC_PATH="$with_rsync_path" ],
         [ RSYNC_PATH="rsync" ])          [ RSYNC_PATH="rsync" ])
   
 AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])  AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
   
 AC_ARG_WITH(rsyncd-conf,  AC_ARG_WITH(rsyncd-conf,
        AC_HELP_STRING([--with-rsyncd-conf=PATH], [set configuration file for rsync server to PATH (default: /etc/rsyncd.conf)]),        AS_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          [ if test ! -z "$with_rsyncd_conf" ; then
                 case $with_rsyncd_conf in                  case $with_rsyncd_conf in
                         yes|no)                          yes|no)
Line 107  AC_ARG_WITH(rsyncd-conf, Line 120  AC_ARG_WITH(rsyncd-conf,
 AC_DEFINE_UNQUOTED(RSYNCD_SYSCONF, "$RSYNCD_SYSCONF", [location of configuration file for rsync server])  AC_DEFINE_UNQUOTED(RSYNCD_SYSCONF, "$RSYNCD_SYSCONF", [location of configuration file for rsync server])
   
 AC_ARG_WITH(rsh,  AC_ARG_WITH(rsh,
        AC_HELP_STRING([--with-rsh=CMD], [set remote shell command to CMD (default: ssh)]))        AS_HELP_STRING([--with-rsh=CMD],[set remote shell command to CMD (default: ssh)]))
   
 AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0)  AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0)
 if test x$HAVE_REMSH = x1; then  if test x$HAVE_REMSH = x1; then
Line 124  AC_DEFINE_UNQUOTED(RSYNC_RSH, "$RSYNC_RSH", [default - Line 137  AC_DEFINE_UNQUOTED(RSYNC_RSH, "$RSYNC_RSH", [default -
 AC_CHECK_PROG(HAVE_YODL2MAN, yodl2man, 1, 0)  AC_CHECK_PROG(HAVE_YODL2MAN, yodl2man, 1, 0)
 if test x$HAVE_YODL2MAN = x1; then  if test x$HAVE_YODL2MAN = x1; then
     MAKE_MAN=man      MAKE_MAN=man
   else
       MAKE_MAN=man-copy
 fi  fi
   
   # Some programs on solaris are only found in /usr/xpg4/bin (or work better than others versions).
   AC_PATH_PROG(SHELL_PATH, sh, /bin/sh, [/usr/xpg4/bin$PATH_SEPARATOR$PATH])
   AC_PATH_PROG(FAKEROOT_PATH, fakeroot, /usr/bin/fakeroot, [/usr/xpg4/bin$PATH_SEPARATOR$PATH])
   
 AC_ARG_WITH(nobody-group,  AC_ARG_WITH(nobody-group,
    AC_HELP_STRING([--with-nobody-group=GROUP],    AS_HELP_STRING([--with-nobody-group=GROUP],[set the default unprivileged group (default nobody or nogroup)]),
                   [set the default unprivileged group (default nobody or nogroup)]), 
     [ NOBODY_GROUP="$with_nobody_group" ])      [ NOBODY_GROUP="$with_nobody_group" ])
   
 if test x"$with_nobody_group" = x; then  if test x"$with_nobody_group" = x; then
Line 149  AC_DEFINE_UNQUOTED(NOBODY_GROUP, "$NOBODY_GROUP", [unp Line 167  AC_DEFINE_UNQUOTED(NOBODY_GROUP, "$NOBODY_GROUP", [unp
 # arrgh. libc in some old debian version screwed up the largefile  # arrgh. libc in some old debian version screwed up the largefile
 # stuff, getting byte range locking wrong  # stuff, getting byte range locking wrong
 AC_CACHE_CHECK([for broken largefile support],rsync_cv_HAVE_BROKEN_LARGEFILE,[  AC_CACHE_CHECK([for broken largefile support],rsync_cv_HAVE_BROKEN_LARGEFILE,[
AC_TRY_RUN([AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #define _FILE_OFFSET_BITS 64  #define _FILE_OFFSET_BITS 64
 #include <stdio.h>  #include <stdio.h>
 #include <fcntl.h>  #include <fcntl.h>
Line 181  int main(void) Line 199  int main(void)
         unlink(tpl);          unlink(tpl);
         exit(WEXITSTATUS(status));          exit(WEXITSTATUS(status));
 }  }
],]])],[rsync_cv_HAVE_BROKEN_LARGEFILE=yes],[rsync_cv_HAVE_BROKEN_LARGEFILE=no],[rsync_cv_HAVE_BROKEN_LARGEFILE=cross])])
rsync_cv_HAVE_BROKEN_LARGEFILE=yes,rsync_cv_HAVE_BROKEN_LARGEFILE=no,rsync_cv_HAVE_BROKEN_LARGEFILE=cross)]) 
 if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then  if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then
    AC_SYS_LARGEFILE     AC_SYS_LARGEFILE
 fi  fi
Line 192  ipv6lib=none Line 209  ipv6lib=none
 ipv6trylibc=yes  ipv6trylibc=yes
   
 AC_ARG_ENABLE(ipv6,  AC_ARG_ENABLE(ipv6,
        AC_HELP_STRING([--disable-ipv6],        AS_HELP_STRING([--disable-ipv6],[do not even try to use IPv6]))
                [do not even try to use IPv6])) 
 if test x"$enable_ipv6" != x"no"; then  if test x"$enable_ipv6" != x"no"; then
         AC_MSG_CHECKING([ipv6 stack type])          AC_MSG_CHECKING([ipv6 stack type])
         for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin; do          for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin; do
Line 304  fi Line 320  fi
   
 dnl Do you want to disable use of locale functions  dnl Do you want to disable use of locale functions
 AC_ARG_ENABLE([locale],  AC_ARG_ENABLE([locale],
        AC_HELP_STRING([--disable-locale],        AS_HELP_STRING([--disable-locale],[disable locale features]))
                [disable locale features])) 
 AH_TEMPLATE([CONFIG_LOCALE],  AH_TEMPLATE([CONFIG_LOCALE],
 [Undefine if you do not want locale features.  By default this is defined.])  [Undefine if you do not want locale features.  By default this is defined.])
 if test x"$enable_locale" != x"no"; then  if test x"$enable_locale" != x"no"; then
Line 331  AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/ Line 346  AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/
     sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \      sys/un.h sys/attr.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 \      netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
     sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \      sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
    popt.h popt/popt.h netinet/in_systm.h netinet/ip.h)    popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netinet/ip.h \
     zlib.h)
 AC_HEADER_MAJOR  AC_HEADER_MAJOR
   
 AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[  AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[
AC_TRY_RUN([AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>  #include <sys/types.h>
 #ifdef MAJOR_IN_MKDEV  #ifdef MAJOR_IN_MKDEV
 #include <sys/mkdev.h>  #include <sys/mkdev.h>
Line 353  int main(void) Line 369  int main(void)
                 exit(1);                  exit(1);
         return 0;          return 0;
 }  }
],]])],[rsync_cv_MAKEDEV_TAKES_3_ARGS=yes],[rsync_cv_MAKEDEV_TAKES_3_ARGS=no],[rsync_cv_MAKEDEV_TAKES_3_ARGS=no])])
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  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])     AC_DEFINE(MAKEDEV_TAKES_3_ARGS, 1, [Define to 1 if makedev() takes 3 args])
 fi  fi
Line 373  AC_CHECK_SIZEOF(off64_t) Line 388  AC_CHECK_SIZEOF(off64_t)
 AC_CHECK_SIZEOF(time_t)  AC_CHECK_SIZEOF(time_t)
   
 AC_C_INLINE  AC_C_INLINE
 AC_C_LONG_DOUBLE  
   
AC_TYPE_SIGNALAC_TYPE_LONG_DOUBLE_WIDER
 ac_cv_c_long_double=$ac_cv_type_long_double_wider
 if test $ac_cv_c_long_double = yes; then
   AC_DEFINE([HAVE_LONG_DOUBLE],[1],[Define to 1 if the type `long double' works and has more range or precision than `double'.])
 fi
 
 AC_TYPE_UID_T  AC_TYPE_UID_T
 AC_CHECK_TYPES([mode_t,off_t,size_t,pid_t,id_t])  AC_CHECK_TYPES([mode_t,off_t,size_t,pid_t,id_t])
 AC_TYPE_GETGROUPS  AC_TYPE_GETGROUPS
AC_CHECK_MEMBERS([struct stat.st_rdev])AC_CHECK_MEMBERS([struct stat.st_rdev,
                   struct stat.st_mtimensec,
                   struct stat.st_mtim.tv_nsec],,,[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif])
   
 TYPE_SOCKLEN_T  TYPE_SOCKLEN_T
   
 AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [  AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [
    AC_TRY_COMPILE([#include <errno.h>],[int i = errno],    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]], [[int i = errno]])],[rsync_cv_errno=yes],[rsync_cv_have_errno_decl=no])])
        rsync_cv_errno=yes,rsync_cv_have_errno_decl=no)]) 
 if test x"$rsync_cv_errno" = x"yes"; then  if test x"$rsync_cv_errno" = x"yes"; then
    AC_DEFINE(HAVE_ERRNO_DECL, 1, [Define to 1 if errno is declared in errno.h])     AC_DEFINE(HAVE_ERRNO_DECL, 1, [Define to 1 if errno is declared in errno.h])
 fi  fi
Line 436  AC_SEARCH_LIBS(libiconv_open, iconv) Line 465  AC_SEARCH_LIBS(libiconv_open, iconv)
   
 AC_MSG_CHECKING([for iconv declaration])  AC_MSG_CHECKING([for iconv declaration])
 AC_CACHE_VAL(am_cv_proto_iconv, [  AC_CACHE_VAL(am_cv_proto_iconv, [
    AC_TRY_COMPILE([    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stdlib.h>  #include <stdlib.h>
 #include <iconv.h>  #include <iconv.h>
 extern  extern
Line 448  size_t iconv (iconv_t cd, char * *inbuf, size_t *inbyt Line 477  size_t iconv (iconv_t cd, char * *inbuf, size_t *inbyt
 #else  #else
 size_t iconv();  size_t iconv();
 #endif  #endif
], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")]], [[]])],[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="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/( /(/'`      am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
 AC_MSG_RESULT([$]{ac_t:-  AC_MSG_RESULT([$]{ac_t:-
Line 458  AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg Line 487  AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg
   
 dnl 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_REPLACE_FUNCS([inet_ntop inet_pton])
AC_CHECK_FUNCS(inet_pton, , [AC_LIBOBJ(lib/inet_pton)]) 
   
 AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>])  AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>])
 AC_HAVE_TYPE([struct sockaddr_storage], [#include <sys/types.h>  AC_HAVE_TYPE([struct sockaddr_storage], [#include <sys/types.h>
Line 478  AC_CACHE_CHECK([whether defines needed by getaddrinfo  Line 506  AC_CACHE_CHECK([whether defines needed by getaddrinfo 
                         #endif],                          #endif],
                         rsync_cv_HAVE_GETADDR_DEFINES=yes,                          rsync_cv_HAVE_GETADDR_DEFINES=yes,
                         rsync_cv_HAVE_GETADDR_DEFINES=no)])                          rsync_cv_HAVE_GETADDR_DEFINES=no)])
if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes" -a x"$ac_cv_type_struct_addrinfo" = x"yes"; thenAS_IF([test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes" -a x"$ac_cv_type_struct_addrinfo" = x"yes"],[
         # Tru64 UNIX has getaddrinfo() but has it renamed in libc as          # Tru64 UNIX has getaddrinfo() but has it renamed in libc as
         # something else so we must include <netdb.h> to get the          # something else so we must include <netdb.h> to get the
         # redefinition.          # redefinition.
         AC_CHECK_FUNCS(getaddrinfo, ,          AC_CHECK_FUNCS(getaddrinfo, ,
                 [AC_MSG_CHECKING([for getaddrinfo by including <netdb.h>])                  [AC_MSG_CHECKING([for getaddrinfo by including <netdb.h>])
                AC_TRY_LINK([#include <sys/types.h>                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
                 #include <sys/socket.h>                  #include <sys/socket.h>
                #include <netdb.h>],[getaddrinfo(NULL, NULL, NULL, NULL);],                #include <netdb.h>]], [[getaddrinfo(NULL, NULL, NULL, NULL);]])],[AC_MSG_RESULT([yes])
                        [AC_MSG_RESULT([yes]) 
                         AC_DEFINE(HAVE_GETADDRINFO, 1,                          AC_DEFINE(HAVE_GETADDRINFO, 1,
                                [Define to 1 if you have the "getaddrinfo" function and required types.])],                                [Define to 1 if you have the "getaddrinfo" function and required types.])],[AC_MSG_RESULT([no])
                        [AC_MSG_RESULT([no])                        AC_LIBOBJ([getaddrinfo])])])
                        AC_LIBOBJ(lib/getaddrinfo)])])    ],[AC_LIBOBJ([getaddrinfo])])
else 
        AC_LIBOBJ(lib/getaddrinfo) 
fi 
   
 AC_CHECK_MEMBER([struct sockaddr.sa_len],  AC_CHECK_MEMBER([struct sockaddr.sa_len],
                 [ AC_DEFINE(HAVE_SOCKADDR_LEN, 1, [Do we have sockaddr.sa_len?]) ],                  [ AC_DEFINE(HAVE_SOCKADDR_LEN, 1, [Do we have sockaddr.sa_len?]) ],
Line 573  AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod Line 597  AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod
     strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
     setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
     seteuid strerror putenv iconv_open locale_charset nl_langinfo getxattr \      seteuid strerror putenv iconv_open locale_charset nl_langinfo getxattr \
    extattr_get_link sigaction sigprocmask setattrlist \    extattr_get_link sigaction sigprocmask setattrlist getgrouplist \
    utimensat)    initgroups utimensat posix_fallocate attropen setvbuf usleep)
   
 dnl cygwin iconv.h defines iconv_open as libiconv_open  dnl cygwin iconv.h defines iconv_open as libiconv_open
 if test x"$ac_cv_func_iconv_open" != x"yes"; then  if test x"$ac_cv_func_iconv_open" != x"yes"; then
     AC_CHECK_FUNC(libiconv_open, [ac_cv_func_iconv_open=yes; AC_DEFINE(HAVE_ICONV_OPEN, 1)])      AC_CHECK_FUNC(libiconv_open, [ac_cv_func_iconv_open=yes; AC_DEFINE(HAVE_ICONV_OPEN, 1)])
 fi  fi
   
   dnl Preallocation stuff (also fallocate, posix_fallocate function tests above):
   
   AC_CACHE_CHECK([for useable fallocate],rsync_cv_have_fallocate,[
   AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <fcntl.h>
   #include <sys/types.h>]], [[fallocate(0, 0, 0, 0);]])],[rsync_cv_have_fallocate=yes],[rsync_cv_have_fallocate=no])])
   if test x"$rsync_cv_have_fallocate" = x"yes"; then
       AC_DEFINE(HAVE_FALLOCATE, 1, [Define to 1 if you have the fallocate function and it compiles and links without error])
   fi
   
   AC_CACHE_CHECK([for SYS_fallocate],rsync_cv_have_sys_fallocate,[
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/syscall.h>
   #include <sys/types.h>]], [[syscall(SYS_fallocate, 0, 0, (loff_t)0, (loff_t)0);]])],[rsync_cv_have_sys_fallocate=yes],[rsync_cv_have_sys_fallocate=no])])
   if test x"$rsync_cv_have_sys_fallocate" = x"yes"; then
       AC_DEFINE(HAVE_SYS_FALLOCATE, 1, [Define to 1 if you have the SYS_fallocate syscall number])
   fi
   
   if test x"$ac_cv_func_posix_fallocate" = x"yes"; then
       AC_MSG_CHECKING([whether posix_fallocate is efficient])
       case $host_os in
       *cygwin*)
           AC_MSG_RESULT(yes)
           AC_DEFINE(HAVE_EFFICIENT_POSIX_FALLOCATE, 1,
                     [Define if posix_fallocate is efficient (Cygwin)])
           ;;
       *)
           AC_MSG_RESULT(no)
           ;;
       esac
   fi
   
   dnl End of preallocation stuff
   
 AC_CHECK_FUNCS(getpgrp tcgetpgrp)  AC_CHECK_FUNCS(getpgrp tcgetpgrp)
 if test $ac_cv_func_getpgrp = yes; then  if test $ac_cv_func_getpgrp = yes; then
     AC_FUNC_GETPGRP      AC_FUNC_GETPGRP
 fi  fi
   
 AC_ARG_ENABLE(iconv-open,  AC_ARG_ENABLE(iconv-open,
    AC_HELP_STRING([--disable-iconv-open],    AS_HELP_STRING([--disable-iconv-open],[disable all use of iconv_open() function]),
            [disable all use of iconv_open() function]), 
     [], [enable_iconv_open=$ac_cv_func_iconv_open])      [], [enable_iconv_open=$ac_cv_func_iconv_open])
   
 if test x"$enable_iconv_open" != x"no"; then  if test x"$enable_iconv_open" != x"no"; then
Line 596  if test x"$enable_iconv_open" != x"no"; then Line 651  if test x"$enable_iconv_open" != x"no"; then
 fi  fi
   
 AC_ARG_ENABLE(iconv,  AC_ARG_ENABLE(iconv,
    AC_HELP_STRING([--disable-iconv],    AS_HELP_STRING([--disable-iconv],[disable rsync's --iconv option]),
            [disable rsync's --iconv option]), 
     [], [enable_iconv=$enable_iconv_open])      [], [enable_iconv=$enable_iconv_open])
 AH_TEMPLATE([ICONV_OPTION],  AH_TEMPLATE([ICONV_OPTION],
 [Define if you want the --iconv option.  Specifing a value will set the  [Define if you want the --iconv option.  Specifing a value will set the
Line 612  if test x"$enable_iconv" != x"no"; then Line 666  if test x"$enable_iconv" != x"no"; then
 fi  fi
   
 AC_CACHE_CHECK([whether chown() modifies symlinks],rsync_cv_chown_modifies_symlink,[  AC_CACHE_CHECK([whether chown() modifies symlinks],rsync_cv_chown_modifies_symlink,[
  AC_TRY_RUN([  AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #if HAVE_UNISTD_H  #if HAVE_UNISTD_H
 # include <unistd.h>  # include <unistd.h>
 #endif  #endif
Line 624  AC_CACHE_CHECK([whether chown() modifies symlinks],rsy Line 678  AC_CACHE_CHECK([whether chown() modifies symlinks],rsy
         if (symlink("conftest.no-such", dangling_symlink) < 0) abort();          if (symlink("conftest.no-such", dangling_symlink) < 0) abort();
         if (chown(dangling_symlink, getuid(), getgid()) < 0 && errno == ENOENT) exit(1);          if (chown(dangling_symlink, getuid(), getgid()) < 0 && errno == ENOENT) exit(1);
         exit(0);          exit(0);
    }],    }]])],[rsync_cv_chown_modifies_symlink=yes],[rsync_cv_chown_modifies_symlink=no],[rsync_cv_chown_modifies_symlink=no])])
  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  if test $rsync_cv_chown_modifies_symlink = yes; then
   AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, [Define to 1 if chown modifies symlinks.])    AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, [Define to 1 if chown modifies symlinks.])
 fi  fi
   
 AC_CACHE_CHECK([whether link() can hard-link symlinks],rsync_cv_can_hardlink_symlink,[  AC_CACHE_CHECK([whether link() can hard-link symlinks],rsync_cv_can_hardlink_symlink,[
  AC_TRY_RUN([  AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #if HAVE_UNISTD_H  #if HAVE_UNISTD_H
 # include <unistd.h>  # include <unistd.h>
 #endif  #endif
Line 641  AC_CACHE_CHECK([whether link() can hard-link symlinks] Line 694  AC_CACHE_CHECK([whether link() can hard-link symlinks]
     main() {      main() {
         unlink(FILENAME);          unlink(FILENAME);
         if (symlink("conftest.no-such", FILENAME) < 0) abort();          if (symlink("conftest.no-such", FILENAME) < 0) abort();
           unlink(FILENAME "2");
         if (link(FILENAME, FILENAME "2") < 0) exit(1);          if (link(FILENAME, FILENAME "2") < 0) exit(1);
         exit(0);          exit(0);
    }],    }]])],[rsync_cv_can_hardlink_symlink=yes],[rsync_cv_can_hardlink_symlink=no],[rsync_cv_can_hardlink_symlink=no])])
  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  if test $rsync_cv_can_hardlink_symlink = yes; then
   AC_DEFINE(CAN_HARDLINK_SYMLINK, 1, [Define to 1 if link() can hard-link symlinks.])    AC_DEFINE(CAN_HARDLINK_SYMLINK, 1, [Define to 1 if link() can hard-link symlinks.])
 fi  fi
   
 AC_CACHE_CHECK([whether link() can hard-link special files],rsync_cv_can_hardlink_special,[  AC_CACHE_CHECK([whether link() can hard-link special files],rsync_cv_can_hardlink_special,[
  AC_TRY_RUN([  AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #if HAVE_UNISTD_H  #if HAVE_UNISTD_H
 # include <unistd.h>  # include <unistd.h>
 #endif  #endif
Line 660  AC_CACHE_CHECK([whether link() can hard-link special f Line 713  AC_CACHE_CHECK([whether link() can hard-link special f
     main() {      main() {
         unlink(FILENAME);          unlink(FILENAME);
         if (mkfifo(FILENAME, 0777) < 0) abort();          if (mkfifo(FILENAME, 0777) < 0) abort();
           unlink(FILENAME "2");
         if (link(FILENAME, FILENAME "2") < 0) exit(1);          if (link(FILENAME, FILENAME "2") < 0) exit(1);
         exit(0);          exit(0);
    }],    }]])],[rsync_cv_can_hardlink_special=yes],[rsync_cv_can_hardlink_special=no],[rsync_cv_can_hardlink_special=no])])
  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  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.])      AC_DEFINE(CAN_HARDLINK_SPECIAL, 1, [Define to 1 if link() can hard-link special files.])
 fi  fi
   
 AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[  AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
AC_TRY_RUN([AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/socket.h>  #include <sys/socket.h>
   
 main() {  main() {
        int fd[2];         int fd[2];
 #ifdef __CYGWIN__  
        exit(1);  
 #else  
        exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1);         exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1);
#endif}]])],[rsync_cv_HAVE_SOCKETPAIR=yes],[rsync_cv_HAVE_SOCKETPAIR=no],[rsync_cv_HAVE_SOCKETPAIR=cross])])
}], 
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  if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then
     AC_DEFINE(HAVE_SOCKETPAIR, 1, [Define to 1 if you have the "socketpair" function])      AC_DEFINE(HAVE_SOCKETPAIR, 1, [Define to 1 if you have the "socketpair" function])
 fi  fi
   
   AC_REPLACE_FUNCS([getpass])
   
 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])      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
 fi  fi
Line 703  AC_MSG_CHECKING([whether to use included libpopt]) Line 753  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)      AC_MSG_RESULT($srcdir/popt)
     BUILD_POPT='$(popt_OBJS)'      BUILD_POPT='$(popt_OBJS)'
    CFLAGS="$CFLAGS -I$srcdir/popt"    CFLAGS="-I$srcdir/popt $CFLAGS"
     if test x"$ALLOCA" != x      if test x"$ALLOCA" != x
     then      then
         # this can be removed when/if we add an included alloca.c;          # this can be removed when/if we add an included alloca.c;
Line 714  else Line 764  else
     AC_MSG_RESULT(no)      AC_MSG_RESULT(no)
 fi  fi
   
   # We default to using our zlib unless --with-included-zlib=no is given.
   if test x"$with_included_zlib" != x"no"; then
       with_included_zlib=yes
   elif test x"$ac_cv_header_zlib_h" != x"yes"; then
       with_included_zlib=yes
   fi
   if test x"$with_included_zlib" != x"yes"; then
       AC_CHECK_LIB(z, deflateParams, , [with_included_zlib=yes])
   fi
   
   AC_MSG_CHECKING([whether to use included zlib])
   if test x"$with_included_zlib" = x"yes"; then
       AC_MSG_RESULT($srcdir/zlib)
       BUILD_ZLIB='$(zlib_OBJS)'
       CFLAGS="-I$srcdir/zlib $CFLAGS"
   else
       AC_DEFINE(EXTERNAL_ZLIB, 1, [Define to 1 if using external zlib])
       AC_MSG_RESULT(no)
   fi
   
 AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[  AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[
AC_TRY_COMPILE([],[signed char *s = ""],AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
rsync_cv_SIGNED_CHAR_OK=yes,rsync_cv_SIGNED_CHAR_OK=no)]) 
 if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then  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])      AC_DEFINE(SIGNED_CHAR_OK, 1, [Define to 1 if "signed char" is a valid type])
 fi  fi
   
 AC_CACHE_CHECK([for broken readdir],rsync_cv_HAVE_BROKEN_READDIR,[  AC_CACHE_CHECK([for broken readdir],rsync_cv_HAVE_BROKEN_READDIR,[
AC_TRY_RUN([#include <sys/types.h>AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
 #include <dirent.h>  #include <dirent.h>
 main() { struct dirent *di; DIR *d = opendir("."); di = readdir(d);  main() { struct dirent *di; DIR *d = opendir("."); di = readdir(d);
 if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&  if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
di->d_name[0] == 0) exit(0); exit(1);} ],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])])
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  if test x"$rsync_cv_HAVE_BROKEN_READDIR" = x"yes"; then
     AC_DEFINE(HAVE_BROKEN_READDIR, 1, [Define to 1 if readdir() is broken])      AC_DEFINE(HAVE_BROKEN_READDIR, 1, [Define to 1 if readdir() is broken])
 fi  fi
   
 AC_CACHE_CHECK([for utimbuf],rsync_cv_HAVE_STRUCT_UTIMBUF,[  AC_CACHE_CHECK([for utimbuf],rsync_cv_HAVE_STRUCT_UTIMBUF,[
AC_TRY_COMPILE([#include <sys/types.h>AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <utime.h>],#include <utime.h>]], [[struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));]])],[rsync_cv_HAVE_STRUCT_UTIMBUF=yes],[rsync_cv_HAVE_STRUCT_UTIMBUF=no])])
[struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));], 
rsync_cv_HAVE_STRUCT_UTIMBUF=yes,rsync_cv_HAVE_STRUCT_UTIMBUF=no)]) 
 if test x"$rsync_cv_HAVE_STRUCT_UTIMBUF" = x"yes"; then  if test x"$rsync_cv_HAVE_STRUCT_UTIMBUF" = x"yes"; then
     AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [Define to 1 if you have the "struct utimbuf" type])      AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [Define to 1 if you have the "struct utimbuf" type])
 fi  fi
   
 AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[  AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[
AC_TRY_COMPILE([#include <sys/time.h>AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>
#include <unistd.h>],#include <unistd.h>]], [[struct timeval tv; exit(gettimeofday(&tv, NULL));]])],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=no])])
[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  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])      AC_DEFINE(HAVE_GETTIMEOFDAY_TZ, 1, [Define to 1 if gettimeofday() takes a time-zone arg])
 fi  fi
   
 AC_CACHE_CHECK([for C99 vsnprintf],rsync_cv_HAVE_C99_VSNPRINTF,[  AC_CACHE_CHECK([for C99 vsnprintf],rsync_cv_HAVE_C99_VSNPRINTF,[
AC_TRY_RUN([AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>  #include <sys/types.h>
 #include <stdarg.h>  #include <stdarg.h>
 void foo(const char *format, ...) {  void foo(const char *format, ...) {
Line 769  void foo(const char *format, ...) { Line 833  void foo(const char *format, ...) {
        exit(0);         exit(0);
 }  }
 main() { foo("hello"); }  main() { foo("hello"); }
],]])],[rsync_cv_HAVE_C99_VSNPRINTF=yes],[rsync_cv_HAVE_C99_VSNPRINTF=no],[rsync_cv_HAVE_C99_VSNPRINTF=cross])])
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  if test x"$rsync_cv_HAVE_C99_VSNPRINTF" = x"yes"; then
     AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [Define to 1 if vsprintf has a C99-compatible return value])      AC_DEFINE(HAVE_C99_VSNPRINTF, 1, [Define to 1 if vsprintf has a C99-compatible return value])
 fi  fi
   
   
 AC_CACHE_CHECK([for secure mkstemp],rsync_cv_HAVE_SECURE_MKSTEMP,[  AC_CACHE_CHECK([for secure mkstemp],rsync_cv_HAVE_SECURE_MKSTEMP,[
AC_TRY_RUN([#include <stdlib.h>AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/stat.h>  #include <sys/stat.h>
 #include <unistd.h>  #include <unistd.h>
Line 790  main() { Line 853  main() {
   if (fstat(fd, &st) != 0) exit(1);    if (fstat(fd, &st) != 0) exit(1);
   if ((st.st_mode & 0777) != 0600) exit(1);    if ((st.st_mode & 0777) != 0600) exit(1);
   exit(0);    exit(0);
}],}]])],[rsync_cv_HAVE_SECURE_MKSTEMP=yes],[rsync_cv_HAVE_SECURE_MKSTEMP=no],[rsync_cv_HAVE_SECURE_MKSTEMP=cross])])
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  if test x"$rsync_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
     case $host_os in      case $host_os in
     hpux*)      hpux*)
Line 810  fi Line 870  fi
   
   
 AC_CACHE_CHECK([if mknod creates FIFOs],rsync_cv_MKNOD_CREATES_FIFOS,[  AC_CACHE_CHECK([if mknod creates FIFOs],rsync_cv_MKNOD_CREATES_FIFOS,[
AC_TRY_RUN([AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>  #include <stdio.h>
 #include <sys/stat.h>  #include <sys/stat.h>
 #include <errno.h>  #include <errno.h>
 main() { int rc, ec; char *fn = "fifo-test";  main() { int rc, ec; char *fn = "fifo-test";
 unlink(fn); rc = mknod(fn,S_IFIFO,0600); ec = errno; unlink(fn);  unlink(fn); rc = mknod(fn,S_IFIFO,0600); ec = errno; unlink(fn);
 if (rc) {printf("(%d %d) ",rc,ec); return ec;}  if (rc) {printf("(%d %d) ",rc,ec); return ec;}
return 0;}],return 0;}]])],[rsync_cv_MKNOD_CREATES_FIFOS=yes],[rsync_cv_MKNOD_CREATES_FIFOS=no],[rsync_cv_MKNOD_CREATES_FIFOS=cross])])
           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  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.])      AC_DEFINE(MKNOD_CREATES_FIFOS, 1, [Define to 1 if mknod() can create FIFOs.])
 fi  fi
   
 AC_CACHE_CHECK([if mknod creates sockets],rsync_cv_MKNOD_CREATES_SOCKETS,[  AC_CACHE_CHECK([if mknod creates sockets],rsync_cv_MKNOD_CREATES_SOCKETS,[
AC_TRY_RUN([AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>  #include <stdio.h>
 #include <sys/stat.h>  #include <sys/stat.h>
 #include <errno.h>  #include <errno.h>
 main() { int rc, ec; char *fn = "sock-test";  main() { int rc, ec; char *fn = "sock-test";
 unlink(fn); rc = mknod(fn,S_IFSOCK,0600); ec = errno; unlink(fn);  unlink(fn); rc = mknod(fn,S_IFSOCK,0600); ec = errno; unlink(fn);
 if (rc) {printf("(%d %d) ",rc,ec); return ec;}  if (rc) {printf("(%d %d) ",rc,ec); return ec;}
return 0;}],return 0;}]])],[rsync_cv_MKNOD_CREATES_SOCKETS=yes],[rsync_cv_MKNOD_CREATES_SOCKETS=no],[rsync_cv_MKNOD_CREATES_SOCKETS=cross])])
           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  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.])      AC_DEFINE(MKNOD_CREATES_SOCKETS, 1, [Define to 1 if mknod() can create sockets.])
 fi  fi
Line 867  AC_SUBST(OBJ_SAVE) Line 925  AC_SUBST(OBJ_SAVE)
 AC_SUBST(OBJ_RESTORE)  AC_SUBST(OBJ_RESTORE)
 AC_SUBST(CC_SHOBJ_FLAG)  AC_SUBST(CC_SHOBJ_FLAG)
 AC_SUBST(BUILD_POPT)  AC_SUBST(BUILD_POPT)
   AC_SUBST(BUILD_ZLIB)
 AC_SUBST(MAKE_MAN)  AC_SUBST(MAKE_MAN)
   
   AC_PATH_PROG([STUNNEL], [stunnel], [stunnel], [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
   AC_PATH_PROG([STUNNEL4], [stunnel4], [$STUNNEL], [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
   
 AC_CHECK_FUNCS(_acl __acl _facl __facl)  AC_CHECK_FUNCS(_acl __acl _facl __facl)
 #################################################  #################################################
 # check for ACL support  # check for ACL support
   
 AC_MSG_CHECKING([whether to support ACLs])  AC_MSG_CHECKING([whether to support ACLs])
 AC_ARG_ENABLE(acl-support,  AC_ARG_ENABLE(acl-support,
        AC_HELP_STRING([--disable-acl-support],        AS_HELP_STRING([--disable-acl-support],[disable ACL support]))
                       [disable ACL support])) 
   
 if test x"$enable_acl_support" = x"no"; then  if test x"$enable_acl_support" = x"no"; then
     AC_MSG_RESULT(no)      AC_MSG_RESULT(no)
Line 887  else Line 948  else
         AC_DEFINE(HAVE_UNIXWARE_ACLS, 1, [true if you have 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])          AC_DEFINE(SUPPORT_ACLS, 1, [Define to 1 to add support for ACLs])
         ;;          ;;
    *solaris*|*cygwin*)    solaris*|*cygwin*)
         AC_MSG_RESULT(Using solaris ACLs)          AC_MSG_RESULT(Using solaris ACLs)
         AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])          AC_DEFINE(HAVE_SOLARIS_ACLS, 1, [true if you have solaris ACLs])
         AC_DEFINE(SUPPORT_ACLS, 1)          AC_DEFINE(SUPPORT_ACLS, 1)
Line 921  else Line 982  else
     *)      *)
         AC_MSG_RESULT(running tests:)          AC_MSG_RESULT(running tests:)
         AC_CHECK_LIB(acl,acl_get_file)          AC_CHECK_LIB(acl,acl_get_file)
            AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[        AC_CACHE_CHECK([for ACL support],samba_cv_HAVE_POSIX_ACLS,[
            AC_TRY_LINK([#include <sys/types.h>            AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <sys/acl.h>],#include <sys/acl.h>]], [[ 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])])
[ 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)          AC_MSG_CHECKING(ACL test results)
         if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then          if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
             AC_MSG_RESULT(Using posix ACLs)              AC_MSG_RESULT(Using posix ACLs)
             AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])              AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
             AC_DEFINE(SUPPORT_ACLS, 1)              AC_DEFINE(SUPPORT_ACLS, 1)
             AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[              AC_CACHE_CHECK([for acl_get_perm_np],samba_cv_HAVE_ACL_GET_PERM_NP,[
                AC_TRY_LINK([#include <sys/types.h>                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <sys/acl.h>],#include <sys/acl.h>]], [[ 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])])
[ 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              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])                  AC_DEFINE(HAVE_ACL_GET_PERM_NP, 1, [true if you have acl_get_perm_np])
             fi              fi
Line 954  fi Line 1011  fi
 # check for extended attribute support  # check for extended attribute support
 AC_MSG_CHECKING(whether to support extended attributes)  AC_MSG_CHECKING(whether to support extended attributes)
 AC_ARG_ENABLE(xattr-support,  AC_ARG_ENABLE(xattr-support,
    AC_HELP_STRING([--disable-xattr-support],    AS_HELP_STRING([--disable-xattr-support],[disable extended attributes]),
            [disable extended attributes]),    [], [case "$ac_cv_func_getxattr$ac_cv_func_extattr_get_link$ac_cv_func_attropen" in
    [], [case "$ac_cv_func_getxattr$ac_cv_func_extattr_get_link" in 
         *yes*) enable_xattr_support=maybe ;;          *yes*) enable_xattr_support=maybe ;;
         *) enable_xattr_support=no ;;          *) enable_xattr_support=no ;;
         esac])          esac])
Line 966  if test x"$enable_xattr_support" = x"no"; then Line 1022  if test x"$enable_xattr_support" = x"no"; then
     AC_MSG_RESULT(no)      AC_MSG_RESULT(no)
 else  else
     case "$host_os" in      case "$host_os" in
    *linux*)    *linux*|*netbsd*)
         AC_MSG_RESULT(Using Linux xattrs)          AC_MSG_RESULT(Using Linux xattrs)
        AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])        AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs (or equivalent)])
         AC_DEFINE(SUPPORT_XATTRS, 1)          AC_DEFINE(SUPPORT_XATTRS, 1)
           AC_DEFINE(NO_SYMLINK_USER_XATTRS, 1, [True if symlinks do not support user xattrs])
           AC_CHECK_LIB(attr,getxattr)
         ;;          ;;
     darwin*)      darwin*)
         AC_MSG_RESULT(Using OS X xattrs)          AC_MSG_RESULT(Using OS X xattrs)
Line 984  else Line 1042  else
         AC_DEFINE(SUPPORT_XATTRS, 1)          AC_DEFINE(SUPPORT_XATTRS, 1)
         ;;          ;;
     solaris*)      solaris*)
        # Better Solaris support coming in 3.1.0...        AC_MSG_RESULT(Using Solaris xattrs)
         AC_DEFINE(HAVE_SOLARIS_XATTRS, 1, [True if you have Solaris xattrs])
         AC_DEFINE(SUPPORT_XATTRS, 1)
         AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs])          AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs])
         ;;          ;;
     *)      *)
Line 1001  if test x"$enable_acl_support" = x"no" -o x"$enable_xa Line 1061  if test x"$enable_acl_support" = x"no" -o x"$enable_xa
     AC_MSG_CHECKING([whether $CC supports -Wno-unused-parameter])      AC_MSG_CHECKING([whether $CC supports -Wno-unused-parameter])
     OLD_CFLAGS="$CFLAGS"      OLD_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -Wno-unused-parameter"      CFLAGS="$CFLAGS -Wno-unused-parameter"
    AC_TRY_LINK([#include <stdio.h>], [printf("hello\n");], [rsync_warn_flag=yes], [rsync_warn_flag=no])    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[printf("hello\n");]])],[rsync_warn_flag=yes],[rsync_warn_flag=no])
     AC_MSG_RESULT([$rsync_warn_flag])      AC_MSG_RESULT([$rsync_warn_flag])
     if test x"$rsync_warn_flag" = x"no"; then      if test x"$rsync_warn_flag" = x"no"; then
         CFLAGS="$OLD_CFLAGS"          CFLAGS="$OLD_CFLAGS"
Line 1020  AC_OUTPUT Line 1080  AC_OUTPUT
 AC_MSG_RESULT()  AC_MSG_RESULT()
 AC_MSG_RESULT([    rsync ${RSYNC_VERSION} configuration successful])  AC_MSG_RESULT([    rsync ${RSYNC_VERSION} configuration successful])
 AC_MSG_RESULT()  AC_MSG_RESULT()
   if test x$HAVE_YODL2MAN != x1; then
       AC_MSG_RESULT([    Note that yodl2man was not found, so pre-existing manpage files will be])
       AC_MSG_RESULT([    used w/o change (if available) -- no .yo file changes will be used.])
       AC_MSG_RESULT()
   fi

Removed from v.1.1  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>