diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-04 11:27:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-04 11:27:12 +0000 |
| commit | b50e5ac832b50da22867f102432866dfab379302 (patch) | |
| tree | 9d3643b0a95560997a6d8c05c7a9f8f17dab1a62 | |
| parent | 441ff7ac9d5e692060a7dce408835a0c9f0d1310 (diff) | |
| download | ruby-b50e5ac832b50da22867f102432866dfab379302.tar.gz ruby-b50e5ac832b50da22867f102432866dfab379302.tar.xz ruby-b50e5ac832b50da22867f102432866dfab379302.zip | |
* configure.in (mingw): checks if unicows.lib is available.
* win32/Makefile.sub (LIBS): links unicows.lib if available.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
3 files changed, 10 insertions, 1 deletions
@@ -1,7 +1,11 @@ -Wed Mar 4 19:35:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Mar 4 20:27:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (mingw): checks if unicows.lib is available. * include/ruby/win32.h (WIN95): moved to config.h + * win32/Makefile.sub (LIBS): links unicows.lib if available. + * win32/Makefile.sub (config.h): defines WIN95 only if unicows.lib is available. diff --git a/configure.in b/configure.in index ab9f1c4e4..1946ffcea 100644 --- a/configure.in +++ b/configure.in @@ -709,6 +709,8 @@ when(mingw*) LIBS="-lshell32 -lws2_32 $LIBS" ac_cv_func_fcntl=yes ac_cv_func_flock=yes AC_LIBOBJ([langinfo]) + AC_HAVE_LIBRARY(unicows, [LIBS="-lunicows $LIBS" + AC_DEFINE(WIN95)]) ;; when(os2-emx*) LIBS="-lm $LIBS" ac_cv_lib_dir_opendir=no;; diff --git a/win32/Makefile.sub b/win32/Makefile.sub index b79c351db..2f264eeb9 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -178,6 +178,9 @@ EXTLIBS = !if !defined(LIBS) LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib $(EXTLIBS) !endif +!if defined(HAVE_UNICOWS) +LIBS = unicows.lib $(LIBS) +!endif !if !defined(MISSING) MISSING = acosh.obj cbrt.obj crypt.obj erf.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj langinfo.obj !endif |