diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:39:56 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:39:56 +0000 |
| commit | 2f2497ee534fe7cdc5ffab2bda5e7446b9f42b76 (patch) | |
| tree | 3f627152b86976f39249d246480e32807b2523ef /configure.in | |
| parent | 2a71b1ca87fbb96e1d4fe6ed598d6e931034d0c4 (diff) | |
merges r21517 and r21519 from trunk into ruby_1_9_1.
* configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw
and mswin.
* encoding.c (rb_locale_charmap): use environments on mingw and mswin.
* missing/langinfo.c (nl_langinfo_codeset): MS-Windows Japanese
environment uses Windows-31J derived from Shift_JIS, not EUC-JP.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 3f4a3e169d..5601e9a408 100644 --- a/configure.in +++ b/configure.in @@ -599,6 +599,7 @@ mingw*) LIBS="-lshell32 -lws2_32 $LIBS" rb_cv_binary_elf=no rb_cv_negative_time_t=no ac_cv_func_fcntl=yes + AC_LIBOBJ([langinfo]) ;; os2-emx*) LIBS="-lm $LIBS" ac_cv_lib_dir_opendir=no;; |