ruby-changes:12800
From: nobu <ko1@a...>
Date: Thu, 13 Aug 2009 18:22:29 +0900 (JST)
Subject: [ruby-changes:12800] Ruby:r24528 (trunk): * configure.in (RUBY_CHECK_SIZEOF): use AC_COMPUTE_INT instead of
nobu 2009-08-13 18:22:12 +0900 (Thu, 13 Aug 2009) New Revision: 24528 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24528 Log: * 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. Modified files: trunk/ChangeLog trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 24527) +++ configure.in (revision 24528) @@ -189,6 +189,7 @@ 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 @@ 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 <limits.h>])], [rb_cv_char_bit=8])]) dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include] @@ -426,14 +427,14 @@ 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 Index: ChangeLog =================================================================== --- ChangeLog (revision 24527) +++ ChangeLog (revision 24528) @@ -1,3 +1,9 @@ +Thu Aug 13 18:22:08 2009 Nobuyoshi Nakada <nobu@r...> + + * 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 <nobu@r...> * insns.def (opt_case_dispatch): suppressed a warning. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/