Mercurial > hg > octave-nkf
changeset 13957:c510048901cc
set cross compile defaults for AC_RUN_IFELSE
* acinclude.m4 (OCTAVE_CHECK_FORTRAN_INTEGER_SIZE): If cross
compiling, assume integer size is OK.
(OCTAVE_IEEE754_DATA_FORMAT): If cross compiling, assume we have
IEEE 754 data format.
(OCTAVE_UMFPACK_SEPERATE_SPLIT): If cross compiling, assume we have
modern UMFPACK.
(OCTAVE_CHECK_QHULL_OK): If cross compiling, assume Qhull library
works.
(OCTAVE_FAST_INT_OPS): If cross compiling, assume fast int ops are
possible. Use AC_CACHE_CHECK.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 29 Nov 2011 03:35:40 -0500 |
| parents | 5fe75fb673ff |
| children | cb15c5185b6a |
| files | m4/acinclude.m4 |
| diffstat | 1 files changed, 20 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -370,7 +370,8 @@ assert (in[0] == out[0] && in[1] == out[1]); ]])], [octave_cv_fortran_integer_size=yes], - [octave_cv_fortran_integer_size=no]) + [octave_cv_fortran_integer_size=no], + [octave_cv_fortran_integer_size=yes]) AC_LANG_POP(C)dnl LIBS="$octave_fintsize_save_LIBS" rm -f conftest.$ac_objext fintsize.$ac_objext @@ -818,7 +819,7 @@ }]])], octave_cv_ieee754_data_format=yes, octave_cv_ieee754_data_format=no, - octave_cv_ieee754_data_format=no)]) + octave_cv_ieee754_data_format=yes)]) if test "$cross_compiling" = yes; then AC_MSG_RESULT([$octave_cv_ieee754_data_format assumed for cross compilation]) else @@ -881,7 +882,7 @@ ]])], octave_cv_umfpack_seperate_split=yes, octave_cv_umfpack_seperate_split=no, - octave_cv_umfpack_seperate_split=no)]) + octave_cv_umfpack_seperate_split=yes)]) if test "$cross_compiling" = yes; then AC_MSG_RESULT([$octave_cv_umfpack_seperate_split assumed for cross compilation]) else @@ -962,7 +963,10 @@ coordT points[8] = { -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5 }; boolT ismalloc = 0; return qh_new_qhull (dim, n, points, ismalloc, "qhull ", 0, stderr); -]])], [octave_cv_lib_qhull_ok=yes], [octave_cv_lib_qhull_ok=no])]) +]])], + [octave_cv_lib_qhull_ok=yes], + [octave_cv_lib_qhull_ok=no], + [octave_cv_lib_qhull_ok=yes])]) if test "$octave_cv_lib_qhull_ok" = "yes"; then $1 else @@ -1337,9 +1341,10 @@ dnl 4. Bit operations on signed integers work like on unsigned integers, dnl except for the shifts. Shifts are arithmetic. dnl -AC_DEFUN([OCTAVE_FAST_INT_OPS],[ -AC_MSG_CHECKING([whether fast integer arithmetics is usable]) -AC_LANG_PUSH(C++) +AC_DEFUN([OCTAVE_FAST_INT_OPS], +[AC_CACHE_CHECK([whether fast integer arithmetics is usable], +octave_cv_fast_int_ops, +[AC_LANG_PUSH(C++) AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <limits> template<class UT, class ST> @@ -1383,10 +1388,15 @@ DO_TEST(long long) #endif ]])], -[AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FAST_INT_OPS,1,[Define if signed integers use two's complement])], -[AC_MSG_RESULT([no])]) + [octave_cv_fast_int_ops=yes], + [octave_cv_fast_int_ops=no], + [octave_cv_fast_int_ops=yes]) AC_LANG_POP(C++)]) +if test $octave_cv_fast_int_ops = yes; then + AC_DEFINE(HAVE_FAST_INT_OPS, 1, + [Define if signed integers use two's complement]) +fi +]) dnl dnl Check to see if the compiler and the linker can handle the flags dnl "-framework $1" for the given prologue $2 and the given body $3 of