database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-20 00:42:27 +03:00
Code

Make the configure messages rejecting old bison and flex versions include

Browse Source 
the full path and version of the program being rejected.
This commit is contained in:
Tom Lane 2009-07-13 05:36:53 +00:00
parent 34a11144e5
commit dcc9d37331
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/programs.m4
View File

@ -1,4 +1,4 @@
# $PostgreSQL: pgsql/config/programs.m4,v 1.25 2009/07/13 01:51:56 tgl Exp $ # $PostgreSQL: pgsql/config/programs.m4,v 1.26 2009/07/13 05:36:53 tgl Exp $
# PGAC_PATH_BISON # PGAC_PATH_BISON
@ -10,7 +10,7 @@
AC_DEFUN([PGAC_PATH_BISON], AC_DEFUN([PGAC_PATH_BISON],
[# Let the user override the search [# Let the user override the search
if test -z "$BISON"; then if test -z "$BISON"; then
AC_CHECK_PROGS(BISON, bison) AC_PATH_PROGS(BISON, bison)
fi fi
if test "$BISON"; then 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;}' if echo "$pgac_bison_version" | $AWK '{ if ([$]4 < 1.875) exit 0; else exit 1;}'
then then
AC_MSG_WARN([ AC_MSG_WARN([
*** The installed version of Bison is too old to use with PostgreSQL. *** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
*** Bison version 1.875 or later is required.]) *** Bison version 1.875 or later is required, but this is $pgac_bison_version.])
BISON="" BISON=""
fi fi
fi fi
@ -76,7 +76,7 @@ else
else else
AC_MSG_WARN([ AC_MSG_WARN([
*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL. *** 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 fi
fi fi

29
configure vendored
View File

@ -6685,12 +6685,14 @@ do
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; } $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 $as_echo_n "(cached) " >&6
else else
if test -n "$BISON"; then case $BISON in
ac_cv_prog_BISON="$BISON" # Let the user override the test. [\\/]* | ?:[\\/]*)
else ac_cv_path_BISON="$BISON" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH for as_dir in $PATH
do do
@ -6698,7 +6700,7 @@ do
test -z "$as_dir" && as_dir=. test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do 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 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 $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2 break 2
fi fi
@ -6706,9 +6708,10 @@ done
done done
IFS=$as_save_IFS IFS=$as_save_IFS
;;
esac
fi fi
fi BISON=$ac_cv_path_BISON
BISON=$ac_cv_prog_BISON
if test -n "$BISON"; then if test -n "$BISON"; then
{ $as_echo "$as_me:$LINENO: result: $BISON" >&5 { $as_echo "$as_me:$LINENO: result: $BISON" >&5
$as_echo "$BISON" >&6; } $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;}' if echo "$pgac_bison_version" | $AWK '{ if ($4 < 1.875) exit 0; else exit 1;}'
then then
{ $as_echo "$as_me:$LINENO: WARNING: { $as_echo "$as_me:$LINENO: WARNING:
*** The installed version of Bison is too old to use with PostgreSQL. *** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
*** Bison version 1.875 or later is required." >&5 *** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&5
$as_echo "$as_me: WARNING: $as_echo "$as_me: WARNING:
*** The installed version of Bison is too old to use with PostgreSQL. *** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
*** Bison version 1.875 or later is required." >&2;} *** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&2;}
BISON="" BISON=""
fi fi
fi fi
@ -6787,10 +6790,10 @@ else
else else
{ $as_echo "$as_me:$LINENO: WARNING: { $as_echo "$as_me:$LINENO: WARNING:
*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL. *** 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: $as_echo "$as_me: WARNING:
*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL. *** 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 fi
fi fi