Use the term "bundled distribution" instead of "official distribution" in

configure warnings.

diff --git a/config/missing b/config/missing
index 16e3175..7396e5c 100755 (executable)
--- a/config/missing
+++ b/config/missing
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $PostgreSQL: pgsql/config/missing,v 1.5 2009/06/23 03:46:00 tgl Exp $
+# $PostgreSQL: pgsql/config/missing,v 1.6 2010/02/22 18:02:06 momjian Exp $
 
 # This is *not* the GNU `missing' script, although it is similar in
 # concept. You can call it from the makefiles to get consistent
@@ -26,7 +26,7 @@ You can get $1 from a GNU mirror site.
 ***
 ERROR: \`$1' is missing on your system. It is needed to create the
 file \`$output'. You can either get $1 from a GNU mirror site
-or download an official distribution of PostgreSQL, which contains
+or download an bundled distribution of PostgreSQL, which contains
 pre-packaged $1 output.
 ***" >&2
             exit 1
@@ -38,7 +38,7 @@ pre-packaged $1 output.
         echo "\
 ***
 ERROR: Perl is missing on your system. It is needed unless you are building
-from an unmodified official distribution of PostgreSQL.
+from an unmodified bundled distribution of PostgreSQL.
 ***" >&2
         exit 1
         ;;

diff --git a/config/perl.m4 b/config/perl.m4
index ad64379..e221ab8 100644 (file)
--- a/config/perl.m4
+++ b/config/perl.m4
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/config/perl.m4,v 1.6 2010/01/07 01:41:11 tgl Exp $
+# $PostgreSQL: pgsql/config/perl.m4,v 1.7 2010/02/22 18:02:06 momjian Exp $
 
 
 # PGAC_PATH_PERL
@@ -26,7 +26,7 @@ if test -z "$PERL"; then
   AC_MSG_WARN([
 *** Without Perl you will not be able to build PostgreSQL from CVS.
 *** You can obtain Perl from any CPAN mirror site.
-*** (If you are using the official distribution of PostgreSQL then you do not
+*** (If you are using the bundled distribution of PostgreSQL then you do not
 *** need to worry about this, because the Perl output is pre-generated.)])
 fi
 ])# PGAC_PATH_PERL

diff --git a/config/programs.m4 b/config/programs.m4
index 7f646d3..eadfb40 100644 (file)
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/config/programs.m4,v 1.26 2009/07/13 05:36:53 tgl Exp $
+# $PostgreSQL: pgsql/config/programs.m4,v 1.27 2010/02/22 18:02:06 momjian Exp $
 
 
 # PGAC_PATH_BISON
@@ -29,7 +29,7 @@ if test -z "$BISON"; then
   AC_MSG_WARN([
 *** Without Bison you will not be able to build PostgreSQL from CVS nor
 *** change any of the parser definition files.  You can obtain Bison from
-*** a GNU mirror site.  (If you are using the official distribution of
+*** a GNU mirror site.  (If you are using the bundled distribution of
 *** PostgreSQL then you do not need to worry about this, because the Bison
 *** output is pre-generated.)])
 fi
@@ -91,7 +91,7 @@ if test x"$pgac_cv_path_flex" = x"no"; then
   AC_MSG_WARN([
 *** Without Flex you will not be able to build PostgreSQL from CVS nor
 *** change any of the scanner definition files.  You can obtain Flex from
-*** a GNU mirror site.  (If you are using the official distribution of
+*** a GNU mirror site.  (If you are using the bundled distribution of
 *** PostgreSQL then you do not need to worry about this because the Flex
 *** output is pre-generated.)])
 

diff --git a/configure b/configure
index f5a9325..edb15ee 100755 (executable)
--- a/configure
+++ b/configure
@@ -6736,13 +6736,13 @@ if test -z "$BISON"; then
   { $as_echo "$as_me:$LINENO: WARNING:
 *** Without Bison you will not be able to build PostgreSQL from CVS nor
 *** change any of the parser definition files.  You can obtain Bison from
-*** a GNU mirror site.  (If you are using the official distribution of
+*** a GNU mirror site.  (If you are using the bundled distribution of
 *** PostgreSQL then you do not need to worry about this, because the Bison
 *** output is pre-generated.)" >&5
 $as_echo "$as_me: WARNING:
 *** Without Bison you will not be able to build PostgreSQL from CVS nor
 *** change any of the parser definition files.  You can obtain Bison from
-*** a GNU mirror site.  (If you are using the official distribution of
+*** a GNU mirror site.  (If you are using the bundled distribution of
 *** PostgreSQL then you do not need to worry about this, because the Bison
 *** output is pre-generated.)" >&2;}
 fi
@@ -6800,13 +6800,13 @@ if test x"$pgac_cv_path_flex" = x"no"; then
   { $as_echo "$as_me:$LINENO: WARNING:
 *** Without Flex you will not be able to build PostgreSQL from CVS nor
 *** change any of the scanner definition files.  You can obtain Flex from
-*** a GNU mirror site.  (If you are using the official distribution of
+*** a GNU mirror site.  (If you are using the bundled distribution of
 *** PostgreSQL then you do not need to worry about this because the Flex
 *** output is pre-generated.)" >&5
 $as_echo "$as_me: WARNING:
 *** Without Flex you will not be able to build PostgreSQL from CVS nor
 *** change any of the scanner definition files.  You can obtain Flex from
-*** a GNU mirror site.  (If you are using the official distribution of
+*** a GNU mirror site.  (If you are using the bundled distribution of
 *** PostgreSQL then you do not need to worry about this because the Flex
 *** output is pre-generated.)" >&2;}
 
@@ -6887,12 +6887,12 @@ if test -z "$PERL"; then
   { $as_echo "$as_me:$LINENO: WARNING:
 *** Without Perl you will not be able to build PostgreSQL from CVS.
 *** You can obtain Perl from any CPAN mirror site.
-*** (If you are using the official distribution of PostgreSQL then you do not
+*** (If you are using the bundled distribution of PostgreSQL then you do not
 *** need to worry about this, because the Perl output is pre-generated.)" >&5
 $as_echo "$as_me: WARNING:
 *** Without Perl you will not be able to build PostgreSQL from CVS.
 *** You can obtain Perl from any CPAN mirror site.
-*** (If you are using the official distribution of PostgreSQL then you do not
+*** (If you are using the bundled distribution of PostgreSQL then you do not
 *** need to worry about this, because the Perl output is pre-generated.)" >&2;}
 fi