Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdcc9d37

Browse files
committed
Make the configure messages rejecting old bison and flex versions include
the full path and version of the program being rejected.
1 parent34a1114 commitdcc9d37

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

‎config/programs.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/config/programs.m4,v 1.25 2009/07/1301:51:56 tgl Exp $
1+
# $PostgreSQL: pgsql/config/programs.m4,v 1.26 2009/07/1305:36:53 tgl Exp $
22

33

44
# PGAC_PATH_BISON
@@ -10,7 +10,7 @@
1010
AC_DEFUN([PGAC_PATH_BISON],
1111
[# Let the user override the search
1212
if test -z "$BISON"; then
13-
AC_CHECK_PROGS(BISON,bison)
13+
AC_PATH_PROGS(BISON,bison)
1414
fi
1515
1616
if test "$BISON"; then
@@ -19,8 +19,8 @@ if test "$BISON"; then
1919
if echo "$pgac_bison_version" | $AWK '{ if ([$]4 < 1.875) exit 0; else exit 1;}'
2020
then
2121
AC_MSG_WARN([
22-
*** The installed version of Bison is too old to use with PostgreSQL.
23-
*** Bison version 1.875 or later is required.])
22+
*** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
23+
*** Bison version 1.875 or later is required, but this is $pgac_bison_version.])
2424
BISON=""
2525
fi
2626
fi
@@ -76,7 +76,7 @@ else
7676
else
7777
AC_MSG_WARN([
7878
*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
79-
*** Flex version 2.5.31 or later is required.])
79+
*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version.])
8080
fi
8181
fi
8282
fi

‎configure

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6685,30 +6685,33 @@ do
66856685
set dummy $ac_prog; ac_word=$2
66866686
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
66876687
$as_echo_n "checking for $ac_word... " >&6; }
6688-
if test "${ac_cv_prog_BISON+set}" = set; then
6688+
if test "${ac_cv_path_BISON+set}" = set; then
66896689
$as_echo_n "(cached) " >&6
66906690
else
6691-
if test -n "$BISON"; then
6692-
ac_cv_prog_BISON="$BISON" # Let the user override the test.
6693-
else
6694-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6691+
case $BISON in
6692+
[\\/]* | ?:[\\/]*)
6693+
ac_cv_path_BISON="$BISON" # Let the user override the test with a path.
6694+
;;
6695+
*)
6696+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
66956697
for as_dir in $PATH
66966698
do
66976699
IFS=$as_save_IFS
66986700
test -z "$as_dir" && as_dir=.
66996701
for ac_exec_ext in '' $ac_executable_extensions; do
67006702
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6701-
ac_cv_prog_BISON="$ac_prog"
6703+
ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
67026704
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
67036705
break 2
67046706
fi
67056707
done
67066708
done
67076709
IFS=$as_save_IFS
67086710

6711+
;;
6712+
esac
67096713
fi
6710-
fi
6711-
BISON=$ac_cv_prog_BISON
6714+
BISON=$ac_cv_path_BISON
67126715
if test -n "$BISON"; then
67136716
{ $as_echo "$as_me:$LINENO: result: $BISON" >&5
67146717
$as_echo "$BISON" >&6; }
@@ -6730,11 +6733,11 @@ $as_echo "$as_me: using $pgac_bison_version" >&6;}
67306733
if echo "$pgac_bison_version" | $AWK '{ if ($4 < 1.875) exit 0; else exit 1;}'
67316734
then
67326735
{ $as_echo "$as_me:$LINENO: WARNING:
6733-
*** The installed version of Bison is too old to use with PostgreSQL.
6734-
*** Bison version 1.875 or later is required." >&5
6736+
*** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
6737+
*** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&5
67356738
$as_echo "$as_me: WARNING:
6736-
*** The installed version of Bison is too old to use with PostgreSQL.
6737-
*** Bison version 1.875 or later is required." >&2;}
6739+
*** The installed version of Bison, $BISON, is too old to use with PostgreSQL.
6740+
*** Bison version 1.875 or later is required, but this is $pgac_bison_version." >&2;}
67386741
BISON=""
67396742
fi
67406743
fi
@@ -6787,10 +6790,10 @@ else
67876790
else
67886791
{ $as_echo "$as_me:$LINENO: WARNING:
67896792
*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
6790-
*** Flex version 2.5.31 or later is required." >&5
6793+
*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version." >&5
67916794
$as_echo "$as_me: WARNING:
67926795
*** The installed version of Flex, $pgac_candidate, is too old to use with PostgreSQL.
6793-
*** Flex version 2.5.31 or later is required." >&2;}
6796+
*** Flex version 2.5.31 or later is required, but this is $pgac_flex_version." >&2;}
67946797
fi
67956798
fi
67966799
fi

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp