nagachika	2013-04-16 01:33:31 +0900 (Tue, 16 Apr 2013)

  New Revision: 40314

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

  Log:
    merge revision(s) 39814,39815: [Backport #8117]
    
    * configure.in: Fix c++ compiler auto-selection not only for
      Darwin 11.x, but also the other versions of Darwin.
    
    * configure.in: set ac_cv_prog_cxx if CXX is supplied.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/configure.in
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 40313)
+++ ruby_2_0_0/configure.in	(revision 40314)
@@ -190,7 +190,7 @@ then https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L190
 (it is also a good idea to do 'make clean' before compiling))
 fi
 AS_CASE(["$build_os"],
-  [darwin11.*], [
+  [darwin1*.*], [
     AS_CASE(["x$CC"],
       [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
       [xgcc|x/usr/bin/gcc],         [: ${CXX=g++}],
@@ -198,6 +198,7 @@ AS_CASE(["$build_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L198
       [xclang|x/usr/bin/clang],     [: ${CXX=clang++}])
   ])
 test -z "$CC" || ac_cv_prog_CC="$CC"
+test -z "$CXX" || ac_cv_prog_CXX="$CXX"
 
 if test "$program_prefix" = NONE; then
   program_prefix=
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40313)
+++ ruby_2_0_0/ChangeLog	(revision 40314)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Apr 16 01:30:47 2013  Kenta Murata  <mrkn@m...>
+
+	* configure.in: set ac_cv_prog_cxx if CXX is supplied.
+
+Tue Apr 16 01:30:47 2013  Kenta Murata  <mrkn@m...>
+
+	* configure.in: Fix c++ compiler auto-selection not only for
+	  Darwin 11.x, but also the other versions of Darwin.
+
 Tue Apr 16 00:27:56 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (iseq_compile_each): fix of defined? with empty
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40313)
+++ ruby_2_0_0/version.h	(revision 40314)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-16"
-#define RUBY_PATCHLEVEL 139
+#define RUBY_PATCHLEVEL 140
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39814-39815


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