In clean_flist(), if a duplicate is found for a dir and a non-dir,

[rsync/rsync.git] / configure.in

diff --git a/configure.in b/configure.in
index b45f9bb..f05280b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT()
 AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
-AC_PREREQ(2.52)
+AC_PREREQ(2.59)
 
 RSYNC_VERSION=2.6.4cvs
 AC_SUBST(RSYNC_VERSION)
@@ -57,7 +57,7 @@ fi
 
 
 AC_ARG_ENABLE(profile,
-       AC_HELP_STRING([--enable-profile],      
+       AC_HELP_STRING([--enable-profile],
                [turn on CPU profiling (default no)],
                [], []))
 if test x"$enable_profile" = xyes
@@ -68,7 +68,7 @@ fi
 
 # Specifically, this turns on panic_action handling.
 AC_ARG_ENABLE(maintainer-mode,
-       AC_HELP_STRING([--enable-maintainer-mode],      
+       AC_HELP_STRING([--enable-maintainer-mode],
                [turn on extra debug features],
                [], []))
 if test x"$enable_maintainer_mode" = xyes
@@ -293,7 +293,10 @@ AC_HEADER_MAJOR
 
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
 AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(off_t)
+AC_CHECK_SIZEOF(off64_t)
 
 AC_C_INLINE
 
@@ -436,6 +439,27 @@ AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id],
 #include <netinet/in.h>
 ])
 
+AC_MSG_CHECKING(struct stat64)
+AC_TRY_COMPILE([#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+],[struct stat64 st;],
+    AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_STRUCT_STAT64,1,[Define to 1 if you have struct stat64.]),
+    AC_MSG_RESULT(no))
+
 # if we can't find strcasecmp, look in -lresolv (for Unixware at least)
 #
 AC_CHECK_FUNCS(strcasecmp)
@@ -516,25 +540,6 @@ else
     AC_MSG_RESULT(no)
 fi
 
-AC_CACHE_CHECK([for long long],rsync_cv_HAVE_LONGLONG,[
-if test x"$GCC" = x"yes"; then
- rsync_cv_HAVE_LONGLONG=yes
-else
- AC_TRY_COMPILE(,[long long i;],
-  rsync_cv_HAVE_LONGLONG=yes,rsync_cv_HAVE_LONGLONG=no)
-fi])
-if test x"$rsync_cv_HAVE_LONGLONG" = x"yes"; then
-    AC_DEFINE(HAVE_LONGLONG, 1, [Define to 1 if you have the "long long" type])
-fi
-
-AC_CACHE_CHECK([for off64_t],rsync_cv_HAVE_OFF64_T,[
-AC_TRY_COMPILE([#include <stdio.h>
-#include <sys/stat.h>],[off64_t s;],
-rsync_cv_HAVE_OFF64_T=yes,rsync_cv_HAVE_OFF64_T=no)])
-if test x"$rsync_cv_HAVE_OFF64_T" = x"yes"; then
-    AC_DEFINE(HAVE_OFF64_T, 1, [Define to 1 if you have the off64_t type])
-fi
-
 AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[
 AC_TRY_COMPILE([],[signed char *s = ""],
 rsync_cv_SIGNED_CHAR_OK=yes,rsync_cv_SIGNED_CHAR_OK=no)])