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

[Tor Lillqvist]

 configure.in |   42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

New commits:
commit 2a1d6d03303a927e2464017535fd655ac83392e2
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Dec 20 22:54:56 2011 +0200

    Do hardcode alignments for PowerPC Mac OS X

diff --git a/configure.in b/configure.in
index 579ce76..49c9758 100644
--- a/configure.in
+++ b/configure.in
@@ -3346,12 +3346,22 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
             AC_CHECK_ALIGNOF(double,[#include <stddef.h>])
         ],
         [
-           if test -z "$ac_cv_alignof_short" -o \
-                   -z "$ac_cv_alignof_int" -o \
-                   -z "$ac_cv_alignof_long" -o \
-                   -z "$ac_cv_alignof_double"; then
-              AC_MSG_ERROR([Your Autoconf doesn't have [AC_][CHECK_ALIGNOF]. You need to set the environment variables ac_cv_alignof_short, ac_cv_alignof_int, ac_cv_alignof_long and ac_cv_alignof_double.])
-           fi
+            case "$_os-$host_cpu" in
+            Darwin-powerpc)
+                test -z "$ac_cv_alignof_short" && ac_cv_alignof_short=1
+                test -z "$ac_cv_alignof_int" && ac_cv_alignof_int=1
+                test -z "$ac_cv_alignof_long" && ac_cv_alignof_long=1
+                test -z "$ac_cv_alignof_double" && ac_cv_alignof_double=1
+                ;;
+            *)
+                if test -z "$ac_cv_alignof_short" -o \
+                        -z "$ac_cv_alignof_int" -o \
+                        -z "$ac_cv_alignof_long" -o \
+                        -z "$ac_cv_alignof_double"; then
+                   AC_MSG_ERROR([Your Autoconf doesn't have [AC_][CHECK_ALIGNOF]. You need to set the environment variables ac_cv_alignof_short, ac_cv_alignof_int, ac_cv_alignof_long and ac_cv_alignof_double.])
+                fi
+                ;;
+            esac
         ])
 
     ALIGNOF_SHORT=$ac_cv_alignof_short
commit faa91fe347ad49fa9ae41323cff2714a78cd6a36
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Dec 20 22:26:17 2011 +0200

    Require ac_cv_alignof_* env vars if we don't have AC_CHECK_ALIGNOF

diff --git a/configure.in b/configure.in
index c60a4ec..579ce76 100644
--- a/configure.in
+++ b/configure.in
@@ -3339,24 +3339,20 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
     dnl Allow build without AC_CHECK_ALIGNOF, grrr
     m4_pattern_allow([AC_CHECK_ALIGNOF])
     m4_ifdef([AC_CHECK_ALIGNOF],
-      ,
-      [
-         dnl We know that the ALIGNOF_ variables are used only when cross-compiling
-         dnl in sal/typesconfig/makefile.mk...
-         if test "$cross_compiling" = "yes"; then
-            AC_MSG_ERROR([When cross-compiling you must use a recent Autoconf with [AC_][CHECK_ALIGNOF]])
-         fi
-         m4_define([AC_CHECK_ALIGNOF],
-            [
-               AC_MSG_WARN([Cannot determine alignment of $1])
-               AS_TR_SH([ac_cv_alignof_$3])=unknown
-            ])
-      ])
-
-    AC_CHECK_ALIGNOF(short,[#include <stddef.h>])
-    AC_CHECK_ALIGNOF(int,[#include <stddef.h>])
-    AC_CHECK_ALIGNOF(long,[#include <stddef.h>])
-    AC_CHECK_ALIGNOF(double,[#include <stddef.h>])
+        [
+            AC_CHECK_ALIGNOF(short,[#include <stddef.h>])
+            AC_CHECK_ALIGNOF(int,[#include <stddef.h>])
+            AC_CHECK_ALIGNOF(long,[#include <stddef.h>])
+            AC_CHECK_ALIGNOF(double,[#include <stddef.h>])
+        ],
+        [
+           if test -z "$ac_cv_alignof_short" -o \
+                   -z "$ac_cv_alignof_int" -o \
+                   -z "$ac_cv_alignof_long" -o \
+                   -z "$ac_cv_alignof_double"; then
+              AC_MSG_ERROR([Your Autoconf doesn't have [AC_][CHECK_ALIGNOF]. You need to set the environment variables ac_cv_alignof_short, ac_cv_alignof_int, ac_cv_alignof_long and ac_cv_alignof_double.])
+           fi
+        ])
 
     ALIGNOF_SHORT=$ac_cv_alignof_short
     ALIGNOF_INT=$ac_cv_alignof_int