nobu	2012-04-18 23:09:04 +0900 (Wed, 18 Apr 2012)

  New Revision: 35388

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

  Log:
    merge revision(s) 35387:
    
    * configure.in (DOT, DOXYGEN): use AC_CHECK_PROGS instead of
      AC_CHECK_PROG which needs the third argument.  [ruby-core:44433]
      [Bug #6316]
    
    * configure.in (PKG_CONFIG): fix condition to skip older version
      of pkg-config.  continue in backticks does not affect outside.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/configure.in
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 35387)
+++ ruby_1_9_3/configure.in	(revision 35388)
@@ -365,11 +365,11 @@
 MAKEDIRS="$MKDIR_P"
 AC_SUBST(MAKEDIRS)
 
-AC_CHECK_PROG(DOT, dot)
-AC_CHECK_PROG(DOXYGEN, doxygen)
+AC_CHECK_PROGS(DOT, dot)
+AC_CHECK_PROGS(DOXYGEN, doxygen)
 
-AC_CHECK_PROG(PKG_CONFIG, pkg-config, [], [], [],
-    [`$as_dir/$ac_word$ac_exec_ext --print-errors --version > /dev/null 2>&1 || continue`])
+AC_CHECK_PROG(PKG_CONFIG, pkg-config, [pkg-config], [], [],
+    [`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`])
 
 # checks for UNIX variants that set C preprocessor variables
 AC_USE_SYSTEM_EXTENSIONS
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35387)
+++ ruby_1_9_3/ChangeLog	(revision 35388)
@@ -1,3 +1,12 @@
+Wed Apr 18 23:08:58 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (DOT, DOXYGEN): use AC_CHECK_PROGS instead of
+	  AC_CHECK_PROG which needs the third argument.  [ruby-core:44433]
+	  [Bug #6316]
+
+	* configure.in (PKG_CONFIG): fix condition to skip older version
+	  of pkg-config.  continue in backticks does not affect outside.
+
 Tue Apr 17 21:35:47 2012  Kouhei Sutou  <kou@c...>
 
 	* lib/rexml/parsers/baseparser.rb, test/rexml/test_namespace.rb:
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35387)
+++ ruby_1_9_3/version.h	(revision 35388)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 189
+#define RUBY_PATCHLEVEL 190
 
-#define RUBY_RELEASE_DATE "2012-04-17"
+#define RUBY_RELEASE_DATE "2012-04-18"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
 
 #include "ruby/version.h"
 

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