merges 26005 from trunk into ruby_1_9_1.

fixes [ruby-dev:39906].
--
* configure.in: default ac_cv_prog_CC to CC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 16bf7d5188..27974dd0d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec  5 13:19:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: default ac_cv_prog_CC to CC.
+
 Mon Feb  1 17:11:12 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* string (rb_string_value): warning for implicit conversion
diff --git a/configure.in b/configure.in
index f5b1858a87..671001a8e5 100644
--- a/configure.in
+++ b/configure.in
@@ -99,6 +99,7 @@ then
   AC_MSG_ERROR(cached CC is different -- throw away $cache_file
 (it is also a good idea to do 'make clean' before compiling))
 fi
+test -z "$CC" || ac_cv_prog_CC="$CC"
 
 if test "$program_prefix" = NONE; then
   program_prefix=
diff --git a/version.h b/version.h
index a4be85505a..9529b6df51 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 420
+#define RUBY_PATCHLEVEL 421
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1