Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b4689bf

Browse files
committed
Revert configure warning to use "official distribution".
1 parent f235c92 commit b4689bf

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

config/missing

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22

3-
# $PostgreSQL: pgsql/config/missing,v 1.6 2010/02/22 18:02:06 momjian Exp $
3+
# $PostgreSQL: pgsql/config/missing,v 1.7 2010/02/22 21:16:50 momjian Exp $
44

55
# This is *not* the GNU `missing' script, although it is similar in
66
# concept. You can call it from the makefiles to get consistent
@@ -26,7 +26,7 @@ You can get $1 from a GNU mirror site.
2626
***
2727
ERROR: \`$1' is missing on your system. It is needed to create the
2828
file \`$output'. You can either get $1 from a GNU mirror site
29-
or download an bundled distribution of PostgreSQL, which contains
29+
or download an official distribution of PostgreSQL, which contains
3030
pre-packaged $1 output.
3131
***" >&2
3232
exit 1
@@ -38,7 +38,7 @@ pre-packaged $1 output.
3838
echo "\
3939
***
4040
ERROR: Perl is missing on your system. It is needed unless you are building
41-
from an unmodified bundled distribution of PostgreSQL.
41+
from an unmodified official distribution of PostgreSQL.
4242
***" >&2
4343
exit 1
4444
;;

config/perl.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/config/perl.m4,v 1.7 2010/02/22 18:02:06 momjian Exp $
1+
# $PostgreSQL: pgsql/config/perl.m4,v 1.8 2010/02/22 21:16:50 momjian Exp $
22

33

44
# PGAC_PATH_PERL
@@ -26,7 +26,7 @@ if test -z "$PERL"; then
2626
AC_MSG_WARN([
2727
*** Without Perl you will not be able to build PostgreSQL from CVS.
2828
*** You can obtain Perl from any CPAN mirror site.
29-
*** (If you are using the bundled distribution of PostgreSQL then you do not
29+
*** (If you are using the official distribution of PostgreSQL then you do not
3030
*** need to worry about this, because the Perl output is pre-generated.)])
3131
fi
3232
])# PGAC_PATH_PERL

config/programs.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/config/programs.m4,v 1.27 2010/02/22 18:02:06 momjian Exp $
1+
# $PostgreSQL: pgsql/config/programs.m4,v 1.28 2010/02/22 21:16:50 momjian Exp $
22

33

44
# PGAC_PATH_BISON
@@ -29,7 +29,7 @@ if test -z "$BISON"; then
2929
AC_MSG_WARN([
3030
*** Without Bison you will not be able to build PostgreSQL from CVS nor
3131
*** change any of the parser definition files. You can obtain Bison from
32-
*** a GNU mirror site. (If you are using the bundled distribution of
32+
*** a GNU mirror site. (If you are using the official distribution of
3333
*** PostgreSQL then you do not need to worry about this, because the Bison
3434
*** output is pre-generated.)])
3535
fi
@@ -91,7 +91,7 @@ if test x"$pgac_cv_path_flex" = x"no"; then
9191
AC_MSG_WARN([
9292
*** Without Flex you will not be able to build PostgreSQL from CVS nor
9393
*** change any of the scanner definition files. You can obtain Flex from
94-
*** a GNU mirror site. (If you are using the bundled distribution of
94+
*** a GNU mirror site. (If you are using the official distribution of
9595
*** PostgreSQL then you do not need to worry about this because the Flex
9696
*** output is pre-generated.)])
9797

configure

+6-6
Original file line numberDiff line numberDiff line change
@@ -6736,13 +6736,13 @@ if test -z "$BISON"; then
67366736
{ $as_echo "$as_me:$LINENO: WARNING:
67376737
*** Without Bison you will not be able to build PostgreSQL from CVS nor
67386738
*** change any of the parser definition files. You can obtain Bison from
6739-
*** a GNU mirror site. (If you are using the bundled distribution of
6739+
*** a GNU mirror site. (If you are using the official distribution of
67406740
*** PostgreSQL then you do not need to worry about this, because the Bison
67416741
*** output is pre-generated.)" >&5
67426742
$as_echo "$as_me: WARNING:
67436743
*** Without Bison you will not be able to build PostgreSQL from CVS nor
67446744
*** change any of the parser definition files. You can obtain Bison from
6745-
*** a GNU mirror site. (If you are using the bundled distribution of
6745+
*** a GNU mirror site. (If you are using the official distribution of
67466746
*** PostgreSQL then you do not need to worry about this, because the Bison
67476747
*** output is pre-generated.)" >&2;}
67486748
fi
@@ -6800,13 +6800,13 @@ if test x"$pgac_cv_path_flex" = x"no"; then
68006800
{ $as_echo "$as_me:$LINENO: WARNING:
68016801
*** Without Flex you will not be able to build PostgreSQL from CVS nor
68026802
*** change any of the scanner definition files. You can obtain Flex from
6803-
*** a GNU mirror site. (If you are using the bundled distribution of
6803+
*** a GNU mirror site. (If you are using the official distribution of
68046804
*** PostgreSQL then you do not need to worry about this because the Flex
68056805
*** output is pre-generated.)" >&5
68066806
$as_echo "$as_me: WARNING:
68076807
*** Without Flex you will not be able to build PostgreSQL from CVS nor
68086808
*** change any of the scanner definition files. You can obtain Flex from
6809-
*** a GNU mirror site. (If you are using the bundled distribution of
6809+
*** a GNU mirror site. (If you are using the official distribution of
68106810
*** PostgreSQL then you do not need to worry about this because the Flex
68116811
*** output is pre-generated.)" >&2;}
68126812

@@ -6887,12 +6887,12 @@ if test -z "$PERL"; then
68876887
{ $as_echo "$as_me:$LINENO: WARNING:
68886888
*** Without Perl you will not be able to build PostgreSQL from CVS.
68896889
*** You can obtain Perl from any CPAN mirror site.
6890-
*** (If you are using the bundled distribution of PostgreSQL then you do not
6890+
*** (If you are using the official distribution of PostgreSQL then you do not
68916891
*** need to worry about this, because the Perl output is pre-generated.)" >&5
68926892
$as_echo "$as_me: WARNING:
68936893
*** Without Perl you will not be able to build PostgreSQL from CVS.
68946894
*** You can obtain Perl from any CPAN mirror site.
6895-
*** (If you are using the bundled distribution of PostgreSQL then you do not
6895+
*** (If you are using the official distribution of PostgreSQL then you do not
68966896
*** need to worry about this, because the Perl output is pre-generated.)" >&2;}
68976897
fi
68986898

0 commit comments

Comments
 (0)