nobu	2008-08-09 21:10:54 +0900 (Sat, 09 Aug 2008)

  New Revision: 18456

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18456

  Log:
    * configure.in (rb_cv_rshift_sign, rb_cv_binary_elf): get rid of
      AC_TRY_RUN.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 18455)
+++ configure.in	(revision 18456)
@@ -979,18 +979,9 @@
 fi
 
 AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
-    [AC_TRY_RUN([
-int
-main()
-{
-  if (-1==(-1>>1))
-    return 0;
-  return 1;
-}
-],
+    [AC_COMPILE_IFELSE(AC_LANG_BOOL_COMPILE_TRY([], [(-1==(-1>>1))]),
 	rb_cv_rshift_sign=yes,
-	rb_cv_rshift_sign=no,
-	rb_cv_rshift_sign=yes)])
+	rb_cv_rshift_sign=no)])
 if test "$rb_cv_rshift_sign" = yes; then
   AC_DEFINE(RSHIFT(x,y), ((x)>>(int)y))
 else
@@ -1232,26 +1223,16 @@
 	esac], [with_dln_a_out=no])
 
 AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
-[AC_TRY_RUN([
-/* Test for whether ELF binaries are produced */
-#include <fcntl.h>
-#include <stdlib.h>
-main() {
-	char buffer[4];
-	int i=open("conftest",O_RDONLY);
-	if(i==-1)
-		exit(1); /* fail */
-	if(read(i,&buffer[0],4)<4)
-		exit(1); /* fail */
-	if(buffer[0] != 127 || buffer[1] != 'E' ||
-           buffer[2] != 'L' || buffer[3] != 'F')
-		exit(1); /* fail */
-	exit(0); /* succeed (yes, it's ELF) */
-}
-],
-rb_cv_binary_elf=yes,
-rb_cv_binary_elf=no,
-rb_cv_binary_elf=yes)])
+[AC_TRY_LINK([],[], [
+case "`head -1 conftest$EXEEXT | cat -e`" in
+dnl (
+'^?ELF'*)
+    rb_cv_binary_elf=yes;;
+dnl (
+*)
+    rb_cv_binary_elf=no;;
+esac],
+rb_cv_binary_elf=no)])
 
 if test "$rb_cv_binary_elf" = yes; then
   AC_DEFINE(USE_ELF)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18455)
+++ ChangeLog	(revision 18456)
@@ -1,3 +1,8 @@
+Sat Aug  9 21:10:51 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (rb_cv_rshift_sign, rb_cv_binary_elf): get rid of
+	  AC_TRY_RUN.
+
 Sat Aug  9 19:28:50 2008  Tanaka Akira  <akr@f...>
 
 	* transcode.c (transcode_char_start): arguments changed.
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 18455)
+++ ruby_1_8/configure.in	(revision 18456)
@@ -848,16 +848,8 @@
 fi
 
 AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
-    [AC_TRY_RUN([
-int
-main()
-{
-  if (-1==(-1>>1))
-    return 0;
-  return 1;
-}
-],
-	rb_cv_rshift_sign=yes,
+    [AC_COMPILE_IFELSE(AC_LANG_BOOL_COMPILE_TRY([], [(-1==(-1>>1))]),
+    	rb_cv_rshift_sign=yes,
 	rb_cv_rshift_sign=no,
 	rb_cv_rshift_sign=yes)])
 if test "$rb_cv_rshift_sign" = yes; then
@@ -1107,26 +1099,16 @@
 	esac], [with_dln_a_out=no])
 
 AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
-[AC_TRY_RUN([
-/* Test for whether ELF binaries are produced */
-#include <fcntl.h>
-#include <stdlib.h>
-main() {
-	char buffer[4];
-	int i=open("conftest",O_RDONLY);
-	if(i==-1)
-		exit(1); /* fail */
-	if(read(i,&buffer[0],4)<4)
-		exit(1); /* fail */
-	if(buffer[0] != 127 || buffer[1] != 'E' ||
-           buffer[2] != 'L' || buffer[3] != 'F')
-		exit(1); /* fail */
-	exit(0); /* succeed (yes, it's ELF) */
-}
-],
-rb_cv_binary_elf=yes,
-rb_cv_binary_elf=no,
-rb_cv_binary_elf=yes)])
+[AC_TRY_LINK([],[], [
+case "`head -1 conftest$EXEEXT | cat -e`" in
+dnl (
+'^?ELF'*)
+    rb_cv_binary_elf=yes;;
+dnl (
+*)
+    rb_cv_binary_elf=no;;
+esac],
+rb_cv_binary_elf=no)])
 
 if test "$rb_cv_binary_elf" = yes; then
   AC_DEFINE(USE_ELF)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18455)
+++ ruby_1_8/ChangeLog	(revision 18456)
@@ -1,3 +1,8 @@
+Sat Aug  9 21:10:51 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (rb_cv_rshift_sign, rb_cv_binary_elf): get rid of
+	  AC_TRY_RUN.
+
 Sat Aug  9 13:35:08 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/