[BACK]Return to configure.ac CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync

Diff for /embedaddon/rsync/configure.ac between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/17 15:09:30 version 1.1.1.2, 2013/10/14 07:51:14
Line 5  AC_CONFIG_SRCDIR([byteorder.h]) Line 5  AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)  AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.59)  AC_PREREQ(2.59)
   
RSYNC_VERSION=3.0.9RSYNC_VERSION=3.1.0
 AC_SUBST(RSYNC_VERSION)  AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])  AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
   
Line 39  AC_PROG_CC Line 39  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)
   
Line 78  fi Line 79  fi
 AC_ARG_WITH(included-popt,  AC_ARG_WITH(included-popt,
         AC_HELP_STRING([--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(included-zlib,
           AC_HELP_STRING([--with-included-zlib], [use bundled zlib library, not from system]))
   
   AC_ARG_WITH(protected-args,
           AC_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)]),          AC_HELP_STRING([--with-rsync-path=PATH], [set default --rsync-path to PATH (default: rsync)]),
         [ RSYNC_PATH="$with_rsync_path" ],          [ RSYNC_PATH="$with_rsync_path" ],
Line 124  AC_DEFINE_UNQUOTED(RSYNC_RSH, "$RSYNC_RSH", [default - Line 134  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],      AC_HELP_STRING([--with-nobody-group=GROUP],
                    [set the default unprivileged group (default nobody or nogroup)]),                     [set the default unprivileged group (default nobody or nogroup)]),
Line 331  AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/ Line 347  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,[
Line 379  AC_TYPE_SIGNAL Line 396  AC_TYPE_SIGNAL
 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
   
Line 573  AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod Line 601  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)
   
 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_TRY_LINK([#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_TRY_COMPILE([#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
Line 686  if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then Line 750  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_CHECK_FUNCS(getpass, , [AC_LIBOBJ(lib/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 714  else Line 780  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="$CFLAGS -I$srcdir/zlib"
   else
       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_TRY_COMPILE([],[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)])
Line 867  AC_SUBST(OBJ_SAVE) Line 952  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
Line 887  else Line 976  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 956  AC_MSG_CHECKING(whether to support extended attributes Line 1045  AC_MSG_CHECKING(whether to support extended attributes
 AC_ARG_ENABLE(xattr-support,  AC_ARG_ENABLE(xattr-support,
     AC_HELP_STRING([--disable-xattr-support],      AC_HELP_STRING([--disable-xattr-support],
             [disable extended attributes]),              [disable extended attributes]),
    [], [case "$ac_cv_func_getxattr$ac_cv_func_extattr_get_link" in    [], [case "$ac_cv_func_getxattr$ac_cv_func_extattr_get_link$ac_cv_func_attropen" in
         *yes*) enable_xattr_support=maybe ;;          *yes*) enable_xattr_support=maybe ;;
         *) enable_xattr_support=no ;;          *) enable_xattr_support=no ;;
         esac])          esac])
Line 970  else Line 1059  else
         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])
         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])
         ;;          ;;
     darwin*)      darwin*)
         AC_MSG_RESULT(Using OS X xattrs)          AC_MSG_RESULT(Using OS X xattrs)
Line 984  else Line 1074  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])
         ;;          ;;
     *)      *)
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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