merge revision(s) 15123:

shyouhei · shyouhei · commit d9e5857dfeca · 2008-06-11T06:00:30.000Z
* configure.in: Remove wrong assumptions about Cygwin. a patch from Corinna Vinschen in [ruby-Bugs-17018]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 11 14:58:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: Remove wrong assumptions about Cygwin.  a patch from
+	  Corinna Vinschen in [ruby-Bugs-17018].
+
 Mon Jun  9 18:03:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (eval): check if backtrace is empty.  [ruby-core:15040]
diff --git a/configure.in b/configure.in
@@ -336,11 +336,7 @@ human*)		ac_cv_func_getpgrp_void=yes
 		ac_cv_func_setitimer=no
 		;;
 beos*)		ac_cv_func_link=no;;
-cygwin*)	rb_cv_have_daylight=no
-		ac_cv_var_tzname=no
-		ac_cv_func__setjmp=no
-		ac_cv_func_setitimer=no
-		;;
+cygwin*)	;;
 mingw*)		if test "$with_winsock2" = yes; then
 		  LIBS="-lws2_32 $LIBS"
 		else
@@ -1456,7 +1452,6 @@ case "$target_os" in
 		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
 		LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
 	    fi
-	    AC_LIBOBJ([strftime])
 	    ;;
 	mingw*)
 	    RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
diff --git a/version.h b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2008-06-09"
+#define RUBY_RELEASE_DATE "2008-06-11"
 #define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20080609
-#define RUBY_PATCHLEVEL 166
+#define RUBY_RELEASE_CODE 20080611
+#define RUBY_PATCHLEVEL 167
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 11
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
