[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |   32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

New commits:
commit 1707a6678e492b2f19e82f68f0ec687c94ed7f9d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Feb 2 14:32:35 2011 +0200

    Bypass more unneeded tests for Windows builds
    
    The SIZEOF_LONG and WORDS_BIGENDIAN tests failed anyway because CC has
    already been set to point to MSVC, but no required include and library
    paths got used in the tests. The large file support test is equally
    unnecessary, Windows has large file support and no special compilation
    flags are needed.
    
    Just hardcode the known values of the substitution variables for
    Windows.

diff --git a/configure.in b/configure.in
index b427511..49ea9bc 100755
--- a/configure.in
+++ b/configure.in
@@ -2393,23 +2393,27 @@ dnl ===================================================================
    else
       AC_PROG_CPP
    fi
-fi
 
-AC_CHECK_SIZEOF(long)
-SIZEOF_LONG=$ac_cv_sizeof_long
-AC_SUBST(SIZEOF_LONG)
-AC_C_BIGENDIAN
-WORDS_BIGENDIAN=$ac_cv_c_bigendian
-AC_SUBST(WORDS_BIGENDIAN)
+   AC_CHECK_SIZEOF(long)
+   SIZEOF_LONG=$ac_cv_sizeof_long
+   AC_C_BIGENDIAN
+   WORDS_BIGENDIAN=$ac_cv_c_bigendian
 
-dnl Check for large file support
-AC_SYS_LARGEFILE
-if test -n "$ac_cv_sys_file_offset_bits"; then
-   LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-fi
-if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; then
-   LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES"
+   dnl Check for large file support
+   AC_SYS_LARGEFILE
+   if test -n "$ac_cv_sys_file_offset_bits"; then
+      LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+   fi
+   if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; then
+      LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES"
+   fi
+else
+   SIZEOF_LONG=4
+   WORDS_BIGENDIAN=no
+   LFS_CFLAGS=''
 fi
+AC_SUBST(SIZEOF_LONG)
+AC_SUBST(WORDS_BIGENDIAN)
 AC_SUBST(LFS_CFLAGS)
 
 dnl ===================================================================