diff options
author | Tom Lane | 2009-07-13 05:36:53 +0000 |
---|---|---|
committer | Tom Lane | 2009-07-13 05:36:53 +0000 |
commit | 07761e4507758f04bd9faba5c03af2861255843a (patch) | |
tree | 91ca666ce4b7a7fc292952d9fd2b1bb3e5a6074b | |
parent | 382cb7aa0b929975c2158642f3e52263cffc64a3 (diff) |
Make the configure messages rejecting old bison and flex versions include
the full path and version of the program being rejected.
-rw-r--r-- | config/programs.m4 | 8 | ||||
-rwxr-xr-x | configure | 31 |
2 files changed, 21 insertions, 18 deletions
diff --git a/config/programs.m4 b/config/programs.m4 index 545aaf8539..898f2d0669 100644 --- a/config/programs.m4 +++ b/config/programs.m4 @@ -10,7 +10,7 @@ AC_DEFUN([PGAC_PATH_BISON], [# Let the user override the search if test -z "$BISON"; then - AC_CHECK_PROGS(BISON, bison) + AC_PATH_PROGS(BISON, bison) fi if test "$BISON"; then @@ -19,8 +19,8 @@ if test "$BISON"; then if echo "$pgac_bison_version" | $AWK '{ if ([$]4 < 1.875) exit 0; else exit 1;}' then AC_MSG_WARN([ -*** The installed version of Bison is too old to use with PostgreSQL. -*** Bison version 1.875 or later is required.]) +*** The installed version of Bison, $BISON, is too old to use with PostgreSQL. +*** Bison version 1.875 or later is required, but this is $pgac_bison_version.]) BISON="" fi fi @@ -76,7 +76,7 @@ else else AC_MSG_WARN([ *** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL. -*** Flex version 2.5.31 or later is required.]) +*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version.]) fi fi fi @@ -6685,20 +6685,22 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_BISON+set}" = set; then +if test "${ac_cv_path_BISON+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$BISON"; then - ac_cv_prog_BISON="$BISON" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $BISON in + [\\/]* | ?:[\\/]*) + ac_cv_path_BISON="$BISON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_BISON="$ac_prog" + ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6706,9 +6708,10 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -BISON=$ac_cv_prog_BISON +BISON=$ac_cv_path_BISON if test -n "$BISON"; then { $as_echo "$as_me:$LINENO: result: $BISON" >&5 $as_echo "$BISON" >&6; } @@ -6730,11 +6733,11 @@ $as_echo "$as_me: using $pgac_bison_version" >&6;} if echo "$pgac_bison_version" | $AWK '{ if ($4 < 1.875) exit 0; else exit 1;}' then { $as_echo "$as_me:$LINENO: WARNING: -*** The installed version of Bison is too old to use with PostgreSQL. -*** Bison version 1.875 or later is required." >&5 +*** The installed version of Bison, $BISON, is too old to use with PostgreSQL. +*** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&5 $as_echo "$as_me: WARNING: -*** The installed version of Bison is too old to use with PostgreSQL. -*** Bison version 1.875 or later is required." >&2;} +*** The installed version of Bison, $BISON, is too old to use with PostgreSQL. +*** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&2;} BISON="" fi fi @@ -6787,10 +6790,10 @@ else else { $as_echo "$as_me:$LINENO: WARNING: *** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL. -*** Flex version 2.5.31 or later is required." >&5 +*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version." >&5 $as_echo "$as_me: WARNING: *** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL. -*** Flex version 2.5.31 or later is required." >&2;} +*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version." >&2;} fi fi fi |