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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 17 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f2df28fc74..5ddb2f13be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jun  8 01:36:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* win32/mkexports.rb: deal with __fastcall name decorations.
diff --git a/configure.in b/configure.in
index 051043d8bf..4183cc55f5 100644
--- a/configure.in
+++ b/configure.in
@@ -234,7 +234,12 @@ else
 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 @@ case "$build_os" in
   *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 @@ else
   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, [{
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f02003fb27..3e80cb0240 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1086,6 +1086,7 @@ LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
 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
diff --git a/mkconfig.rb b/mkconfig.rb
index fdc3dcf0af..bffefdad14 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -68,7 +68,7 @@ File.foreach "config.status" do |line|
   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
diff --git a/version.h b/version.h
index 59aebc2836..945073beeb 100644
--- a/version.h
+++ b/version.h
@@ -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