X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/cbb95d3d2482367b55344d80dd4b5b28169ce215..da564b51a16259cfc22123ee5134fd7e6398ca1e:/configure.in diff --git a/configure.in b/configure.in index a9f6b96d..7dd970ee 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h]) AC_CONFIG_HEADER(config.h) AC_PREREQ(2.59) -RSYNC_VERSION=2.6.9pre3 +RSYNC_VERSION=3.0.0pre1 AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -38,7 +38,7 @@ fi AC_MSG_CHECKING([whether to include debugging symbols]) AC_ARG_ENABLE(debug, AC_HELP_STRING([--disable-debug], - [turn off debugging symbols and features])) + [disable debugging symbols and features])) if test x"$enable_debug" = x"no"; then AC_MSG_RESULT(no) @@ -283,7 +283,7 @@ fi dnl Do you want to disable use of locale functions AC_ARG_ENABLE([locale], AC_HELP_STRING([--disable-locale], - [turn off locale features])) + [disable 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 @@ -339,8 +339,14 @@ 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_CHECK_SIZEOF(time_t) AC_C_INLINE AC_C_LONG_DOUBLE @@ -405,6 +411,28 @@ AC_SEARCH_LIBS(inet_ntop, resolv) # 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)]) @@ -515,6 +543,11 @@ 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. @@ -527,14 +560,30 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \ 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) + strerror putenv iconv_open locale_charset nl_langinfo getxattr \ + extattr_get_link sigaction sigprocmask) AC_CHECK_FUNCS(getpgrp tcgetpgrp) if test $ac_cv_func_getpgrp = yes; then AC_FUNC_GETPGRP fi +AC_ARG_ENABLE(iconv, + AC_HELP_STRING([--disable-iconv], + [disable rsync's --iconv option]), + [], [enable_iconv=$ac_cv_func_iconv_open]) +AH_TEMPLATE([ICONV_OPTION], +[Define if you want the --iconv option. Specifing a value will set the +default iconv setting (a NULL means no --iconv processing by default).]) +if test x"$enable_iconv" != x"no"; then + if test x"$enable_iconv" = x"yes"; then + AC_DEFINE(ICONV_OPTION, NULL) + else + AC_DEFINE_UNQUOTED(ICONV_OPTION, "$enable_iconv") + fi + AC_DEFINE(UTF8_CHARSET, "UTF-8", [String to pass to iconv() for the UTF-8 charset.]) +fi + AC_CACHE_CHECK([whether chown() modifies symlinks],rsync_cv_chown_modifies_symlink,[ AC_TRY_RUN([ #if HAVE_UNISTD_H @@ -779,6 +828,133 @@ 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], + [disable 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(Using OS X ACLs) + AC_DEFINE(HAVE_OSX_ACLS, 1, [true if you have Mac OS X ACLs]) + AC_DEFINE(SUPPORT_ACLS, 1) + ;; + *) + 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], + [disable extended attributes]), + [], [case "$ac_cv_func_getxattr$ac_cv_func_extattr_get_link" in + *yes*) enable_xattr_support=maybe ;; + *) enable_xattr_support=no ;; + esac]) +AH_TEMPLATE([SUPPORT_XATTRS], +[Define to 1 to add support for extended attributes]) +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) + ;; + 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