AC_CONFIG_HEADER(config.h)
AC_PREREQ(2.52)
-RSYNC_VERSION=2.5.5cvs
+RSYNC_VERSION=2.5.6pre2cvs
AC_SUBST(RSYNC_VERSION)
AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
AC_DEFINE([_GNU_SOURCE], 1,
[Define _GNU_SOURCE so that we get all necessary prototypes])
-if test "$xac_cv_prog_cc_stdc" = xno
+if test "x$ac_cv_prog_cc_stdc" = xno
then
AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one])
fi
fi
+# Specifically, this turns on panic_action handling.
+AC_ARG_ENABLE(maintainer-mode,
+ AC_HELP_STRING([--enable-maintainer-mode],
+ [turn on extra debug features],
+ [], []))
+if test x"$enable_maintainer_mode" = xyes
+then
+ CFLAGS="$CFLAGS -DMAINTAINER_MODE"
+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"
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(sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h sys/un.h)
+AC_CHECK_HEADERS(glob.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(float.h)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
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))
+# Irix 6.5 has getaddrinfo but not the corresponding defines, so use
+# builtin getaddrinfo if one of the defines don't exist
+AC_MSG_CHECKING([whether defines needed by getaddrinfo exist])
+AC_EGREP_CPP(yes, [
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#ifdef AI_PASSIVE
+yes
+#endif], [
+ AC_MSG_RESULT(yes)
+ # Tru64 UNIX has getaddrinfo() but has it renamed in libc as
+ # something else so we must include <netdb.h> to get the
+ # redefinition.
+ AC_CHECK_FUNCS(getaddrinfo, ,
+ [AC_MSG_CHECKING([for getaddrinfo by including <netdb.h>])
+ AC_TRY_LINK([#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>],[getaddrinfo(NULL, NULL, NULL, NULL);],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_GETADDRINFO, 1,
+ [Define if you have the `getaddrinfo' function.])],
+ [AC_MSG_RESULT([no])
+ AC_LIBOBJ(lib/getaddrinfo)])])
+ AC_CHECK_FUNCS(getnameinfo, , AC_LIBOBJ(lib/getnameinfo))
+ ],
+ AC_MSG_RESULT(no)
+ )
+
AC_CHECK_MEMBER([struct sockaddr.sa_len],
[ AC_DEFINE(HAVE_SOCKADDR_LEN) ],
[Define if you have strct sockaddr_storage.] ),
AC_MSG_RESULT(no))
+AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id],
+ [ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID) ],
+ [],
+ [
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+])
+
# if we can't find strcasecmp, look in -lresolv (for Unixware at least)
#
AC_CHECK_FUNCS(strcasecmp)
dnl AC_FUNC_MEMCMP
AC_FUNC_UTIME_NULL
-AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod)
+AC_FUNC_ALLOCA
+AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod mkfifo)
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 setgroups)
+AC_CHECK_FUNCS(strlcat strlcpy strtol mtrace mallinfo setgroups)
AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
AC_TRY_RUN([
AC_MSG_RESULT($srcdir/popt)
BUILD_POPT='$(popt_OBJS)'
CFLAGS="$CFLAGS -I$srcdir/popt"
+ if test x"$ALLOCA" != x
+ then
+ # this can be removed when/if we add an included alloca.c;
+ # see autoconf documentation on AC_FUNC_ALLOCA
+ AC_MSG_WARN([included libpopt will use malloc, not alloca (which wastes a small amount of memory)])
+ fi
else
AC_MSG_RESULT(no)
fi