diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 09:26:34 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-08 09:26:34 +0000 |
| commit | 3de31e69edf7f509e4907842435add124893ecfc (patch) | |
| tree | 476f4424815066e2d91217964e568703cf782ee2 /configure.in | |
| parent | c0144a2fbb5f5b7b90c8ab29a79653ce0a4319af (diff) | |
merge revision(s) 28144:
* configure.in: should replace COMMON_HEADERS if --with-winsock2 is
specified. [ruby-dev:41521]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 91c2b544f7..c21f024021 100644 --- a/configure.in +++ b/configure.in @@ -217,6 +217,9 @@ cygwin*|mingw*) esac], [with_winsock2=no]) if test "$with_winsock2" = yes; then AC_DEFINE(USE_WINSOCK2) + COMMON_HEADERS="ws2tcpip.h winsock2.h windows.h" + else + COMMON_HEADERS="windows.h winsock.h" fi esac : ${enable_shared=yes} @@ -1667,7 +1670,6 @@ case "$target_os" in AC_LIBOBJ([win32]) COMMON_LIBS=m # COMMON_MACROS="WIN32_LEAN_AND_MEAN=" - COMMON_HEADERS="windows.h winsock.h" ;; esac LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' |