X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/49ea69b3ffb96853c3c08eb857f9b8c736cb870d..7f367bb1b4348ba1edb863ee13f8281471785e09:/configure.in diff --git a/configure.in b/configure.in index bc87ee50..bc7d4a7f 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=3.0.0cvs +RSYNC_VERSION=3.1.0dev AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -13,22 +13,7 @@ AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version]) LDFLAGS=${LDFLAGS-""} -AC_CANONICAL_TARGET([]) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_CPP -AC_PROG_EGREP -AC_PROG_INSTALL -AC_PROG_CC_STDC -AC_SUBST(SHELL) - -AC_DEFINE([_GNU_SOURCE], 1, - [Define _GNU_SOURCE so that we get all necessary prototypes]) - -if test x"$ac_cv_prog_cc_stdc" = x"no"; then - AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one]) -fi +AC_CANONICAL_HOST # We must decide this before testing the compiler. @@ -42,14 +27,27 @@ AC_ARG_ENABLE(debug, if test x"$enable_debug" = x"no"; then AC_MSG_RESULT(no) - CFLAGS=${CFLAGS-"-O"} + ac_cv_prog_cc_g=no else AC_MSG_RESULT([yes]) - # leave CFLAGS alone; AC_PROG_CC will try to include -g if it can dnl AC_DEFINE(DEBUG, 1, [Define to turn on debugging code that may slow normal operation]) - dnl CFLAGS=${CFLAGS-"-g"} + # leave ac_cv_prog_cc_g alone; AC_PROG_CC will try to include -g if it can fi +dnl Checks for programs. +AC_PROG_CC +AC_PROG_CPP +AC_PROG_EGREP +AC_PROG_INSTALL +AC_PROG_CC_STDC +AC_SUBST(SHELL) + +AC_DEFINE([_GNU_SOURCE], 1, + [Define _GNU_SOURCE so that we get all necessary prototypes]) + +if test x"$ac_cv_prog_cc_stdc" = x"no"; then + AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one]) +fi AC_ARG_ENABLE(profile, AC_HELP_STRING([--enable-profile], @@ -123,6 +121,11 @@ else fi AC_DEFINE_UNQUOTED(RSYNC_RSH, "$RSYNC_RSH", [default -e command]) +AC_CHECK_PROG(HAVE_YODL2MAN, yodl2man, 1, 0) +if test x$HAVE_YODL2MAN = x1; then + MAKE_MAN=man +fi + AC_ARG_WITH(nobody-group, AC_HELP_STRING([--with-nobody-group=GROUP], [set the default unprivileged group (default nobody or nogroup)]), @@ -306,8 +309,10 @@ 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 locale.h \ - netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.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 \ + sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \ + popt.h popt/popt.h) AC_HEADER_MAJOR AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[ @@ -353,10 +358,7 @@ AC_C_LONG_DOUBLE AC_TYPE_SIGNAL AC_TYPE_UID_T -AC_TYPE_MODE_T -AC_TYPE_OFF_T -AC_TYPE_SIZE_T -AC_TYPE_PID_T +AC_CHECK_TYPES([mode_t,off_t,size_t,pid_t,id_t]) AC_TYPE_GETGROUPS AC_CHECK_MEMBERS([struct stat.st_rdev]) @@ -438,6 +440,10 @@ dnl AC_MSG_NOTICE([Looking in libraries: $LIBS]) AC_CHECK_FUNCS(inet_ntop, , [AC_LIBOBJ(lib/inet_ntop)]) AC_CHECK_FUNCS(inet_pton, , [AC_LIBOBJ(lib/inet_pton)]) +AC_HAVE_TYPE([struct addrinfo], [#include ]) +AC_HAVE_TYPE([struct sockaddr_storage], [#include +#include ]) + # Irix 6.5 has getaddrinfo but not the corresponding defines, so use # builtin getaddrinfo if one of the defines don't exist AC_CACHE_CHECK([whether defines needed by getaddrinfo exist], @@ -451,7 +457,7 @@ AC_CACHE_CHECK([whether defines needed by getaddrinfo exist], #endif], rsync_cv_HAVE_GETADDR_DEFINES=yes, rsync_cv_HAVE_GETADDR_DEFINES=no)]) -if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes"; then +if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes" -a x"$ac_cv_type_struct_addrinfo" = x"yes"; then # Tru64 UNIX has getaddrinfo() but has it renamed in libc as # something else so we must include to get the # redefinition. @@ -462,13 +468,11 @@ if test x"$rsync_cv_HAVE_GETADDR_DEFINES" = x"yes"; then #include ],[getaddrinfo(NULL, NULL, NULL, NULL);], [AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_GETADDRINFO, 1, - [Define to 1 if you have the "getaddrinfo" function.])], + [Define to 1 if you have the "getaddrinfo" function and required types.])], [AC_MSG_RESULT([no]) AC_LIBOBJ(lib/getaddrinfo)])]) - AC_CHECK_FUNCS(getnameinfo, , [AC_LIBOBJ(lib/getnameinfo)]) else AC_LIBOBJ(lib/getaddrinfo) - AC_LIBOBJ(lib/getnameinfo) fi AC_CHECK_MEMBER([struct sockaddr.sa_len], @@ -497,15 +501,6 @@ AC_CHECK_MEMBER([struct sockaddr_un.sun_len], #include ]) -AC_MSG_CHECKING(struct sockaddr_storage) -AC_TRY_COMPILE([#include -#include ], -[struct sockaddr_storage x;], - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, - [Define to 1 if you have struct sockaddr_storage.] ), - AC_MSG_RESULT(no)) - AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id], [ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID, 1, [Do we have sockaddr_in6.sin6_scope_id?]) ], [], @@ -515,8 +510,7 @@ AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id], #include ]) -AC_MSG_CHECKING(struct stat64) -AC_TRY_COMPILE([#include +AC_HAVE_TYPE([struct stat64], [#include #if HAVE_SYS_TYPES_H # include #endif @@ -531,10 +525,7 @@ AC_TRY_COMPILE([#include # 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) # @@ -557,21 +548,36 @@ AC_FUNC_UTIME_NULL AC_FUNC_ALLOCA 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 \ + memmove lchown vsnprintf snprintf vasprintf asprintf setsid 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 getxattr \ - extattr_get_link sigaction sigprocmask) + extattr_get_link sigaction sigprocmask setattrlist getgrouplist \ + initgroups) + +dnl cygwin iconv.h defines iconv_open as libiconv_open +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)]) +fi AC_CHECK_FUNCS(getpgrp tcgetpgrp) if test $ac_cv_func_getpgrp = yes; then AC_FUNC_GETPGRP fi +AC_ARG_ENABLE(iconv-open, + AC_HELP_STRING([--disable-iconv-open], + [disable all use of iconv_open() function]), + [], [enable_iconv_open=$ac_cv_func_iconv_open]) + +if test x"$enable_iconv_open" != x"no"; then + AC_DEFINE(USE_ICONV_OPEN, 1, [Define to 1 if you want rsync to make use of iconv_open()]) +fi + AC_ARG_ENABLE(iconv, AC_HELP_STRING([--disable-iconv], [disable rsync's --iconv option]), - [], [enable_iconv=$ac_cv_func_iconv_open]) + [], [enable_iconv=$enable_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).]) @@ -658,6 +664,15 @@ fi if test x"$with_included_popt" != x"yes"; then AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) fi +if test x"$ac_cv_header_popt_popt_h" = x"yes"; then + # If the system has /usr/include/popt/popt.h, we enable the + # included popt because an attempt to "#include " + # would use our included header file anyway (due to -I.), and + # might conflict with the system popt. + with_included_popt=yes +elif test x"$ac_cv_header_popt_h" != x"yes"; then + with_included_popt=yes +fi AC_MSG_CHECKING([whether to use included libpopt]) if test x"$with_included_popt" = x"yes"; then @@ -692,13 +707,13 @@ if test x"$rsync_cv_HAVE_BROKEN_READDIR" = x"yes"; then AC_DEFINE(HAVE_BROKEN_READDIR, 1, [Define to 1 if readdir() is broken]) fi -AC_CACHE_CHECK([for utimbuf],rsync_cv_HAVE_UTIMBUF,[ +AC_CACHE_CHECK([for utimbuf],rsync_cv_HAVE_STRUCT_UTIMBUF,[ AC_TRY_COMPILE([#include #include ], [struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));], -rsync_cv_HAVE_UTIMBUF=yes,rsync_cv_HAVE_UTIMBUF=no)]) -if test x"$rsync_cv_HAVE_UTIMBUF" = x"yes"; then - AC_DEFINE(HAVE_UTIMBUF, 1, [Define to 1 if you have the "struct utimbuf" type]) +rsync_cv_HAVE_STRUCT_UTIMBUF=yes,rsync_cv_HAVE_STRUCT_UTIMBUF=no)]) +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]) fi AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[ @@ -755,7 +770,7 @@ 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 - case $target_os in + case $host_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 @@ -827,8 +842,8 @@ AC_SUBST(OBJ_SAVE) AC_SUBST(OBJ_RESTORE) AC_SUBST(CC_SHOBJ_FLAG) AC_SUBST(BUILD_POPT) +AC_SUBST(MAKE_MAN) -AC_CHECK_HEADERS(sys/acl.h acl/libacl.h) AC_CHECK_FUNCS(_acl __acl _facl __facl) ################################################# # check for ACL support @@ -910,10 +925,6 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_cv_HAVE_ACL_GET_PERM_NP=no)]) 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) @@ -955,6 +966,23 @@ else esac fi +if test x"$enable_acl_support" = x"no" -o x"$enable_xattr_support" = x"no" -o x"$enable_iconv" = x"no"; then + AC_MSG_CHECKING([whether $CC supports -Wno-unused-parameter]) + OLD_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wno-unused-parameter" + AC_COMPILE_IFELSE([ ], [rsync_warn_flag=yes], [rsync_warn_flag=no]) + AC_MSG_RESULT([$rsync_warn_flag]) + if test x"$rsync_warn_flag" = x"no"; then + CFLAGS="$OLD_CFLAGS" + fi +fi + +case "$CC" in +' checker'*|checker*) + AC_DEFINE(FORCE_FD_ZERO_MEMSET, 1, [Used to make "checker" understand that FD_ZERO() clears memory.]) + ;; +esac + AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT