diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-17 07:41:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-17 07:41:12 +0000 |
| commit | a4394e3f49eceade8b88db6f3dfd2da89da2accc (patch) | |
| tree | 2e30d27f1d233813ff112486f5b7b335ae54759f | |
| parent | a1bebebed1ab4e86f930e2b3c106d6dc72caf124 (diff) | |
* configure.in: unset GREP_OPTIONS. [ruby-core:15918]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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] + Sun Mar 16 18:07:07 2008 Martin Duerst <duerst@it.aoyama.ac.jp> * enc/trans/utf_16_32.c: bug fix (some invalid UTF-8 sequences diff --git a/configure.in b/configure.in index 253d4b8af1..d94950b21e 100644 --- a/configure.in +++ b/configure.in @@ -63,10 +63,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.9.0" -#define RUBY_RELEASE_DATE "2008-03-16" +#define RUBY_RELEASE_DATE "2008-03-17" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080316 +#define RUBY_RELEASE_CODE 20080317 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |