diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-12-20 22:26:17 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-12-20 22:27:59 +0200 |
| commit | faa91fe347ad49fa9ae41323cff2714a78cd6a36 (patch) | |
| tree | 587b1fb95d5c88ec1f9fdc6a80547b445bee5b0d /configure.in | |
| parent | bbe9cf453c9fd1809e6802e01bf959f7de7e9de9 (diff) | |
Require ac_cv_alignof_* env vars if we don't have AC_CHECK_ALIGNOF
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/configure.in b/configure.in index c60a4ecbd404..579ce76cf58c 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 |