X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/79fc6bdb4501ad9fc1e7b2b5350edab5c6d7fc46..41bd28fee315c7b1d61c04dbe6441afba4d0b789:/configure.in diff --git a/configure.in b/configure.in index 6c411d63..1adfe9e8 100644 --- a/configure.in +++ b/configure.in @@ -1,13 +1,50 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(byteorder.h) AC_CONFIG_HEADER(config.h) +AC_PREREQ(2.12) -# compile with optimisation and without debugging by default -CFLAGS=${CFLAGS-"-O"} +LDFLAGS=${LDFLAGS-""} AC_CANONICAL_SYSTEM AC_VALIDATE_CACHE_SYSTEM_TYPE +# compile with optimisation and without debugging by default, unless +# --debug is given. We must decide this before testing the compiler. + +AC_ARG_ENABLE(debug, + [ --enable-debug including debugging symbols and features]) + +AC_MSG_CHECKING([whether to include debugging symbols]) +if test x"$enable_debug" = x"yes" +then + AC_MSG_RESULT(yes) + # leave CFLAGS alone; AC_PROG_CC will try to include -g if it can + AC_DEFINE(DEBUG, 1, [Define to turn on debugging code that may slow normal operation]) + CFLAGS=${CFLAGS-"-g"} +else + AC_MSG_RESULT(no) + CFLAGS=${CFLAGS-"-O"} +fi + +CFLAGS="$CFLAGS -DHAVE_CONFIG_H" + +# look for getconf early as this affects just about everything +AC_CHECK_PROG(HAVE_GETCONF, getconf, "yes", "no") +if test $HAVE_GETCONF = "yes"; then + CFLAGS=$CFLAGS" "`getconf LFS_CFLAGS 2> /dev/null` + LDFLAGS=$LDFLAGS" "`getconf LFS_LDFLAGS 2> /dev/null` +fi + +AC_ARG_WITH(included-popt, + [ --with-included-popt use bundled popt library, not from system]) + +AC_ARG_WITH(rsync-path, + [ --with-rsync-path=PATH set rsync path used on server to PATH (default: "rsync")], + [ RSYNC_PATH="$with_rsync_name" ], + [ RSYNC_PATH="rsync" ]) +RSYNC_PATH="\"$RSYNC_PATH\"" +AC_DEFINE_UNQUOTED(RSYNC_PATH, $RSYNC_PATH) + dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL @@ -16,6 +53,7 @@ AC_SUBST(SHELL) AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0) AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH) +AC_SYS_LARGEFILE AC_C_BIGENDIAN AC_HEADER_DIRENT AC_HEADER_TIME @@ -23,7 +61,7 @@ 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) AC_CHECK_HEADERS(compat.h sys/param.h ctype.h sys/wait.h sys/ioctl.h) AC_CHECK_HEADERS(sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h) -AC_CHECK_HEADERS(glob.h) +AC_CHECK_HEADERS(glob.h alloca.h mcheck.h) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) @@ -48,35 +86,91 @@ if test x"$rsync_cv_errno" = x"yes"; then AC_DEFINE(HAVE_ERRNO_DECL) fi +# The following test taken from the cvs sources +# If we can't find connect, try looking in -lsocket, -lnsl, and -linet. +# These need checks to be before checks for any other functions that +# might be in the same libraries. +# The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has +# libsocket.so which has a bad implementation of gethostbyname (it +# only looks in /etc/hosts), so we only look for -lsocket if we need +# it. +AC_CHECK_FUNCS(connect) +if test x"$ac_cv_func_connect" = x"no"; then + case "$LIBS" in + *-lnsl*) ;; + *) AC_CHECK_LIB(nsl_s, printf) ;; + esac + case "$LIBS" in + *-lnsl*) ;; + *) AC_CHECK_LIB(nsl, printf) ;; + esac + case "$LIBS" in + *-lsocket*) ;; + *) AC_CHECK_LIB(socket, connect) ;; + esac + case "$LIBS" in + *-linet*) ;; + *) AC_CHECK_LIB(inet, connect) ;; + esac + dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value + dnl has been cached. + if test x"$ac_cv_lib_socket_connect" = x"yes" || + test x"$ac_cv_lib_inet_connect" = x"yes"; then + # ac_cv_func_connect=yes + # don't! it would cause AC_CHECK_FUNC to succeed next time configure is run + AC_DEFINE(HAVE_CONNECT) + fi +fi + +# +# if we can't find strcasecmp, look in -lresolv (for Unixware at least) +# +AC_CHECK_FUNCS(strcasecmp) +if test x"$ac_cv_func_strcasecmp" = x"no"; then + AC_CHECK_LIB(resolv, strcasecmp) +fi + AC_FUNC_MEMCMP AC_FUNC_UTIME_NULL AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod) AC_CHECK_FUNCS(fchmod fstat strchr readlink link utime utimes strftime) -AC_CHECK_FUNCS(memmove lchown vsnprintf snprintf setsid glob strpbrk) -AC_CHECK_FUNCS(strlcat strlcpy) +AC_CHECK_FUNCS(memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk) +AC_CHECK_FUNCS(strlcat strlcpy mtrace) + +AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[ +AC_TRY_RUN([#include + #include + main() { + int fd[2]; + exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1); + }], +rsync_cv_HAVE_SOCKETPAIR=yes,rsync_cv_HAVE_SOCKETPAIR=no,rsync_cv_HAVE_SOCKETPAIR=cross)]) +if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then + AC_DEFINE(HAVE_SOCKETPAIR) +fi AC_CACHE_CHECK([for working fnmatch],rsync_cv_HAVE_FNMATCH,[ AC_TRY_RUN([#include -main() { exit(fnmatch("*.o", "x.o", FNM_PATHNAME) == 0? 0: 1); }], +main() { exit((fnmatch("*.o", "x.o", FNM_PATHNAME) == 0 && + fnmatch("a/b/*", "a/b/c/d", FNM_PATHNAME) != 0) ? 0: 1); }], rsync_cv_HAVE_FNMATCH=yes,rsync_cv_HAVE_FNMATCH=no,rsync_cv_HAVE_FNMATCH=cross)]) if test x"$rsync_cv_HAVE_FNMATCH" = x"yes"; then AC_DEFINE(HAVE_FNMATCH) fi -# sometimes getopt_long cannot parse same arguments twice -# e.g. on certain versions of CygWin32 -AC_CACHE_CHECK([for working getopt_long],rsync_cv_HAVE_GETOPT_LONG,[ -AC_TRY_RUN([#include -main() { - int i, x = 0; char *argv[] = { "x", "--xx" }; - struct option o[] = {{"xx", 0, 0, 1}, {0,0,0,0}}; - getopt_long(2, argv, "x", o, &i) == 1 ? x++ : 0; optind = 0; - getopt_long(2, argv, "x", o, &i) == 1 ? x++ : 0; - exit(x == 2 ? 0 : 1); -}], rsync_cv_HAVE_GETOPT_LONG=yes,rsync_cv_HAVE_GETOPT_LONG=no, - rsync_cv_HAVE_GETOPT_LONG=cross)]) -if test x"$rsync_cv_HAVE_GETOPT_LONG" = x"yes"; then - AC_DEFINE(HAVE_GETOPT_LONG) +if test x"$with_included_popt" != x"yes" +then + AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) +fi + +AC_MSG_CHECKING("whether to use included libpopt") +if test x"$with_included_popt" = x"yes" +then + AC_MSG_RESULT("$srcdir/popt") + BUILD_POPT='$(popt_OBJS)' + CFLAGS="$CFLAGS -I$srcdir/popt" +else + AC_MSG_RESULT(no) fi AC_CACHE_CHECK([for long long],rsync_cv_HAVE_LONGLONG,[ @@ -134,6 +228,65 @@ if test x"$rsync_cv_HAVE_UTIMBUF" = x"yes"; then AC_DEFINE(HAVE_UTIMBUF) fi +AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[ +AC_TRY_RUN([ +#include +#include +main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}], + rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes,rsync_cv_HAVE_GETTIMEOFDAY_TZ=no,rsync_cv_HAVE_GETTIMEOFDAY_TZ=cross)]) +if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then + AC_DEFINE(HAVE_GETTIMEOFDAY_TZ) +fi + +AC_CACHE_CHECK([for C99 vsnprintf],rsync_cv_HAVE_C99_VSNPRINTF,[ +AC_TRY_RUN([ +#include +#include +void foo(const char *format, ...) { + va_list ap; + int len; + char buf[5]; + + va_start(ap, format); + len = vsnprintf(0, 0, format, ap); + va_end(ap); + if (len != 5) exit(1); + + if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(1); + + exit(0); +} +main() { foo("hello"); } +], +rsync_cv_HAVE_C99_VSNPRINTF=yes,rsync_cv_HAVE_C99_VSNPRINTF=no,rsync_cv_HAVE_C99_VSNPRINTF=cross)]) +if test x"$rsync_cv_HAVE_C99_VSNPRINTF" = x"yes"; then + AC_DEFINE(HAVE_C99_VSNPRINTF) +fi + + +AC_CACHE_CHECK([for secure mkstemp],rsync_cv_HAVE_SECURE_MKSTEMP,[ +AC_TRY_RUN([#include +#include +#include +#include +main() { + struct stat st; + char tpl[20]="/tmp/test.XXXXXX"; + int fd = mkstemp(tpl); + if (fd == -1) exit(1); + unlink(tpl); + if (fstat(fd, &st) != 0) exit(1); + if ((st.st_mode & 0777) != 0600) exit(1); + exit(0); +}], +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) +fi + + AC_CACHE_CHECK([for broken inet_ntoa],rsync_cv_REPLACE_INET_NTOA,[ AC_TRY_RUN([ #include @@ -142,53 +295,25 @@ AC_TRY_RUN([ #include main() { struct in_addr ip; ip.s_addr = 0x12345678; if (strcmp(inet_ntoa(ip),"18.52.86.120") && - strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } -exit(1);}], - rsync_cv_REPLACE_INET_NTOA=yes,rsync_cv_REPLACE_INET_NTOA=no,rsync_cv_REPLACE_INET_NTOA=cross)]) + strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(1); } +exit(0);}], + rsync_cv_REPLACE_INET_NTOA=no,rsync_cv_REPLACE_INET_NTOA=yes,rsync_cv_REPLACE_INET_NTOA=cross)]) if test x"$rsync_cv_REPLACE_INET_NTOA" = x"yes"; then AC_DEFINE(REPLACE_INET_NTOA) fi -# The following test taken from the cvs sources -# If we can't find connect, try looking in -lsocket, -lnsl, and -linet. -# The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has -# libsocket.so which has a bad implementation of gethostbyname (it -# only looks in /etc/hosts), so we only look for -lsocket if we need -# it. -AC_CHECK_FUNCS(connect) -if test x"$ac_cv_func_connect" = x"no"; then - case "$LIBS" in - *-lnsl*) ;; - *) AC_CHECK_LIB(nsl_s, printf) ;; - esac - case "$LIBS" in - *-lnsl*) ;; - *) AC_CHECK_LIB(nsl, printf) ;; - esac - case "$LIBS" in - *-lsocket*) ;; - *) AC_CHECK_LIB(socket, connect) ;; - esac - case "$LIBS" in - *-linet*) ;; - *) AC_CHECK_LIB(inet, connect) ;; - esac - dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value - dnl has been cached. - if test x"$ac_cv_lib_socket_connect" = x"yes" || - test x"$ac_cv_lib_inet_connect" = x"yes"; then - # ac_cv_func_connect=yes - # don't! it would cause AC_CHECK_FUNC to succeed next time configure is run - AC_DEFINE(HAVE_CONNECT) - fi -fi -# -# if we can't find strcasecmp, look in -lresolv (for Unixware at least) -# -AC_CHECK_FUNCS(strcasecmp) -if test x"$ac_cv_func_strcasecmp" = x"no"; then - AC_CHECK_LIB(resolv, strcasecmp) +AC_CACHE_CHECK([for broken inet_aton],rsync_cv_REPLACE_INET_ATON,[ +AC_TRY_RUN([ +#include +#include +#include +#include +main() { struct in_addr ip; +if (inet_aton("example", &ip) == 0) exit(0); exit(1);}], + rsync_cv_REPLACE_INET_ATON=no,rsync_cv_REPLACE_INET_ATON=yes,rsync_cv_REPLACE_INET_ATON=cross)]) +if test x"$rsync_cv_REPLACE_INET_ATON" = x"yes"; then + AC_DEFINE(REPLACE_INET_ATON) fi # @@ -220,6 +345,6 @@ fi AC_SUBST(OBJ_SAVE) AC_SUBST(OBJ_RESTORE) AC_SUBST(CC_SHOBJ_FLAG) - +AC_SUBST(BUILD_POPT) AC_OUTPUT(Makefile lib/dummy zlib/dummy)