nobu	2009-02-05 14:26:22 +0900 (Thu, 05 Feb 2009)

  New Revision: 22074

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22074

  Log:
    * configure.in (MAJOR, MINOR, TEENY): uses RUBY_VERSION_*.
    * mkconfig.rb (prefix): uses ruby_version in config.status.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/mkconfig.rb

Index: configure.in
===================================================================
--- configure.in	(revision 22073)
+++ configure.in	(revision 22074)
@@ -63,20 +63,12 @@
 GNU_LD=$rb_cv_prog_gnu_ld
 AC_SUBST(GNU_LD)])
 
-unset GREP_OPTIONS
-rb_version=`grep '^#define 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)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22073)
+++ ChangeLog	(revision 22074)
@@ -1,3 +1,9 @@
+Thu Feb  5 14:26:16 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (MAJOR, MINOR, TEENY): uses RUBY_VERSION_*.
+
+	* mkconfig.rb (prefix): uses ruby_version in config.status.
+
 Thu Feb  5 12:24:18 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_uniq): gets rid of copying.
Index: mkconfig.rb
===================================================================
--- mkconfig.rb	(revision 22073)
+++ mkconfig.rb	(revision 22074)
@@ -101,6 +101,8 @@
       has_version = true
     when "PATCHLEVEL"
       has_patchlevel = true
+    when "ruby_version"
+      version = val[/\A"(.*)"\z/, 1]
     end
   end
 #  break if /^CEOF/
@@ -108,14 +110,14 @@
 
 drive = File::PATH_SEPARATOR == ';'
 
-prefix = '/lib/ruby/' + RUBY_VERSION + '/' + RUBY_PLATFORM
+prefix = "/lib/ruby/#{version}/#{RUBY_PLATFORM}"
 print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
 print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
 print "  CONFIG = {}\n"
 print "  CONFIG[\"DESTDIR\"] = DESTDIR\n"
 
 unless has_version
-  RUBY_VERSION.scan(/(\d+)\.(\d+)\.(\d+)/) {
+  version.scan(/(\d+)\.(\d+)(?:\.(\d+))?/) {
     print "  CONFIG[\"MAJOR\"] = \"" + $1 + "\"\n"
     print "  CONFIG[\"MINOR\"] = \"" + $2 + "\"\n"
     print "  CONFIG[\"TEENY\"] = \"" + $3 + "\"\n"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/