X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=configure.ac;h=cfc0117f91e31323b270508e0af12a8d46dda360;hb=5183c0d6f0bf6786d5e9fa149d0d00f664533441;hp=b30eeb9335941bd783123fa2d70b34e40cbd3a86;hpb=512acd125e450b748cd2c8f6b02f8e01e0e3a70e;p=rsync.git diff --git a/configure.ac b/configure.ac index b30eeb93..cfc0117f 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,8 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \ netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h mcheck.h \ sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h dl.h \ popt.h popt/popt.h linux/falloc.h netinet/in_systm.h netgroup.h \ - zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h) + zlib.h xxhash.h openssl/md4.h openssl/md5.h zstd.h lz4.h sys/file.h \ + bsd/string.h) AC_CHECK_HEADERS([netinet/ip.h], [], [], [[#include ]]) AC_HEADER_MAJOR_FIXED @@ -22,7 +23,7 @@ AC_CONFIG_SRCDIR([byteorder.h]) AC_CONFIG_HEADER(config.h) AC_PREREQ([2.69]) -PACKAGE_VERSION=`sed 's/.*"\(.*\)".*/\1/' <$srcdir/version.h` +PACKAGE_VERSION=`sed -n 's/.*RSYNC_VERSION.*"\(.*\)".*/\1/p' <$srcdir/version.h` AC_MSG_NOTICE([Configuring rsync $PACKAGE_VERSION]) @@ -83,7 +84,7 @@ if test x"$enable_profile" = x"yes"; then CFLAGS="$CFLAGS -pg" fi -AC_MSG_CHECKING([if md2man can create man pages]) +AC_MSG_CHECKING([if md2man can create manpages]) if test x"$ac_cv_path_PYTHON3" = x; then AC_MSG_RESULT(no - python3 not found) md2man_works=no @@ -101,7 +102,7 @@ fi AC_MSG_CHECKING([if we require man-page building]) AC_ARG_ENABLE([md2man], - AS_HELP_STRING([--disable-md2man],[disable to omit man page creation])) + AS_HELP_STRING([--disable-md2man],[disable to omit manpage creation])) if test x"$enable_md2man" != x"no"; then if test -f "$srcdir/rsync.1"; then AC_MSG_RESULT(optional) @@ -109,7 +110,7 @@ if test x"$enable_md2man" != x"no"; then AC_MSG_RESULT(required) if test x"$md2man_works" = x"no"; then err_msg="$err_msg$nl- You need python3 and either the cmarkgfm OR commonmark python3 lib in order" - err_msg="$err_msg$nl to build man pages based on the git source (man pages are included in the" + err_msg="$err_msg$nl to build manpages based on the git source (manpages are included in the" err_msg="$err_msg$nl official release tar files)." no_lib="$no_lib md2man" fi @@ -117,7 +118,6 @@ if test x"$enable_md2man" != x"no"; then MAKE_MAN=man else AC_MSG_RESULT(no) - MAKE_MAN='' fi # Specifically, this turns on panic_action handling. @@ -137,9 +137,13 @@ if test x"$GCC" = x"yes"; then fi AC_ARG_WITH(rrsync, - AS_HELP_STRING([--with-rrsync],[also install the rrsync script and its man page])) + AS_HELP_STRING([--with-rrsync],[also install the rrsync script and its manpage])) if test x"$with_rrsync" != x"yes"; then with_rrsync=no +else + MAKE_RRSYNC='rrsync' + MAKE_RRSYNC_1='rrsync.1' + GEN_RRSYNC='rrsync.1 rrsync.1.html' fi AC_SUBST(with_rrsync) @@ -226,12 +230,12 @@ fi AC_DEFINE_UNQUOTED(NOBODY_USER, "$NOBODY_USER", [unprivileged user--e.g. nobody]) AC_DEFINE_UNQUOTED(NOBODY_GROUP, "$NOBODY_GROUP", [unprivileged group for unprivileged user]) -# SIMD optimizations -SIMD= +# rolling-checksum SIMD optimizations +ROLL_SIMD= -AC_MSG_CHECKING([whether to enable SIMD optimizations]) -AC_ARG_ENABLE(simd, - AS_HELP_STRING([--enable-simd],[enable/disable to control SIMD optimizations (requires c++)])) +AC_MSG_CHECKING([whether to enable rolling-checksum SIMD optimizations]) +AC_ARG_ENABLE(roll-simd, + AS_HELP_STRING([--enable-roll-simd],[enable/disable to control rolling-checksum SIMD optimizations (requires c++)])) # Clag is crashing with -g -O2, so we'll get rid of -g for now. CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'` @@ -260,14 +264,14 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len) } ]]) -if test x"$enable_simd" = x""; then +if test x"$enable_roll_simd" = x""; then case "$host_os" in *linux*) ;; - *) enable_simd=no ;; + *) enable_roll_simd=no ;; esac fi -if test x"$enable_simd" != x"no"; then +if test x"$enable_roll_simd" != x"no"; then # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required if test x"$host_cpu" = x"x86_64" || test x"$host_cpu" = x"amd64"; then AC_LANG(C++) @@ -280,23 +284,23 @@ if test x"$enable_simd" != x"no"; then AC_LANG(C) if test x"$CXX_OK" = x"yes"; then # AC_MSG_RESULT() is called below. - SIMD="$host_cpu" - elif test x"$enable_simd" = x"yes"; then + ROLL_SIMD="$host_cpu" + elif test x"$enable_roll_simd" = x"yes"; then AC_MSG_RESULT(error) - AC_MSG_ERROR(The SIMD compilation test failed. -Omit --enable-simd to continue without it.) + AC_MSG_ERROR(The rolling-checksum SIMD compilation test failed. +Omit --enable-roll-simd to continue without it.) fi - elif test x"$enable_simd" = x"yes"; then + elif test x"$enable_roll_simd" = x"yes"; then AC_MSG_RESULT(unavailable) - AC_MSG_ERROR(The SIMD optimizations are currently x86_64|amd64 only. -Omit --enable-simd to continue without it.) + AC_MSG_ERROR(The rolling-checksum SIMD optimizations are currently x86_64|amd64 only. +Omit --enable-roll-simd to continue without it.) fi fi -if test x"$SIMD" != x""; then - AC_MSG_RESULT([yes ($SIMD)]) - AC_DEFINE(HAVE_SIMD, 1, [Define to 1 to enable SIMD optimizations]) - SIMD='$(SIMD_'"$SIMD)" +if test x"$ROLL_SIMD" != x""; then + AC_MSG_RESULT([yes ($ROLL_SIMD)]) + AC_DEFINE(USE_ROLL_SIMD, 1, [Define to 1 to enable rolling-checksum SIMD optimizations]) + ROLL_SIMD='$(ROLL_SIMD_'"$ROLL_SIMD)" # We only use c++ for its target attribute dispatching, disable unneeded bulky features CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti" # Apple often has "g++" as a symlink for clang. Try to find out the truth. @@ -308,7 +312,7 @@ else AC_MSG_RESULT(no) fi -AC_SUBST(SIMD) +AC_SUBST(ROLL_SIMD) AC_MSG_CHECKING([if assembler accepts noexecstack]) OLD_CFLAGS="$CFLAGS" @@ -319,52 +323,19 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[return 0;]])], CFLAGS="$OLD_CFLAGS" AC_SUBST(NOEXECSTACK) -ASM= - -AC_MSG_CHECKING([whether to enable ASM optimizations]) -AC_ARG_ENABLE(asm, - AS_HELP_STRING([--enable-asm],[enable/disable to control ASM optimizations])) - -if test x"$enable_asm" = x""; then - case "$host_os" in - *linux*) ;; - *) enable_asm=no ;; - esac -fi - -if test x"$enable_asm" != x"no"; then - if test x"$host_cpu" = x"x86_64" || test x"$host_cpu" = x"amd64"; then - ASM="$host_cpu" - elif test x"$enable_asm" = x"yes"; then - AC_MSG_RESULT(unavailable) - AC_MSG_ERROR(The ASM optimizations are currently x86_64|amd64 only. -Omit --enable-asm to continue without it.) - fi -fi - -if test x"$ASM" != x""; then - AC_MSG_RESULT([yes ($ASM)]) - AC_DEFINE(HAVE_ASM, 1, [Define to 1 to enable ASM optimizations]) - ASM='$(ASM_'"$ASM)" -else - AC_MSG_RESULT(no) -fi - -AC_SUBST(ASM) - # 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_RUN_IFELSE([AC_LANG_SOURCE([[ #define _FILE_OFFSET_BITS 64 -#include -#include -#ifdef HAVE_SYS_TYPES_H -#include +$ac_includes_default +#ifdef HAVE_FCNTL_H +# include +#elif defined HAVE_SYS_FCNTL_H +# include #endif +#ifdef HAVE_SYS_WAIT_H #include -#if HAVE_UNISTD_H -#include #endif int main(void) @@ -409,7 +380,7 @@ AS_HELP_STRING([--disable-ipv6],[disable to omit ipv6 support]), ;; esac ], - AC_TRY_RUN([ /* AF_INET6 avalable check */ + AC_TRY_RUN([ /* AF_INET6 availability check */ #include #include #include @@ -454,7 +425,8 @@ if test x"$enable_openssl" != x"no"; then if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then AC_MSG_RESULT(yes) AC_SEARCH_LIBS(MD5_Init, crypto, - [AC_DEFINE(USE_OPENSSL)], + [AC_DEFINE(USE_OPENSSL) + enable_openssl=yes], [err_msg="$err_msg$nl- Failed to find MD5_Init function in openssl crypto lib."; no_lib="$no_lib openssl"]) else @@ -462,10 +434,67 @@ if test x"$enable_openssl" != x"no"; then err_msg="$err_msg$nl- Failed to find openssl/md4.h and openssl/md5.h for openssl crypto lib support." no_lib="$no_lib openssl" fi + if test x"$enable_md5_asm" != x"yes"; then + enable_md5_asm=no + fi else AC_MSG_RESULT(no) fi +MD5_ASM= + +AC_MSG_CHECKING([whether to enable MD5 ASM optimizations]) +AC_ARG_ENABLE(md5-asm, + AS_HELP_STRING([--enable-md5-asm],[enable/disable to control MD5 ASM optimizations])) + +if test x"$enable_md5_asm" = x""; then + case "$host_os" in + *linux*) ;; + *) enable_md5_asm=no ;; + esac +fi + +if test x"$enable_md5_asm" != x"no"; then + if test x"$host_cpu" = x"x86_64" || test x"$host_cpu" = x"amd64"; then + MD5_ASM="$host_cpu" + elif test x"$enable_md5_asm" = x"yes"; then + AC_MSG_RESULT(unavailable) + AC_MSG_ERROR(The ASM optimizations are currently x86_64|amd64 only. +Omit --enable-md5-asm to continue without it.) + fi +fi + +if test x"$MD5_ASM" != x""; then + AC_MSG_RESULT([yes ($MD5_ASM)]) + AC_DEFINE(USE_MD5_ASM, 1, [Define to 1 to enable MD5 ASM optimizations]) + MD5_ASM='$(MD5_ASM_'"$MD5_ASM)" +else + AC_MSG_RESULT(no) +fi + +AC_SUBST(MD5_ASM) + +ROLL_ASM= + +AC_MSG_CHECKING([whether to enable rolling-checksum ASM optimizations]) +AC_ARG_ENABLE(roll-asm, + AS_HELP_STRING([--enable-roll-asm],[enable/disable to control rolling-checksum ASM optimizations (requires --enable-roll-simd)])) + +if test x"$ROLL_SIMD" = x""; then + enable_roll_asm=no +fi + +if test x"$enable_roll_asm" = x"yes"; then + ROLL_ASM="$host_cpu" + AC_MSG_RESULT([yes ($ROLL_ASM)]) + AC_DEFINE(USE_ROLL_ASM, 1, [Define to 1 to enable rolling-checksum ASM optimizations (requires --enable-roll-simd)]) + ROLL_ASM='$(ROLL_ASM_'"$ROLL_ASM)" +else + AC_MSG_RESULT(no) +fi + +AC_SUBST(ROLL_ASM) + AC_MSG_CHECKING([whether to enable xxhash checksum support]) AC_ARG_ENABLE([xxhash], AS_HELP_STRING([--disable-xxhash],[disable to omit xxhash checksums])) @@ -535,7 +564,7 @@ if test x"$no_lib" != x; then echo "$err_msg" echo "" echo "See the INSTALL file for hints on how to install the missing libraries and/or" - echo "how to generate (or fetch) man pages:" + echo "how to generate (or fetch) manpages:" echo " https://github.com/WayneD/rsync/blob/master/INSTALL.md" echo "" echo "To disable one or more features, the relevant configure options are:" @@ -596,7 +625,11 @@ fi AC_TYPE_UID_T AC_CHECK_TYPES([mode_t,off_t,size_t,pid_t,id_t]) -AC_TYPE_GETGROUPS +if test "$cross_compiling" = no; then + AC_TYPE_GETGROUPS +else + AC_DEFINE([GETGROUPS_T],[gid_t],[Define to the type of elements in the array set by `getgroups'. Usually this is either `int' or `gid_t'.]) +fi AC_CHECK_MEMBERS([struct stat.st_rdev, struct stat.st_mtimensec, struct stat.st_mtimespec.tv_nsec, @@ -1038,21 +1071,6 @@ elif test x"$ac_cv_header_popt_h" != x"yes"; then with_included_popt=yes fi -if test x"$GCC" = x"yes"; then - if test x"$with_included_popt" != x"yes"; then - # Turn pedantic warnings into errors to ensure an array-init overflow is an error. - CFLAGS="$CFLAGS -pedantic-errors" - else - # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to - # turn off pedantic warnings (which will not lose the error for array-init overflow). - # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists - # -Wpedantic and use that as a flag. - case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in - *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; - esac - fi -fi - AC_MSG_CHECKING([whether to use included libpopt]) if test x"$with_included_popt" = x"yes"; then AC_MSG_RESULT($srcdir/popt) @@ -1089,7 +1107,7 @@ else fi AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[ -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = ""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[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 @@ -1253,6 +1271,9 @@ AC_SUBST(OBJ_RESTORE) AC_SUBST(CC_SHOBJ_FLAG) AC_SUBST(BUILD_POPT) AC_SUBST(BUILD_ZLIB) +AC_SUBST(MAKE_RRSYNC) +AC_SUBST(MAKE_RRSYNC_1) +AC_SUBST(GEN_RRSYNC) AC_SUBST(MAKE_MAN) AC_CHECK_FUNCS(_acl __acl _facl __facl)