diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,12 @@ +Wed Apr 18 22:58:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * win32/file.c (INVALID_FILE_ATTRIBUTES): define for old SDK. diff --git a/configure.in b/configure.in index a0dd303406..2df023b57d 100644 --- a/configure.in +++ b/configure.in @@ -368,11 +368,11 @@ fi 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 |