---------------------
PatchSet 6509 
Date: 2005/03/17 02:45:51
Author: hno
Branch: lfs-2_5
Tag: (none) 
Log:
*** empty log message ***

Members: 
	configure.in:1.42.2.59.2.4->1.42.2.59.2.5 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.42.2.59.2.4
retrieving revision 1.42.2.59.2.5
diff -u -r1.42.2.59.2.4 -r1.42.2.59.2.5
--- squid/configure.in	16 Mar 2005 22:42:28 -0000	1.42.2.59.2.4
+++ squid/configure.in	17 Mar 2005 02:45:51 -0000	1.42.2.59.2.5
@@ -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.4 2005/03/16 22:42:28 hno Exp $
+dnl  $Id: configure.in,v 1.42.2.59.2.5 2005/03/17 02:45:51 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.4 $)dnl
+AC_REVISION($Revision: 1.42.2.59.2.5 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -753,7 +753,7 @@
 
 AC_ARG_WITH(large-files,
 [  --with-large-files      Enable support for large files (logs etc).],
-[ if test "$enableval" = yes; then
+[ if test "$withval" = yes; then
 	needlargefiles=1
   fi
 ])
@@ -781,7 +781,8 @@
                           XBS5_ILP32_OFF32       32 bits (legacy)
                           XBS5_ILP32_OFFBIG      32 bits with large file support (legacy)
                           XBS5_LP64_OFF64        64 bits (legacy)
-                          XBS5_LPBIG_OFFBIG      large pointers and files (legacy)],
+                          XBS5_LPBIG_OFFBIG      large pointers and files (legacy)
+                          default                The default for your OS],
 [ case "$enableval" in
   yes|no)
 	echo "--with-build-environment expects a build environment string as used by getconf"
@@ -795,20 +796,37 @@
 	;;
   esac
 ])
+
 if test $needlargefiles && test -z "$buildmodel"; 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
+	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"
 		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"; then
+if test -n "$buildmodel" && test "$buildmodel" != "default"; then
 	echo "Using $buildmodel build environment"
 	CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS"
 	LIBS="`getconf ${buildmodel}_LIBS` $LIBS"