From 77a3265038d2f550b900593238f263dd6cc14cfd Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 13 Aug 2009 09:22:12 +0000 Subject: * configure.in (RUBY_CHECK_SIZEOF): use AC_COMPUTE_INT instead of _AC_COMPUTE_INT_COMPILE with cross compiling, since its arguments have been changed at autoconf 2.64. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ configure.in | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e196edd4..0de9b6407 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Aug 13 18:22:08 2009 Nobuyoshi Nakada + + * configure.in (RUBY_CHECK_SIZEOF): use AC_COMPUTE_INT instead of + _AC_COMPUTE_INT_COMPILE with cross compiling, since its arguments + have been changed at autoconf 2.64. + Thu Aug 13 16:31:10 2009 Nobuyoshi Nakada * insns.def (opt_case_dispatch): suppressed a warning. diff --git a/configure.in b/configure.in index e8e919e82..77b4a53c0 100644 --- a/configure.in +++ b/configure.in @@ -189,6 +189,7 @@ if test ${target_archs+set}; then target=`echo $target | sed "s/^$target_cpu-/universal-/"` target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"` target_cpu=universal + cross_compiling=yes else target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"` target_alias=`echo $target_alias | sed "s/^$target_cpu-/${target_archs}-/"` @@ -380,7 +381,7 @@ esac AC_CHECK_TYPES([long long, off_t]) AC_CACHE_CHECK([char bit], [rb_cv_char_bit], - [_AC_COMPUTE_INT_COMPILE([CHAR_BIT], [rb_cv_char_bit], + [AC_COMPUTE_INT([CHAR_BIT], [rb_cv_char_bit], [AC_INCLUDES_DEFAULT([@%:@include ])], [rb_cv_char_bit=8])]) dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include] @@ -426,14 +427,14 @@ static ac__type_sizeof_ *rbcv_ptr; m4_ifval([$2][$3], [case "${AS_TR_SH(ac_cv_sizeof_$1)}" in when([SIZEOF_*]);; when(*)]) - _AC_COMPUTE_INT_COMPILE(AS_TR_CPP(SIZEOF_$1), [t], [AC_INCLUDES_DEFAULT([$4])] + AC_COMPUTE_INT(AS_TR_CPP(SIZEOF_$1), [t], [AC_INCLUDES_DEFAULT([$4])] [${cond+$cond @%:@else} $rbcv_var ${cond+@%:@endif} @%:@ifndef AS_TR_CPP(SIZEOF_$1) @%:@define AS_TR_CPP(SIZEOF_$1) 0 -@%:@endif], [unset t]) +@%:@endif], [t=0]) if test ${t-0} != 0; then AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}" fi -- cgit