merge revision(s) 26005:

	* configure.in: default ac_cv_prog_CC to CC.


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

3 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 37e436441a..76cb732f53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 24 18:04:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: default ac_cv_prog_CC to CC.
+
 Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: MINIRUBY is given via make-flag.
diff --git a/configure.in b/configure.in
index 307128cdf4..5abf2c3c52 100644
--- a/configure.in
+++ b/configure.in
@@ -77,6 +77,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 1dcb54f5a0..809e734483 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091224
-#define RUBY_PATCHLEVEL 247
+#define RUBY_PATCHLEVEL 248
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8