From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sat, 12 Jul 2008 12:45:55 +0000 (-0600)
Subject: Author: Henrik Nordstrom <henrik@henriknordstrom.net>
X-Git-Tag: SQUID_3_0_STABLE8~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b91d363e8a1930b322b8ec20dc9e5af7e635906;p=thirdparty%2Fsquid.git

Author: Henrik Nordstrom <henrik@henriknordstrom.net>
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.
---

diff --git a/configure b/configure
index c383613d6b..e465ab316b 100755
--- a/configure
+++ b/configure
@@ -22134,11 +22134,17 @@ if test $needlargefiles && test -z "$buildmodel"; then
 	if test -z "$buildmodel"; then
 		echo "WARNING: No suitable build environment found for large files. Trying to use _FILE_OFFSET_BITS=64"
 		sleep 1
+	fi
+fi
+case "$buildmodel" in
+default|"")
+	if test "$needlargefiles"; then
+		echo "Enabling -D_FILE_OFFSET_BITS=64"
 		CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
 		CXXFLAGS="-D_FILE_OFFSET_BITS=64 $CXXFLAGS"
 	fi
-fi
-if test -n "$buildmodel" && test "$buildmodel" != "default"; then
+	;;
+*)
 	echo "Using $buildmodel build environment"
 	if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
 	    : # All fine
@@ -22177,7 +22183,8 @@ if test -n "$buildmodel" && test "$buildmodel" != "default"; then
 	    *)
 	        ;;
 	esac
-fi
+	;;
+esac
 
 # Check whether --enable-linux-tproxy was given.
 if test "${enable_linux_tproxy+set}" = set; then
diff --git a/configure.in b/configure.in
index 7b117588e0..71ec71226a 100755
--- a/configure.in
+++ b/configure.in
@@ -1182,11 +1182,17 @@ if test $needlargefiles && test -z "$buildmodel"; then
 	if test -z "$buildmodel"; then
 		echo "WARNING: No suitable build environment found for large files. Trying to use _FILE_OFFSET_BITS=64"
 		sleep 1
+	fi
+fi
+case "$buildmodel" in
+default|"")
+	if test "$needlargefiles"; then
+		echo "Enabling -D_FILE_OFFSET_BITS=64"
 		CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
 		CXXFLAGS="-D_FILE_OFFSET_BITS=64 $CXXFLAGS"
 	fi
-fi
-if test -n "$buildmodel" && test "$buildmodel" != "default"; then
+	;;
+*)
 	echo "Using $buildmodel build environment"
 	if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
 	    : # All fine
@@ -1238,7 +1244,8 @@ dnl "-64" from LDFLAGS
 	    *)
 	        ;;
 	esac
-fi
+	;;
+esac
 
 dnl Enable Linux transparent proxy support
 AC_ARG_ENABLE(linux-tproxy,