shyouhei	2008-07-02 18:04:54 +0900 (Wed, 02 Jul 2008)

  New Revision: 17793

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/lib/mkmf.rb

  Log:
    * configure.in (AC_USE_SYSTEM_EXTENSIONS): instead of AC_AIX
    
    * lib/mkmf.rb (create_tmpsrc): we need to include COMMON_HEADERS,
      namely inclusion of ruby.h, because _GNU_SOURCE is now defined
      	  there (if any) and socket.so requires it on Linux systems.



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

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/mkmf.rb?r1=17793&r2=17792&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=17793&r2=17792&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17793&r2=17792&diff_format=u

Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 17792)
+++ ruby_1_8/configure.in	(revision 17793)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT()
 
-AC_PREREQ(2.58)
+AC_PREREQ(2.60)
 
 AC_DEFUN([RUBY_MINGW32],
 [case "$host_os" in
@@ -240,8 +240,7 @@
 AC_PROG_INSTALL
 
 # checks for UNIX variants that set C preprocessor variables
-AC_AIX
-AC_MINIX
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_SUBST(RM, ['rm -f'])
 AC_SUBST(CP, ['cp'])
@@ -1575,7 +1574,6 @@
 
 case "$target_os" in
     linux*)
-	XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
 	;;
     netbsd*)
     	CFLAGS="$CFLAGS -pipe"
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17792)
+++ ruby_1_8/ChangeLog	(revision 17793)
@@ -1,3 +1,9 @@
+Wed Jul  2 17:48:51 2008  URABE Shyouhei  <shyouhei@r...>
+
+	* lib/mkmf.rb (create_tmpsrc): we need to include COMMON_HEADERS,
+	  namely inclusion of ruby.h, because _GNU_SOURCE is now defined
+	  there (if any) and socket.so requires it on Linux systems.
+
 Tue Jul  1 13:19:44 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_fill): check if beg is too big.
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 17792)
+++ ruby_1_8/lib/mkmf.rb	(revision 17793)
@@ -295,6 +295,7 @@
 
 def create_tmpsrc(src)
   src = yield(src) if block_given?
+  src[0, 0] = COMMON_HEADERS + "\n"
   src = src.gsub(/[ \t]+$/, '').gsub(/\A\n+|^\n+$/, '').sub(/[^\n]\z/, "\\&\n")
   open(CONFTEST_C, "wb") do |cfile|
     cfile.print src
@@ -1768,7 +1769,7 @@
 
 EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
 
-hdr = []
+hdr = ['#include "ruby.h"' "\n"]
 config_string('COMMON_MACROS') do |s|
   Shellwords.shellwords(s).each do |w|
     hdr << "#define " + w.split(/=/, 2).join(" ")

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