diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-17 08:00:50 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-17 08:00:50 +0000 |
commit | 8fd2e12607f758a46cd677814535fabbf611cdfe (patch) | |
tree | a4d57f1b9e6060b725beebc271e68f7f6e0c2643 /configure.in | |
parent | b249fb0baddde2dea8bff20c83fd5f0082fbbac4 (diff) |
* configure.in (MAJOR, MINOR, TEENY): uses RUBY_VERSION_*.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/configure.in b/configure.in index 3ecdfacc3d..5416ba634b 100644 --- a/configure.in +++ b/configure.in @@ -44,20 +44,12 @@ 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 +eval `sed -n 's/^#define RUBY_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/version.h` +for v in MAJOR MINOR TEENY; do + if eval "test \"\$$v\" = ''"; then + AC_MSG_ERROR(could not determine $v number from version.h) + fi +done AC_SUBST(MAJOR) AC_SUBST(MINOR) AC_SUBST(TEENY) |