shyouhei	2008-06-08 01:37:10 +0900 (Sun, 08 Jun 2008)

  New Revision: 16895

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/configure.in
    branches/ruby_1_8_6/lib/mkmf.rb
    branches/ruby_1_8_6/mkconfig.rb
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 13695:
    * configure.in (AC_SYS_LARGEFILE): keep results also in command
      options, to vail out of mismatch.  [ruby-list:44114]
    * mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=16895&r2=16894&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16895&r2=16894&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/configure.in?r1=16895&r2=16894&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/lib/mkmf.rb?r1=16895&r2=16894&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/mkconfig.rb?r1=16895&r2=16894&diff_format=u

Index: ruby_1_8_6/configure.in
===================================================================
--- ruby_1_8_6/configure.in	(revision 16894)
+++ ruby_1_8_6/configure.in	(revision 16895)
@@ -234,7 +234,12 @@
 fi
 
 dnl check for large file stuff
+mv confdefs.h confdefs1.h
+: > confdefs.h
 AC_SYS_LARGEFILE
+mv confdefs.h largefile.h
+mv confdefs1.h confdefs.h
+cat largefile.h >> confdefs.h
 
 AC_CHECK_TYPES([long long, off_t])
 
@@ -1504,6 +1509,7 @@
   *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
 esac
 
+CPPFLAGS="$CPPFLAGS "'$(DEFS)'
 AC_SUBST(XCFLAGS)dnl
 AC_SUBST(XLDFLAGS)dnl
 AC_SUBST(LIBRUBY_LDSHARED)
@@ -1640,7 +1646,7 @@
   echo "creating config.h"
   tr -d '\015' < confdefs.h > config.h
 fi
-: > confdefs.h
+tr -d '\015' < largefile.h > confdefs.h
 
 AC_CONFIG_FILES($FIRSTMAKEFILE)
 AC_CONFIG_FILES(Makefile, [{
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 16894)
+++ ruby_1_8_6/ChangeLog	(revision 16895)
@@ -1,3 +1,10 @@
+Sun Jun  8 01:36:26 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (AC_SYS_LARGEFILE): keep results also in command
+	  options, to vail out of mismatch.  [ruby-list:44114]
+
+	* mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.
+
 Sun Jun  8 01:31:17 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/mkexports.rb: deal with __fastcall name decorations.
Index: ruby_1_8_6/mkconfig.rb
===================================================================
--- ruby_1_8_6/mkconfig.rb	(revision 16894)
+++ ruby_1_8_6/mkconfig.rb	(revision 16895)
@@ -68,7 +68,7 @@
   end
 
   if name
-    next if /^(?:ac_.*|DEFS|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
+    next if /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
     next if /^\$\(ac_\w+\)$/ =~ val
     next if /^\$\{ac_\w+\}$/ =~ val
     next if /^\$ac_\w+$/ =~ val
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 16894)
+++ ruby_1_8_6/version.h	(revision 16895)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 132
+#define RUBY_PATCHLEVEL 133
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/lib/mkmf.rb
===================================================================
--- ruby_1_8_6/lib/mkmf.rb	(revision 16894)
+++ ruby_1_8_6/lib/mkmf.rb	(revision 16895)
@@ -1086,6 +1086,7 @@
 RUBY_EXTCONF_H = #{$extconf_h}
 CFLAGS   = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
 INCFLAGS = -I. #$INCFLAGS
+DEFS     = #{CONFIG['DEFS']}
 CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
 CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
 DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG

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