diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | lib/mkmf.rb | 1 | ||||
| -rwxr-xr-x | mkconfig.rb | 2 |
4 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Sun Oct 14 04:08:34 2007 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 Oct 14 03:55:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/mkexports.rb: deal with __fastcall name decorations. diff --git a/configure.in b/configure.in index c99d846cd9..e61979ed06 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 bf642dc5ec..703a7ca8fc 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1156,6 +1156,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 |