[Libreoffice-commits] .: configure.in set_soenv.in

[Tor Lillqvist]

 configure.in |   38 +++++++++++++++++++++++++++++++++++++-
 set_soenv.in |   10 ++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit d04ac2d5c87bd8c835ed44817aa666f24a33602b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat May 14 02:56:37 2011 +0300

    Check more sizes and alignments and propagate to environment

diff --git a/configure.in b/configure.in
index 1306f6b..8e16acd 100755
--- a/configure.in
+++ b/configure.in
@@ -2492,10 +2492,46 @@ else
    WORDS_BIGENDIAN=no
    LFS_CFLAGS=''
 fi
-AC_SUBST(SIZEOF_LONG)
 AC_SUBST(WORDS_BIGENDIAN)
 AC_SUBST(LFS_CFLAGS)
 
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
+AC_CHECK_SIZEOF(long long)
+else
+AC_CHECK_SIZEOF(__int64)
+ac_cv_sizeof_long_long=$ac_cv_sizeof___int64
+fi
+AC_CHECK_SIZEOF(double)
+AC_CHECK_SIZEOF(void*)
+AC_CHECK_ALIGNOF(short)
+AC_CHECK_ALIGNOF(int)
+AC_CHECK_ALIGNOF(long)
+AC_CHECK_ALIGNOF(double)
+
+SIZEOF_SHORT=$ac_cv_sizeof_short
+SIZEOF_INT=$ac_cv_sizeof_int
+SIZEOF_LONGLONG=$ac_cv_sizeof_long_long
+SIZEOF_DOUBLE=$ac_cv_sizeof_double
+SIZEOF_POINTER=$ac_cv_sizeof_voidp
+
+ALIGNOF_SHORT=$ac_cv_alignof_short
+ALIGNOF_INT=$ac_cv_alignof_int
+ALIGNOF_LONG=$ac_cv_alignof_long
+ALIGNOF_DOUBLE=$ac_cv_alignof_double
+
+AC_SUBST(SIZEOF_SHORT)
+AC_SUBST(SIZEOF_INT)
+AC_SUBST(SIZEOF_LONG)
+AC_SUBST(SIZEOF_LONGLONG)
+AC_SUBST(SIZEOF_DOUBLE)
+AC_SUBST(SIZEOF_POINTER)
+AC_SUBST(ALIGNOF_SHORT)
+AC_SUBST(ALIGNOF_INT)
+AC_SUBST(ALIGNOF_LONG)
+AC_SUBST(ALIGNOF_DOUBLE)
+
 dnl ===================================================================
 dnl Check if valgrind.h is available 
 dnl ===================================================================
diff --git a/set_soenv.in b/set_soenv.in
index 4c0910a..005aafb 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1773,6 +1773,16 @@ if ( '@CROSS_COMPILING@' ne '' )
    ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
    ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" );
 }
+ToFile( "SIZEOF_SHORT",         "@SIZEOF_SHORT@", "e" );
+ToFile( "SIZEOF_INT",           "@SIZEOF_INT@",  "e" );
+ToFile( "SIZEOF_LONG",          "@SIZEOF_LONG@", "e" );
+ToFile( "SIZEOF_LONGLONG",      "@SIZEOF_LONGLONG@", "e" );
+ToFile( "SIZEOF_DOUBLE",        "@SIZEOF_DOUBLE@", "e" );
+ToFile( "SIZEOF_POINTER",       "@SIZEOF_POINTER@", "e" );
+ToFile( "ALIGNOF_SHORT",        "@ALIGNOF_SHORT@", "e" );
+ToFile( "ALIGNOF_INT",          "@ALIGNOF_INT@", "e" );
+ToFile( "ALIGNOF_LONG",         "@ALIGNOF_LONG@", "e" );
+ToFile( "ALIGNOF_DOUBLE",       "@ALIGNOF_DOUBLE@", "e" );
 ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
 		"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
 ToFile( "HAVE_GCC_VISIBILITY_BROKEN",