---------------------
PatchSet 6510 
Date: 2005/03/17 02:49:11
Author: hno
Branch: lfs-2_5
Tag: (none) 
Log:
Back out most of previous change as it is not that nice to run compile
tests before the environment is up, and instead make
--enable-large-cache-files to NOT implicitly force --enable-large-files.

Members: 
	configure.in:1.42.2.59.2.5->1.42.2.59.2.6 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.42.2.59.2.5
retrieving revision 1.42.2.59.2.6
diff -u -r1.42.2.59.2.5 -r1.42.2.59.2.6
--- squid/configure.in	17 Mar 2005 02:45:51 -0000	1.42.2.59.2.5
+++ squid/configure.in	17 Mar 2005 02:49:11 -0000	1.42.2.59.2.6
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.42.2.59.2.5 2005/03/17 02:45:51 hno Exp $
+dnl  $Id: configure.in,v 1.42.2.59.2.6 2005/03/17 02:49:11 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.5.STABLE9-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.42.2.59.2.5 $)dnl
+AC_REVISION($Revision: 1.42.2.59.2.6 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -760,13 +760,12 @@
 
 AC_ARG_ENABLE(large-cache-files,
 [  --enable-cache-large-files
-                          Enable support for large cache files (>2GB). Also
-                          implicitly enables the --with-large-files option.
+                          Enable support for large cache files (>2GB).
                           WARNING: on-disk cache format is changed by this option],
 [ if test "$enableval" = "yes" ; then
 	echo "Large cache file support enabled"
 	AC_DEFINE(LARGE_CACHE_FILES, 1, [Support large cache files > 2GB])
-	needlargefiles=1
+dnl	needlargefiles=1
   fi
 ])
 
@@ -798,32 +797,16 @@
 ])
 
 if test $needlargefiles && test -z "$buildmodel"; then
-	AC_CACHE_CHECK(Default off_t size, ac_cv_default_off_t_size,
-		AC_TRY_RUN([
-#include <stdio.h>
-#include <sys/types.h>
-main() {
-	FILE *fp = fopen("conftestval", "w");
-	fprintf (fp, "%d\n", sizeof(off_t));
-	exit(0);
-}
-		],
-		ac_cv_default_off_t_size=`cat conftestval`,
-		ac_cv_default_off_t_size=0,
-		ac_cv_default_off_t_size=4)
-	)
-	if test $ac_cv_default_off_t_size -le 4; then
-		for model in POSIX_V6_ILP32_OFFBIG XBS5_ILP32_OFFBIG POSIX_V6_LP64_OFF64 XBS5_LP64_OFF64 POSIX_V6_LPBIG_OFFBIG XBS5_LPBIG_OFFBIG; do
-			if test "`getconf _$model 2>/dev/null || true`" = 1 || test "`getconf $model 2>/dev/null || true`" ; then
-				buildmodel=$model
-				break
-			fi
-		done
-		if [ -z "$buildmodel" ]; then
-			echo "WARNING: No suitable build environment found for large files. Trying to use _FILE_OFFSET_BITS=64"
-			sleep 1
-			CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
+	for model in POSIX_V6_ILP32_OFFBIG XBS5_ILP32_OFFBIG POSIX_V6_LP64_OFF64 XBS5_LP64_OFF64 POSIX_V6_LPBIG_OFFBIG XBS5_LPBIG_OFFBIG; do
+		if test "`getconf _$model 2>/dev/null || true`" = 1 || test "`getconf $model 2>/dev/null || true`" ; then
+			buildmodel=$model
+			break
 		fi
+	done
+	if [ -z "$buildmodel" ]; then
+		echo "WARNING: No suitable build environment found for large files. Trying to use _FILE_OFFSET_BITS=64"
+		sleep 1
+		CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
 	fi
 fi
 if test -n "$buildmodel" && test "$buildmodel" != "default"; then