From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Mon, 7 Jul 2008 21:59:57 +0000 (+0200)
Subject: Make --with-large-files and --with-build-envirnment=default play nice together
X-Git-Tag: SQUID_3_1_0_1~49^2~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b8002de3ae96a7dbd883b4b169fba7ba49da966;p=thirdparty%2Fsquid.git

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.in b/configure.in
index c4eb8ae99f..4a06e95bea 100755
--- a/configure.in
+++ b/configure.in
@@ -1287,11 +1287,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
@@ -1343,7 +1349,7 @@ dnl "-64" from LDFLAGS
 	    *)
 	        ;;
 	esac
-fi
+esac
 
 dnl Enable Linux transparent proxy support for obsolete TPROXY
 AC_ARG_ENABLE(linux-tproxy,