nobu	2008-03-17 16:41:12 +0900 (Mon, 17 Mar 2008)

  New Revision: 15789

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/configure.in
    trunk/version.h

  Log:
    * configure.in: unset GREP_OPTIONS.  [ruby-core:15918]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15789&r2=15788&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=15789&r2=15788&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15789&r2=15788&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15789&r2=15788&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15789&r2=15788&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=15789&r2=15788&diff_format=u

Index: configure.in
===================================================================
--- configure.in	(revision 15788)
+++ configure.in	(revision 15789)
@@ -63,10 +63,20 @@
 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)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15788)
+++ ChangeLog	(revision 15789)
@@ -1,3 +1,7 @@
+Mon Mar 17 16:41:08 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: unset GREP_OPTIONS.  [ruby-core:15918]
+
 Sun Mar 16 18:07:07 2008  Martin Duerst  <duerst@i...>
 
 	* enc/trans/utf_16_32.c: bug fix (some invalid UTF-8 sequences
Index: version.h
===================================================================
--- version.h	(revision 15788)
+++ version.h	(revision 15789)
@@ -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[];
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 15788)
+++ ruby_1_8/configure.in	(revision 15789)
@@ -44,10 +44,20 @@
 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)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15788)
+++ ruby_1_8/ChangeLog	(revision 15789)
@@ -1,3 +1,7 @@
+Mon Mar 17 16:41:08 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: unset GREP_OPTIONS.  [ruby-core:15918]
+
 Fri Mar 14 16:59:23 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (RUBY_LIB_PREFIX): fix for prefix.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 15788)
+++ ruby_1_8/version.h	(revision 15789)
@@ -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[];

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