summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-11 06:00:30 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-11 06:00:30 +0000
commitd9e5857dfeca19ab0c5300b7b192dd9ade7f3246 (patch)
tree0dbf176932ab937f27ce41ae5f1e3c32dc32d148
parent27ce75e7e63aac57fd2ed50b9f03b946ffb2cc7e (diff)
merge revision(s) 15123:
* 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
-rw-r--r--ChangeLog5
-rw-r--r--configure.in7
-rw-r--r--version.h8
3 files changed, 10 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index c4308ab08ee..51c46b66649 100644
--- 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
index 4a3c5e79c4f..d662e92d15e 100644
--- 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
index c49a6cac879..db3d3f51771 100644
--- 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[];