summaryrefslogtreecommitdiff
path: root/win32/Makefile.sub
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-19 05:17:43 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-19 05:17:43 +0000
commite668a019a7142c98d0f17b138413941827240c3e (patch)
treecd6915c75987b0ef8a1a74001b87f432f8efe01d /win32/Makefile.sub
parent9cc12e803b48bf9deca912862f90d8a7b92c4d4c (diff)
* win32/Makefile.sub (config.status): include winsock2.h instead of
winsock.h when --with-winsock2 is specified. fixed: [ruby-dev:29296] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
-rw-r--r--win32/Makefile.sub4
1 files changed, 4 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 975ef49..db73733 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -424,7 +424,11 @@ s,@RULE_SUBST@,{.;$$(srcdir);$$(topdir);$$(hdrdir)}%s,;t t
s,@TRY_LINK@,$$(CC) -Feconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS) -link $$(LDFLAGS) $$(LIBPATH) $$(XLDFLAGS),;t t
s,@COMMON_LIBS@,m,;t t
s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN;t t
+!if defined(USE_WINSOCK2)
+s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
+!else
s,@COMMON_HEADERS@,windows.h winsock.h,;t t
+!endif
s,@DISTCLEANFILES@,vc*.pdb,;t t
s,@EXPORT_PREFIX@, ,;t t
s,@arch@,$(ARCH)-$(OS),;t t