X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a784e10d0061edb526da442b71d447a2ac83f432..f7ca98bdc47f30fef67b6c232a88af7e6c44ac5e:/configure.in diff --git a/configure.in b/configure.in index 3e876e25..5f72a312 100644 --- a/configure.in +++ b/configure.in @@ -1,21 +1,51 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(byteorder.h) AC_CONFIG_HEADER(config.h) +AC_PREREQ(2.52) -# 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" + +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 default --rsync-path to PATH (default: \"rsync\")], + [ RSYNC_PATH="$with_rsync_path" ], + [ RSYNC_PATH="rsync" ]) +AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [ ]) + dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL AC_SUBST(SHELL) AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0) -AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH) +AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH, [ ]) +AC_SYS_LARGEFILE AC_C_BIGENDIAN AC_HEADER_DIRENT AC_HEADER_TIME @@ -23,7 +53,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) @@ -39,13 +69,14 @@ AC_TYPE_SIZE_T AC_TYPE_PID_T AC_TYPE_GETGROUPS AC_STRUCT_ST_RDEV -AC_CHECK_TYPE(ino_t,unsigned) +AC_CHECK_TYPE([ino_t], [unsigned]) +TYPE_SOCKLEN_T AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [ AC_TRY_COMPILE([#include ],[int i = errno], rsync_cv_errno=yes,rsync_cv_have_errno_decl=no)]) if test x"$rsync_cv_errno" = x"yes"; then - AC_DEFINE(HAVE_ERRNO_DECL) + AC_DEFINE(HAVE_ERRNO_DECL, 1, [ ]) fi # The following test taken from the cvs sources @@ -80,7 +111,7 @@ if test x"$ac_cv_func_connect" = x"no"; then 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) + AC_DEFINE(HAVE_CONNECT, 1, [ ]) fi fi @@ -96,8 +127,20 @@ 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 inet_aton socketpair) +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, 1, [ ]) +fi AC_CACHE_CHECK([for working fnmatch],rsync_cv_HAVE_FNMATCH,[ AC_TRY_RUN([#include @@ -105,23 +148,22 @@ 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) + AC_DEFINE(HAVE_FNMATCH, 1, [ ]) 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,[ @@ -129,7 +171,7 @@ AC_TRY_RUN([#include main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); }], rsync_cv_HAVE_LONGLONG=yes,rsync_cv_HAVE_LONGLONG=no,rsync_cv_HAVE_LONGLONG=cross)]) if test x"$rsync_cv_HAVE_LONGLONG" = x"yes"; then - AC_DEFINE(HAVE_LONGLONG) + AC_DEFINE(HAVE_LONGLONG, 1, [ ]) fi AC_CACHE_CHECK([for off64_t],rsync_cv_HAVE_OFF64_T,[ @@ -138,7 +180,7 @@ AC_TRY_RUN([#include main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }], rsync_cv_HAVE_OFF64_T=yes,rsync_cv_HAVE_OFF64_T=no,rsync_cv_HAVE_OFF64_T=cross)]) if test x"$rsync_cv_HAVE_OFF64_T" = x"yes"; then - AC_DEFINE(HAVE_OFF64_T) + AC_DEFINE(HAVE_OFF64_T, 1, [ ]) fi AC_CACHE_CHECK([for short ino_t],rsync_cv_HAVE_SHORT_INO_T,[ @@ -148,7 +190,7 @@ AC_TRY_RUN([#include main() { if (sizeof(ino_t) < sizeof(unsigned int)) return 0; return 1; }], rsync_cv_HAVE_SHORT_INO_T=yes,rsync_cv_HAVE_SHORT_INO_T=no,rsync_cv_HAVE_SHORT_INO_T=cross)]) if test x"$rsync_cv_HAVE_SHORT_INO_T" = x"yes"; then - AC_DEFINE(HAVE_SHORT_INO_T) + AC_DEFINE(HAVE_SHORT_INO_T, 1, [ ]) fi AC_CACHE_CHECK([for unsigned char],rsync_cv_HAVE_UNSIGNED_CHAR,[ @@ -156,7 +198,7 @@ AC_TRY_RUN([#include main() { char c; c=250; exit((c > 0)?0:1); }], rsync_cv_HAVE_UNSIGNED_CHAR=yes,rsync_cv_HAVE_UNSIGNED_CHAR=no,rsync_cv_HAVE_UNSIGNED_CHAR=cross)]) if test x"$rsync_cv_HAVE_UNSIGNED_CHAR" = x"yes"; then - AC_DEFINE(HAVE_UNSIGNED_CHAR) + AC_DEFINE(HAVE_UNSIGNED_CHAR, 1, [ ]) fi AC_CACHE_CHECK([for broken readdir],rsync_cv_HAVE_BROKEN_READDIR,[ @@ -167,7 +209,7 @@ if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 && di->d_name[0] == 0) exit(0); exit(1);} ], rsync_cv_HAVE_BROKEN_READDIR=yes,rsync_cv_HAVE_BROKEN_READDIR=no,rsync_cv_HAVE_BROKEN_READDIR=cross)]) if test x"$rsync_cv_HAVE_BROKEN_READDIR" = x"yes"; then - AC_DEFINE(HAVE_BROKEN_READDIR) + AC_DEFINE(HAVE_BROKEN_READDIR, 1, [ ]) fi AC_CACHE_CHECK([for utimbuf],rsync_cv_HAVE_UTIMBUF,[ @@ -176,7 +218,7 @@ AC_TRY_COMPILE([#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,rsync_cv_HAVE_UTIMBUF=cross)]) if test x"$rsync_cv_HAVE_UTIMBUF" = x"yes"; then - AC_DEFINE(HAVE_UTIMBUF) + AC_DEFINE(HAVE_UTIMBUF, 1, [ ]) fi AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[ @@ -186,7 +228,55 @@ AC_TRY_RUN([ 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) + AC_DEFINE(HAVE_GETTIMEOFDAY_TZ, 1, [ ]) +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, 1, [ ]) +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, 1, [ ]) fi @@ -198,11 +288,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) + AC_DEFINE(REPLACE_INET_NTOA, 1, [ ]) +fi + + +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, 1, [ ]) fi # @@ -234,6 +338,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) +AC_OUTPUT(Makefile lib/dummy zlib/dummy shconfig)