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 c4eb8ae99f2eed3f14b640896c58710991838a8c..4a06e95bea02a31d6f78f6ba4de6833b8c1ffa72 100755 (executable)
--- 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,