[前][次][番号順一覧][スレッド一覧]

ruby-changes:11159

From: nobu <ko1@a...>
Date: Wed, 4 Mar 2009 20:27:23 +0900 (JST)
Subject: [ruby-changes:11159] Ruby:r22764 (trunk): * configure.in (mingw): checks if unicows.lib is available.

nobu	2009-03-04 20:27:12 +0900 (Wed, 04 Mar 2009)

  New Revision: 22764

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22764

  Log:
    * configure.in (mingw): checks if unicows.lib is available.
    * win32/Makefile.sub (LIBS): links unicows.lib if available.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/win32/Makefile.sub

Index: configure.in
===================================================================
--- configure.in	(revision 22763)
+++ configure.in	(revision 22764)
@@ -709,6 +709,8 @@
 		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;;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22763)
+++ ChangeLog	(revision 22764)
@@ -1,7 +1,11 @@
-Wed Mar  4 19:35:26 2009  Nobuyoshi Nakada  <nobu@r...>
+Wed Mar  4 20:27:10 2009  Nobuyoshi Nakada  <nobu@r...>
 
+	* 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.
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 22763)
+++ win32/Makefile.sub	(revision 22764)
@@ -178,6 +178,9 @@
 !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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]