diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:37:10 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:37:10 +0000 |
| commit | bcdcde3c64cbb3d0121640013ce8fa6fc8d9692a (patch) | |
| tree | 6ba526578080d4c5ef1ed0d78381d2f631996f90 /configure.in | |
| parent | b3ee04c74650f4bc4eec6c31f2a25baad0ea531e (diff) | |
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
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 7 insertions, 1 deletions
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, [{ |