diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 488 |
1 files changed, 78 insertions, 410 deletions
diff --git a/configure.in b/configure.in index 829d0aad..c1ae3c0d 100644 --- a/configure.in +++ b/configure.in @@ -1,225 +1,20 @@ dnl Process this file with autoconf to produce a configure script. - -AC_INIT() -AC_CONFIG_SRCDIR([byteorder.h]) +AC_INIT(byteorder.h) AC_CONFIG_HEADER(config.h) -AC_PREREQ(2.52) - -RSYNC_VERSION=2.5.2pre3 -AC_SUBST(RSYNC_VERSION) -AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) - -AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version]) -LDFLAGS=${LDFLAGS-""} +# compile with optimisation and without debugging by default +CFLAGS=${CFLAGS-"-O"} -AC_CANONICAL_TARGET([]) +AC_CANONICAL_SYSTEM +AC_VALIDATE_CACHE_SYSTEM_TYPE dnl Checks for programs. AC_PROG_CC -AC_PROG_CPP 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 "$xac_cv_prog_cc_stdc" = xno -then - AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one]) -fi - -# We must decide this before testing the compiler. - -# Please allow this to default to yes, so that your users have more -# chance of getting a useful stack trace if problems occur. - -AC_MSG_CHECKING([whether to include debugging symbols]) -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug], - [including debugging symbols and features (default yes)]), - [], []) - -if test x"$enable_debug" = x"no" -then - AC_MSG_RESULT(no) - CFLAGS=${CFLAGS-"-O"} -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"} -fi - - - - -AC_ARG_ENABLE(profile, - AC_HELP_STRING([--enable-profile], - [turn on CPU profiling (default no)], - [], [])) -if test x"$enable_profile" = xyes -then - CFLAGS="$CFLAGS -pg" -fi - - -# This is needed for our included version of popt. Kind of silly, but -# I don't want our version too far out of sync. -CFLAGS="$CFLAGS -DHAVE_CONFIG_H" - -# If GCC, turn on warnings. -if test "x$GCC" = "xyes" -then - CFLAGS="$CFLAGS -Wall -W" -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 default --rsync-path to PATH (default: \"rsync\")], - [ RSYNC_PATH="$with_rsync_path" ], - [ RSYNC_PATH="rsync" ]) -AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [ ]) - AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0) -AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH, [ ]) - - -# 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,[ -AC_TRY_RUN([ -#define _FILE_OFFSET_BITS 64 -#include <stdio.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/wait.h> - -int main(void) -{ - struct flock lock; - int status; - int fd = open("conftest.dat", O_CREAT|O_RDWR, 0600); - lock.l_type = F_WRLCK; - lock.l_whence = SEEK_SET; - lock.l_start = 0; - lock.l_len = 1; - lock.l_pid = 0; - - fcntl(fd,F_SETLK,&lock); - if (fork() == 0) { - lock.l_start = 1; - exit(fcntl(fd,F_SETLK,&lock) == 0); - } - wait(&status); - unlink("conftest.dat"); - exit(WEXITSTATUS(status)); -} -], -rsync_cv_HAVE_BROKEN_LARGEFILE=yes,rsync_cv_HAVE_BROKEN_LARGEFILE=no,rsync_cv_HAVE_BROKEN_LARGEFILE=cross)]) -if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then - AC_SYS_LARGEFILE -fi - -ipv6type=unknown -ipv6lib=none -ipv6trylibc=yes - -AC_ARG_ENABLE(ipv6, - AC_HELP_STRING([--disable-ipv6], [don't even try to use IPv6])) - -if test "x$enable_ipv6" != xno -then - AC_MSG_CHECKING([ipv6 stack type]) - for i in inria kame linux-glibc linux-inet6 toshiba v6d zeta; do - case $i in - inria) - # http://www.kame.net/ - AC_EGREP_CPP(yes, [ -#include <netinet/in.h> -#ifdef IPV6_INRIA_VERSION -yes -#endif], - [ipv6type=$i; - AC_DEFINE(INET6, 1, [true if you have IPv6]) - ]) - ;; - kame) - # http://www.kame.net/ - AC_EGREP_CPP(yes, [ -#include <netinet/in.h> -#ifdef __KAME__ -yes -#endif], - [ipv6type=$i; - AC_DEFINE(INET6, 1, [true if you have IPv6])]) - ;; - linux-glibc) - # http://www.v6.linux.or.jp/ - AC_EGREP_CPP(yes, [ -#include <features.h> -#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 -yes -#endif], - [ipv6type=$i; -AC_DEFINE(INET6, 1, [true if you have IPv6])]) - ;; - linux-inet6) - # http://www.v6.linux.or.jp/ - if test -d /usr/inet6 -o -f /usr/inet6/lib/libinet6.a; then - ipv6type=$i - ipv6lib=inet6 - ipv6libdir=/usr/inet6/lib - ipv6trylibc=yes; - AC_DEFINE(INET6, 1, [true if you have IPv6]) - CFLAGS="-I/usr/inet6/include $CFLAGS" - fi - ;; - toshiba) - AC_EGREP_CPP(yes, [ -#include <sys/param.h> -#ifdef _TOSHIBA_INET6 -yes -#endif], - [ipv6type=$i; - ipv6lib=inet6; - ipv6libdir=/usr/local/v6/lib; - AC_DEFINE(INET6, 1, [true if you have IPv6])]) - ;; - v6d) - AC_EGREP_CPP(yes, [ -#include </usr/local/v6/include/sys/v6config.h> -#ifdef __V6D__ -yes -#endif], - [ipv6type=$i; - ipv6lib=v6; - ipv6libdir=/usr/local/v6/lib; - AC_DEFINE(INET6, 1, [true if you have IPv6])]) - ;; - zeta) - AC_EGREP_CPP(yes, [ -#include <sys/param.h> -#ifdef _ZETA_MINAMI_INET6 -yes -#endif], - [ipv6type=$i; - ipv6lib=inet6; - ipv6libdir=/usr/local/v6/lib; - AC_DEFINE(INET6, 1, [true if you have IPv6])]) - ;; - esac - if test "$ipv6type" != "unknown"; then - break - fi - done - AC_MSG_RESULT($ipv6type) - - AC_SEARCH_LIBS(getaddrinfo, inet6) -fi +AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH) AC_C_BIGENDIAN AC_HEADER_DIRENT @@ -228,9 +23,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 alloca.h mcheck.h sys/sysctl.h arpa/inet.h arpa/nameser.h) -AC_CHECK_HEADERS(netdb.h) -AC_CHECK_HEADERS(malloc.h) +AC_CHECK_HEADERS(glob.h) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) @@ -245,112 +38,22 @@ AC_TYPE_OFF_T AC_TYPE_SIZE_T AC_TYPE_PID_T AC_TYPE_GETGROUPS -AC_CHECK_MEMBERS([struct stat.st_rdev]) - -AC_CHECK_TYPE([ino_t], [unsigned]) -TYPE_SOCKLEN_T +AC_STRUCT_ST_RDEV +AC_CHECK_TYPE(ino_t,unsigned) AC_CACHE_CHECK([for errno in errno.h],rsync_cv_errno, [ AC_TRY_COMPILE([#include <errno.h>],[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, 1, [ ]) -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, 1, [ ]) - fi -fi - -AC_CHECK_LIB(resolv, inet_ntop) - -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_CHECK_FUNCS(getaddrinfo, , AC_LIBOBJ(lib/getaddrinfo)) -AC_CHECK_FUNCS(getnameinfo, , AC_LIBOBJ(lib/getnameinfo)) - -AC_CHECK_MEMBER([struct sockaddr.sa_len], - [ AC_DEFINE(HAVE_SOCKADDR_LEN) ], - [], - [ -#include <sys/types.h> -#include <sys/socket.h> -]) - -AC_MSG_CHECKING(struct sockaddr_storage) -AC_TRY_COMPILE([#include <sys/types.h> -#include <sys/socket.h>], -[struct sockaddr_storage x;], - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, - [Define if you have strct sockaddr_storage.] ), - AC_MSG_RESULT(no)) - -# 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_DEFINE(HAVE_ERRNO_DECL) fi -dnl At the moment we don't test for a broken memcmp(), because all we -dnl need to do is test for equality, not comparison, and it seems that -dnl every platform has a memcmp that can do at least that. -dnl AC_FUNC_MEMCMP - +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 asprintf setsid glob strpbrk) -AC_CHECK_FUNCS(strlcat strlcpy mtrace mallinfo) - -AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[ -AC_TRY_RUN([ -#include <sys/types.h> -#include <sys/socket.h> - -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_CHECK_FUNCS(memmove lchown vsnprintf snprintf setsid glob strpbrk) +AC_CHECK_FUNCS(strlcat strlcpy inet_aton setgroups) AC_CACHE_CHECK([for working fnmatch],rsync_cv_HAVE_FNMATCH,[ AC_TRY_RUN([#include <fnmatch.h> @@ -358,22 +61,23 @@ 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, 1, [ ]) -fi - -if test x"$with_included_popt" != x"yes" -then - AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes]) + AC_DEFINE(HAVE_FNMATCH) 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) +# 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 <getopt.h> +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) fi AC_CACHE_CHECK([for long long],rsync_cv_HAVE_LONGLONG,[ @@ -381,7 +85,7 @@ AC_TRY_RUN([#include <stdio.h> 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, 1, [ ]) + AC_DEFINE(HAVE_LONGLONG) fi AC_CACHE_CHECK([for off64_t],rsync_cv_HAVE_OFF64_T,[ @@ -390,7 +94,7 @@ AC_TRY_RUN([#include <stdio.h> 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, 1, [ ]) + AC_DEFINE(HAVE_OFF64_T) fi AC_CACHE_CHECK([for short ino_t],rsync_cv_HAVE_SHORT_INO_T,[ @@ -400,7 +104,7 @@ AC_TRY_RUN([#include <stdio.h> 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, 1, [ ]) + AC_DEFINE(HAVE_SHORT_INO_T) fi AC_CACHE_CHECK([for unsigned char],rsync_cv_HAVE_UNSIGNED_CHAR,[ @@ -408,7 +112,7 @@ AC_TRY_RUN([#include <stdio.h> 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, 1, [ ]) + AC_DEFINE(HAVE_UNSIGNED_CHAR) fi AC_CACHE_CHECK([for broken readdir],rsync_cv_HAVE_BROKEN_READDIR,[ @@ -419,7 +123,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, 1, [ ]) + AC_DEFINE(HAVE_BROKEN_READDIR) fi AC_CACHE_CHECK([for utimbuf],rsync_cv_HAVE_UTIMBUF,[ @@ -428,68 +132,9 @@ AC_TRY_COMPILE([#include <sys/types.h> [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, 1, [ ]) + AC_DEFINE(HAVE_UTIMBUF) fi -AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[ -AC_TRY_RUN([ -#include <sys/time.h> -#include <unistd.h> -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, 1, [ ]) -fi - -AC_CACHE_CHECK([for C99 vsnprintf],rsync_cv_HAVE_C99_VSNPRINTF,[ -AC_TRY_RUN([ -#include <sys/types.h> -#include <stdarg.h> -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 <stdlib.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -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 - - AC_CACHE_CHECK([for broken inet_ntoa],rsync_cv_REPLACE_INET_NTOA,[ AC_TRY_RUN([ #include <stdio.h> @@ -498,25 +143,53 @@ AC_TRY_RUN([ #include <arpa/inet.h> 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(1); } -exit(0);}], - rsync_cv_REPLACE_INET_NTOA=no,rsync_cv_REPLACE_INET_NTOA=yes,rsync_cv_REPLACE_INET_NTOA=cross)]) + 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)]) if test x"$rsync_cv_REPLACE_INET_NTOA" = x"yes"; then - AC_DEFINE(REPLACE_INET_NTOA, 1, [ ]) + 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 -AC_CACHE_CHECK([for broken inet_aton],rsync_cv_REPLACE_INET_ATON,[ -AC_TRY_RUN([ -#include <stdio.h> -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/inet.h> -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, [ ]) +# +# 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 # @@ -548,11 +221,6 @@ fi AC_SUBST(OBJ_SAVE) AC_SUBST(OBJ_RESTORE) AC_SUBST(CC_SHOBJ_FLAG) -AC_SUBST(BUILD_POPT) -AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) -AC_OUTPUT -AC_MSG_RESULT() -AC_MSG_RESULT([ rsync ${RSYNC_VERSION} configuration successful]) -AC_MSG_RESULT() +AC_OUTPUT(Makefile lib/dummy zlib/dummy) |