1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@24528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-08-13 09:22:12 +00:00
parent 72072e6343
commit c9e7e6617b
2 changed files with 10 additions and 3 deletions

View file

@ -1,3 +1,9 @@
Thu Aug 13 18:22:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org> Thu Aug 13 16:31:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* insns.def (opt_case_dispatch): suppressed a warning. * insns.def (opt_case_dispatch): suppressed a warning.

View file

@ -189,6 +189,7 @@ if test ${target_archs+set}; then
target=`echo $target | sed "s/^$target_cpu-/universal-/"` target=`echo $target | sed "s/^$target_cpu-/universal-/"`
target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"` target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"`
target_cpu=universal target_cpu=universal
cross_compiling=yes
else else
target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"` target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"`
target_alias=`echo $target_alias | 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_CHECK_TYPES([long long, off_t])
AC_CACHE_CHECK([char bit], [rb_cv_char_bit], 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])]) [AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])])
dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include] 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 m4_ifval([$2][$3], [case "${AS_TR_SH(ac_cv_sizeof_$1)}" in
when([SIZEOF_*]);; when([SIZEOF_*]);;
when(*)]) 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 [${cond+$cond
@%:@else} @%:@else}
$rbcv_var $rbcv_var
${cond+@%:@endif} ${cond+@%:@endif}
@%:@ifndef AS_TR_CPP(SIZEOF_$1) @%:@ifndef AS_TR_CPP(SIZEOF_$1)
@%:@define AS_TR_CPP(SIZEOF_$1) 0 @%:@define AS_TR_CPP(SIZEOF_$1) 0
@%:@endif], [unset t]) @%:@endif], [t=0])
if test ${t-0} != 0; then 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}" AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}"
fi fi