Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clearer error messages.
[rsync/rsync.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
21bbab7
..
33ef7a3
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-5,6
+5,12
@@
AC_CONFIG_SRCDIR([byteorder.h])
AC_CONFIG_HEADER(config.h)
AC_PREREQ(2.52)
AC_CONFIG_HEADER(config.h)
AC_PREREQ(2.52)
+RSYNC_VERSION=2.5.1pre3
+AC_SUBST(RSYNC_VERSION)
+AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
+
+AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version])
+
LDFLAGS=${LDFLAGS-""}
AC_CANONICAL_TARGET([])
LDFLAGS=${LDFLAGS-""}
AC_CANONICAL_TARGET([])
@@
-13,11
+19,13
@@
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
+AC_PROG_CC_STDC
AC_SUBST(SHELL)
AC_SUBST(SHELL)
-RSYNC_VERSION=2.4.7pre3
-AC_SUBST(RSYNC_VERSION)
-AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$RSYNC_VERSION"], [rsync release version])
+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
# compile with optimisation and without debugging by default, unless
# --debug is given. We must decide this before testing the compiler.
# compile with optimisation and without debugging by default, unless
# --debug is given. We must decide this before testing the compiler.
@@
-35,7
+43,7
@@
then
else
AC_MSG_RESULT([yes])
# leave CFLAGS alone; AC_PROG_CC will try to include -g if it can
else
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])
+
dnl
AC_DEFINE(DEBUG, 1, [Define to turn on debugging code that may slow normal operation])
dnl CFLAGS=${CFLAGS-"-g"}
fi
dnl CFLAGS=${CFLAGS-"-g"}
fi
@@
-94,6
+102,11
@@
ipv6type=unknown
ipv6lib=none
ipv6trylibc=yes
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
AC_MSG_CHECKING([ipv6 stack type])
for i in inria kame linux-glibc linux-inet6 toshiba v6d zeta; do
case $i in
@@
-179,7
+192,8
@@
yes
done
AC_MSG_RESULT($ipv6type)
done
AC_MSG_RESULT($ipv6type)
-AC_SEARCH_LIBS(getaddrinfo, inet6)
+ AC_SEARCH_LIBS(getaddrinfo, inet6)
+fi
AC_C_BIGENDIAN
AC_HEADER_DIRENT
AC_C_BIGENDIAN
AC_HEADER_DIRENT
@@
-270,6
+284,14
@@
AC_CHECK_MEMBER([struct sockaddr.sa_len],
#include <sys/socket.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),
+ AC_MSG_RESULT(no))
+
# if we can't find strcasecmp, look in -lresolv (for Unixware at least)
#
AC_CHECK_FUNCS(strcasecmp)
# if we can't find strcasecmp, look in -lresolv (for Unixware at least)
#
AC_CHECK_FUNCS(strcasecmp)
@@
-277,7
+299,11
@@
if test x"$ac_cv_func_strcasecmp" = x"no"; then
AC_CHECK_LIB(resolv, strcasecmp)
fi
AC_CHECK_LIB(resolv, strcasecmp)
fi
-AC_FUNC_MEMCMP
+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_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_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)
@@
-285,12
+311,14
@@
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_CHECK_FUNCS(strlcat strlcpy mtrace)
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);
- }],
+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, [ ])
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, [ ])