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

4 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1936238e0c..87bb7419f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jun  8 18:08:18 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* Makefile.in (fake.rb): double the backslash.
+
+Tue Jun  8 18:08:15 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in: should replace COMMON_HEADERS if --with-winsock2 is
+	  specified.  [ruby-dev:41521]
+
 Tue Jun  8 17:49:18 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* io.c, eval.c, process.c: remove all condition of r26371.
diff --git a/Makefile.in b/Makefile.in
index 9eaab0be4d..656ae903f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,7 +134,7 @@ fake.rb:	Makefile
 		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
 		  class File; \
 		    remove_const :ALT_SEPARATOR; \
-		    ALT_SEPARATOR = "\\"; \
+		    ALT_SEPARATOR = "\\\\"; \
 		  end; \
 		end; \
 		' > $@
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)'
diff --git a/version.h b/version.h
index 86410cbf6d..7e4bae61fc 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 287
+#define RUBY_PATCHLEVEL 288
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8