usa	2010-06-03 18:15:30 +0900 (Thu, 03 Jun 2010)

  New Revision: 28144

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

  Log:
    * configure.in: should replace COMMON_HEADERS if --with-winsock2 is
      specified.  [ruby-dev:41521]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in

Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 28143)
+++ ruby_1_8/configure.in	(revision 28144)
@@ -226,6 +226,9 @@
 		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 @@
 	    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)'
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 28143)
+++ ruby_1_8/ChangeLog	(revision 28144)
@@ -1,3 +1,8 @@
+Thu Jun  3 18:14:15 2010  NAKAMURA Usaku  <usa@r...>
+
+	* configure.in: should replace COMMON_HEADERS if --with-winsock2 is
+	  specified.  [ruby-dev:41521]
+
 Thu Jun  3 01:22:45 2010  Hidetoshi NAGAI  <nagai@a...>
 
 	* ext/tk/lib/tk.rb: fix typo and race condition.

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