shyouhei	2008-06-11 15:00:30 +0900 (Wed, 11 Jun 2008)

  New Revision: 17090

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/configure.in
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 15123:
    * configure.in: Remove wrong assumptions about Cygwin.  a patch from
      Corinna Vinschen in [ruby-Bugs-17018].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/configure.in?r1=17090&r2=17089&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17090&r2=17089&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17090&r2=17089&diff_format=u

Index: ruby_1_8_5/configure.in
===================================================================
--- ruby_1_8_5/configure.in	(revision 17089)
+++ ruby_1_8_5/configure.in	(revision 17090)
@@ -336,11 +336,7 @@
 		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 @@
 		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}
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17089)
+++ ruby_1_8_5/ChangeLog	(revision 17090)
@@ -1,3 +1,8 @@
+Wed Jun 11 14:58:49 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* eval.c (eval): check if backtrace is empty.  [ruby-core:15040]
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17089)
+++ ruby_1_8_5/version.h	(revision 17090)
@@ -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[];

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