nobu	2012-04-18 22:59:00 +0900 (Wed, 18 Apr 2012)

  New Revision: 35387

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

  Log:
    * 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:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 35386)
+++ configure.in	(revision 35387)
@@ -368,11 +368,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: ChangeLog
===================================================================
--- ChangeLog	(revision 35386)
+++ ChangeLog	(revision 35387)
@@ -1,3 +1,12 @@
+Wed Apr 18 22:58:55 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.
+
 Wed Apr 18 13:59:40 2012  NAKAMURA Usaku  <usa@r...>
 
 	* win32/file.c (INVALID_FILE_ATTRIBUTES): define for old SDK.

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