---------------------
PatchSet 12333 
Date: 2008/07/21 20:48:23
Author: hno
Branch: SQUID_2_6
Tag: (none) 
Log:
Make --with-large-files and --with-build-envirnment=default play nice together

in this combination we need to add -D_FILE_OFFSET_BITS=64 just as we do when
not finding a suitable build environment.

Members: 
	configure:1.436.2.27->1.436.2.28 
	configure.in:1.416.2.27->1.416.2.28 

Index: squid/configure
===================================================================
RCS file: /cvsroot/squid/squid/configure,v
retrieving revision 1.436.2.27
retrieving revision 1.436.2.28
diff -u -r1.436.2.27 -r1.436.2.28
--- squid/configure	27 Jun 2008 21:27:24 -0000	1.436.2.27
+++ squid/configure	21 Jul 2008 20:48:23 -0000	1.436.2.28
@@ -5229,10 +5229,16 @@
 	if test -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
+case "$buildmodel" in
+"default"|"")
+	if test $needlargefiles; then
+		echo "Enabling -D_FILE_OFFSET_BITS=64 for large file support"
+		CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
+	fi
+	;;
+*)
 	echo "Using $buildmodel build environment"
 	if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
 	    : # All fine
@@ -5263,7 +5269,8 @@
 	    *)
 		;;
 	esac
-fi
+	;;
+esac
 
 # Check whether --enable-linux-tproxy was given.
 if test "${enable_linux_tproxy+set}" = set; then
Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid/squid/configure.in,v
retrieving revision 1.416.2.27
retrieving revision 1.416.2.28
diff -u -r1.416.2.27 -r1.416.2.28
--- squid/configure.in	27 Jun 2008 21:26:34 -0000	1.416.2.27
+++ squid/configure.in	21 Jul 2008 20:48:25 -0000	1.416.2.28
@@ -1,7 +1,7 @@
 dnl
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.416.2.27 2008/06/27 21:26:34 hno Exp $
+dnl  $Id: configure.in,v 1.416.2.28 2008/07/21 20:48:25 hno Exp $
 dnl
 dnl
 dnl
@@ -10,7 +10,7 @@
 AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE
-AC_REVISION($Revision: 1.416.2.27 $)dnl
+AC_REVISION($Revision: 1.416.2.28 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1063,10 +1063,16 @@
 	if test -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
+case "$buildmodel" in
+"default"|"")
+	if test $needlargefiles; then
+		echo "Enabling -D_FILE_OFFSET_BITS=64 for large file support"
+		CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
+	fi
+	;;
+*)
 	echo "Using $buildmodel build environment"
 	if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
 	    : # All fine
@@ -1108,7 +1114,8 @@
 	    *)
 		;;
 	esac
-fi
+	;;
+esac
 
 dnl Enable Linux transparent proxy support
 AC_ARG_ENABLE(linux-tproxy,