diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Mon Mar 17 16:41:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in: unset GREP_OPTIONS. [ruby-core:15918] + Fri Mar 14 16:59:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (RUBY_LIB_PREFIX): fix for prefix. diff --git a/configure.in b/configure.in index 342cca90eb..c8fdca42d1 100644 --- a/configure.in +++ b/configure.in @@ -44,10 +44,20 @@ fi GNU_LD=$rb_cv_prog_gnu_ld AC_SUBST(GNU_LD)]) +unset GREP_OPTIONS rb_version=`grep RUBY_VERSION $srcdir/version.h` MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'` MINOR=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*"'` TEENY=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)"'` +if test "$MAJOR" = ""; then + AC_MSG_ERROR(could not determine MAJOR number from version.h) +fi +if test "$MINOR" = ""; then + AC_MSG_ERROR(could not determine MINOR number from version.h) +fi +if test "$TEENY" = ""; then + AC_MSG_ERROR(could not determine TEENY number from version.h) +fi AC_SUBST(MAJOR) AC_SUBST(MINOR) AC_SUBST(TEENY) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-03-14" +#define RUBY_RELEASE_DATE "2008-03-17" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080314 +#define RUBY_RELEASE_CODE 20080317 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 17 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |