summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in2
-rw-r--r--version.h4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a7747855f3..cf7b75f346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat May 16 09:03:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (ruby_version): now version.h includes
+ include/ruby/version.h, so need to tell to cpp to see
+ $(srcdir)/include. [ruby-core:23468]
+
Fri May 15 17:35:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_shift, rb_ary_shift_m): clears unused elements.
diff --git a/configure.in b/configure.in
index b63c677179..3680a2d107 100644
--- a/configure.in
+++ b/configure.in
@@ -2317,7 +2317,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
echo '#include "version.h"'
echo 'ruby_version=RUBY_LIB_VERSION'
} > conftest.c
- ruby_version="`$CPP -I"${srcdir}" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
+ ruby_version="`$CPP -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
eval $ruby_version
else
RUBY_LIB_VERSION="\"${ruby_version}\""
diff --git a/version.h b/version.h
index 136ebaa12f..e61a138b75 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-05-15"
+#define RUBY_RELEASE_DATE "2009-05-16"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 16
#include "ruby/version.h"