summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-28 09:47:53 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-04-05 02:39:08 +0200
commitd5c7de8650ee2e05de591f3901c2cad010b88b77 (patch)
tree6d941f6890de1195e69e7495fd35ed5cefaa7c2d /source3
parentc03398ec0f499eef8981274019cc7b4db09415c2 (diff)
downloadsamba-d5c7de8650ee2e05de591f3901c2cad010b88b77.tar.gz
samba-d5c7de8650ee2e05de591f3901c2cad010b88b77.tar.bz2
samba-d5c7de8650ee2e05de591f3901c2cad010b88b77.zip
build: Require 64-bit files support and do not define HAVE_EXPLICIT_LARGEFILE_SUPPORT
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in16
-rw-r--r--source3/wscript10
2 files changed, 7 insertions, 19 deletions
diff --git a/source3/configure.in b/source3/configure.in
index ba9ae375fe..74c962652f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5268,25 +5268,23 @@ fi
#
# As a gating factor for large file support, in order to
# use <4GB files we must have the following minimal support
-# available.
-# long long, and a 64 bit off_t or off64_t.
-# If we don't have all of these then disable large
-# file support.
+# available: a 64 bit off_t
+# If we don't have all of these then fail the build
#
AC_MSG_CHECKING([if large file support can be enabled])
AC_TRY_COMPILE([
-#if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
+#if (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8))
#include <sys/types.h>
#else
__COMPILE_ERROR_
#endif
],
[int i],
-samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes,samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=no)
-if test x"$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" = x"yes"; then
- AC_DEFINE(HAVE_EXPLICIT_LARGEFILE_SUPPORT,1,[Whether large file support can be enabled])
+samba_cv_HAVE_LARGEFILE_SUPPORT=yes,samba_cv_HAVE_LARGEFILE_SUPPORT=no)
+if test x"$samba_cv_HAVE_LARGEFILE_SUPPORT" != x"yes"; then
+ AC_MSG_ERROR(["large file support support not available: sizeof(off_t) != 8"])
fi
-AC_MSG_RESULT([$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT])
+AC_MSG_RESULT([$samba_cv_HAVE_LARGEFILE_SUPPORT])
#################################################
diff --git a/source3/wscript b/source3/wscript
index dc80bdbbfd..1e703dd2b1 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -356,16 +356,6 @@ return acl_get_perm_np(permset_d, perm);
headers='unistd.h fcntl.h')
conf.CHECK_DECLS('readahead', headers='fcntl.h', always=True)
- conf.CHECK_CODE('''
- #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
- #include <sys/types.h>
- #else
- __COMPILE_ERROR_
- #endif
- int i;''',
- 'HAVE_EXPLICIT_LARGEFILE_SUPPORT',
- msg="Checking whether large file support can be enabled")
-
if Options.options.with_aio_support:
conf.CHECK_FUNCS_IN('aio_read', 'aio')
conf.CHECK_FUNCS_IN('aio_read', 'rt')