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 c383613d6bee522a30db611a9eae55dc05b1fdbe..e465ab316bad8cd54d12ea6aacf3db53ec4f1970 100755 (executable)
--- 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 7b117588e0aa372e11195dc95d7870a246fd3a30..71ec71226a70b0ac359354a182726a7729599325 100755 (executable)
--- 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,