diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-03 09:15:30 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-03 09:15:30 +0000 |
| commit | daf6afa3910b64f61e57d9a51a0a69dc352dfda8 (patch) | |
| tree | 83318503728de6b68d1289952cefb278714b49bf | |
| parent | 7563bfdc0d6c9c8d5f6ea20514bce79c908728ca (diff) | |
* 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@28144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jun 3 18:14:15 2010 NAKAMURA Usaku <[email protected]> + + * configure.in: should replace COMMON_HEADERS if --with-winsock2 is + specified. [ruby-dev:41521] + Thu Jun 3 01:22:45 2010 Hidetoshi NAGAI <[email protected]> * ext/tk/lib/tk.rb: fix typo and race condition. diff --git a/configure.in b/configure.in index f64f5ae96c..fcbceb1b03 100644 --- a/configure.in +++ b/configure.in @@ -226,6 +226,9 @@ cygwin*|mingw*) esac], [with_winsock2=no]) if test "$with_winsock2" = yes; then AC_DEFINE(USE_WINSOCK2) + COMMON_HEADERS="winsock2.h windows.h" + else + COMMON_HEADERS="windows.h winsock.h" fi esac : ${enable_shared=yes} @@ -1758,7 +1761,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)' |