aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-19 00:24:43 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-19 00:24:43 +0000
commit66b6366e1c60aaa58d2d9aa4eba22ad0e77cd832 (patch)
tree99c65092f8765ad80aadc9c3db07a08c8d4fa394
parent6c5ba93713c6c672372637c09fa06ca9a2d98b2c (diff)
downloadruby-66b6366e1c60aaa58d2d9aa4eba22ad0e77cd832.tar.gz
* configure.in, win32/Makefile.sub (LIBS): need to link shell32
library for SH* functions on mswin32 and mingw32. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
-rw-r--r--win32/Makefile.sub2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b5b15bd985..8099ac6b37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 19 09:19:27 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * configure.in, win32/Makefile.sub (LIBS): need to link shell32
+ library for SH* functions on mswin32 and mingw32.
+
Thu Aug 19 03:07:00 2004 why the lucky stiff <why@ruby-lang.org>
* lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
diff --git a/configure.in b/configure.in
index 453a61e5c4..89a9ba8068 100644
--- a/configure.in
+++ b/configure.in
@@ -291,7 +291,7 @@ cygwin*) rb_cv_have_daylight=no
ac_cv_func__setjmp=no
ac_cv_func_setitimer=no
;;
-mingw*) LIBS="-lwsock32 $LIBS"
+mingw*) LIBS="-lshell32 -lwsock32 $LIBS"
ac_cv_header_a_out_h=no
ac_cv_header_pwd_h=no
ac_cv_header_utime_h=no
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 53b161e7aa..4717b1572a 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -125,7 +125,7 @@ RFLAGS = -r
!if !defined(EXTLIBS)
EXTLIBS =
!endif
-LIBS = oldnames.lib user32.lib advapi32.lib wsock32.lib $(EXTLIBS)
+LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(EXTLIBS)
MISSING = acosh.obj crypt.obj erf.obj win32.obj
ARFLAGS = -machine:$(MACHINE) -out: