X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0d2aa5d9d7773bcd947718429a37812c6afc4f50..bec617b934dc2ef90b7acd1c7ef4b5db74821e91:/configure.in diff --git a/configure.in b/configure.in index b45f9bbd..d3283421 100644 --- a/configure.in +++ b/configure.in @@ -3,9 +3,9 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT() AC_CONFIG_SRCDIR([byteorder.h]) AC_CONFIG_HEADER(config.h) -AC_PREREQ(2.52) +AC_PREREQ(2.59) -RSYNC_VERSION=2.6.4cvs +RSYNC_VERSION=2.6.6pre1 AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -54,10 +54,8 @@ else fi - - AC_ARG_ENABLE(profile, - AC_HELP_STRING([--enable-profile], + AC_HELP_STRING([--enable-profile], [turn on CPU profiling (default no)], [], [])) if test x"$enable_profile" = xyes @@ -68,7 +66,7 @@ fi # Specifically, this turns on panic_action handling. AC_ARG_ENABLE(maintainer-mode, - AC_HELP_STRING([--enable-maintainer-mode], + AC_HELP_STRING([--enable-maintainer-mode], [turn on extra debug features], [], [])) if test x"$enable_maintainer_mode" = xyes @@ -122,7 +120,9 @@ AC_ARG_WITH(rsh, AC_HELP_STRING([--with-rsh=CMD], [set remote shell command to CMD (default: ssh)])) AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0) -AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH, [remote shell is remsh not rsh]) +if test x$HAVE_REMSH = x1; then + AC_DEFINE(HAVE_REMSH, 1, [Define to 1 if remote shell is remsh, not rsh]) +fi if test x"$with_rsh" != x then @@ -130,9 +130,20 @@ then else RSYNC_RSH="ssh" fi - AC_DEFINE_UNQUOTED(RSYNC_RSH, "$RSYNC_RSH", [default -e command]) +AC_MSG_CHECKING([the group for user "nobody"]) +if grep '^nobody:' /etc/group >/dev/null 2>&1; then + NOBODY_GROUP=nobody +elif grep '^nogroup:' /etc/group >/dev/null 2>&1; then + NOBODY_GROUP=nogroup +else + NOBODY_GROUP=nobody # test for others? +fi +AC_MSG_RESULT($NOBODY_GROUP) +AC_DEFINE_UNQUOTED(NOBODY_USER, "nobody", [unprivileged user--e.g. nobody]) +AC_DEFINE_UNQUOTED(NOBODY_GROUP, "$NOBODY_GROUP", [unprivileged group for unprivileged user]) + # arrgh. libc in the current debian stable screws up the largefile # stuff, getting byte range locking wrong AC_CACHE_CHECK([for broken largefile support],rsync_cv_HAVE_BROKEN_LARGEFILE,[ @@ -181,6 +192,17 @@ ipv6trylibc=yes AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--disable-ipv6], [don't even try to use IPv6])) +dnl Do you want to disable use of locale functions +AH_TEMPLATE([CONFIG_LOCALE], +[Undefine if you don't want locale features. By default this is defined.]) +AC_ARG_ENABLE([locale], + AC_HELP_STRING([--disable-locale], [turn off locale features]), +[if test x$enableval = xyes; then + AC_DEFINE(CONFIG_LOCALE) +fi], +AC_DEFINE(CONFIG_LOCALE) +) + if test "x$enable_ipv6" != xno then AC_MSG_CHECKING([ipv6 stack type]) @@ -287,15 +309,19 @@ 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 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 \ + sys/un.h glob.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \ netdb.h malloc.h float.h) AC_HEADER_MAJOR AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(off_t) +AC_CHECK_SIZEOF(off64_t) AC_C_INLINE +AC_C_LONG_DOUBLE AC_TYPE_SIGNAL AC_TYPE_UID_T @@ -306,7 +332,6 @@ AC_TYPE_PID_T AC_TYPE_GETGROUPS AC_CHECK_MEMBERS([struct stat.st_rdev]) -AC_CHECK_TYPE([ino_t], [unsigned]) TYPE_SOCKLEN_T AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [ @@ -436,6 +461,27 @@ AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id], #include ]) +AC_MSG_CHECKING(struct stat64) +AC_TRY_COMPILE([#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +],[struct stat64 st;], + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_STRUCT_STAT64,1,[Define to 1 if you have struct stat64.]), + AC_MSG_RESULT(no)) + # if we can't find strcasecmp, look in -lresolv (for Unixware at least) # AC_CHECK_FUNCS(strcasecmp) @@ -450,11 +496,12 @@ dnl AC_FUNC_MEMCMP AC_FUNC_UTIME_NULL AC_FUNC_ALLOCA -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 \ +AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \ + fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \ + memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \ strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \ - open64 mkstemp64) + setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \ + strerror putenv) AC_CHECK_FUNCS(getpgrp tcgetpgrp) if test $ac_cv_func_getpgrp = yes; then @@ -516,25 +563,6 @@ else AC_MSG_RESULT(no) fi -AC_CACHE_CHECK([for long long],rsync_cv_HAVE_LONGLONG,[ -if test x"$GCC" = x"yes"; then - rsync_cv_HAVE_LONGLONG=yes -else - AC_TRY_COMPILE(,[long long i;], - rsync_cv_HAVE_LONGLONG=yes,rsync_cv_HAVE_LONGLONG=no) -fi]) -if test x"$rsync_cv_HAVE_LONGLONG" = x"yes"; then - AC_DEFINE(HAVE_LONGLONG, 1, [Define to 1 if you have the "long long" type]) -fi - -AC_CACHE_CHECK([for off64_t],rsync_cv_HAVE_OFF64_T,[ -AC_TRY_COMPILE([#include -#include ],[off64_t s;], -rsync_cv_HAVE_OFF64_T=yes,rsync_cv_HAVE_OFF64_T=no)]) -if test x"$rsync_cv_HAVE_OFF64_T" = x"yes"; then - AC_DEFINE(HAVE_OFF64_T, 1, [Define to 1 if you have the off64_t type]) -fi - AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[ AC_TRY_COMPILE([],[signed char *s = ""], rsync_cv_SIGNED_CHAR_OK=yes,rsync_cv_SIGNED_CHAR_OK=no)]) @@ -616,7 +644,17 @@ 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 - AC_DEFINE(HAVE_SECURE_MKSTEMP, 1, [Define to 1 if mkstemp() is available and works right]) + case $target_os in + hpux*) + dnl HP-UX has a broken mkstemp() implementation they refuse to fix, + dnl so we noisily skip using it. See HP change request JAGaf34426 + dnl for details. (sbonds) + AC_MSG_WARN(Skipping broken HP-UX mkstemp() -- using mktemp() instead) + ;; + *) + AC_DEFINE(HAVE_SECURE_MKSTEMP, 1, [Define to 1 if mkstemp() is available and works right]) + ;; + esac fi @@ -711,21 +749,6 @@ AC_SUBST(BUILD_POPT) AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT -if test x"$with_rsh" = x; then - if test x"$HAVE_REMSH" = x1; then - rmsh1='remsh:' - rmsh2='=remsh' - else - rmsh1='rsh: ' - rmsh2='=rsh ' - fi - AC_MSG_RESULT() - AC_MSG_RESULT([ **********************************************************************]) - AC_MSG_RESULT([ * As of v2.6.0, the default remote shell is ssh instead of rsh!! *]) - AC_MSG_RESULT([ * To use previous default of $rmsh1 ./configure --with-rsh$rmsh2 *]) - AC_MSG_RESULT([ **********************************************************************]) -fi - AC_MSG_RESULT() AC_MSG_RESULT([ rsync ${RSYNC_VERSION} configuration successful]) AC_MSG_RESULT()