Document that configure option only affects contrib:

 --with-ossp-uuid        use OSSP UUID library when building /contrib/uuid-ossp

diff --git a/configure b/configure
index 8e44cb5642bd296357c36f347b11abd50aca9f4b..1ee9c59d9f452d8ab3926aa9cda1f5c1ab2e2ee5 100755 (executable)
--- a/configure
+++ b/configure
@@ -896,7 +896,7 @@ Optional Packages:
   --with-openssl          build with OpenSSL support
   --without-readline      do not use GNU Readline nor BSD Libedit for editing
   --with-libedit-preferred  prefer BSD Libedit over GNU Readline
-  --with-ossp-uuid        build with OSSP UUID library for UUID generation
+  --with-ossp-uuid        use OSSP UUID library when building /contrib/uuid-ossp
   --with-libxml           build with XML support
   --with-libxslt          use XSLT support when building /contrib/xml2
   --with-system-tzdata=DIR  use system time zone data in DIR

diff --git a/configure.in b/configure.in
index 0539a0ed0cb0867b165277b0b697b80c61e14263..4868717e9c5194580458c92e628ffeb97ddd2c5f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.534 2007/11/04 18:53:39 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.535 2007/11/05 17:43:20 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -569,7 +569,7 @@ PGAC_ARG_BOOL(with, libedit-preferred, no,
 #
 # OSSP UUID library
 #
-PGAC_ARG_BOOL(with, ossp-uuid, no, [  --with-ossp-uuid        build with OSSP UUID library for UUID generation])
+PGAC_ARG_BOOL(with, ossp-uuid, no, [  --with-ossp-uuid        use OSSP UUID library when building /contrib/uuid-ossp ])
 AC_SUBST(with_ossp_uuid)
 
 

diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index d185cbb2a5ed70abddbd63215996dbdd804d54c3..9c761aba562fafbed95ee56e6041138b7df25b8b 100644 (file)
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.296 2007/11/04 18:53:39 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.297 2007/11/05 17:43:20 momjian Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -937,11 +937,10 @@ su - postgres
        <term><option>--with-ossp-uuid</option></term>
        <listitem>
         <para>
-         Build with the <ulink
-         url="http://www.ossp.org/pkg/lib/uuid/">OSSP UUID
-         library</ulink>.  This is necessary for the contrib module
-         <literal>uuid-ossp</literal> which provides functions to
-         generate UUIDs.<indexterm><primary>UUID</primary></indexterm>
+         Use the <ulink url="http://www.ossp.org/pkg/lib/uuid/">OSSP UUID
+         library</ulink> when building <filename>/contrib/uuid-ossp</>.
+         The library provides functions to generate
+         UUIDs.<indexterm><primary>UUID</primary></indexterm>
         </para>
        </listitem>
       </varlistentry>

diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 570472e13f4f2f71aa1aca4209b98ae8b62c6ccb..e147e86b7b41164cb910108292ca713369d4085f 100644 (file)
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -672,7 +672,8 @@
 /* Define to 1 to build with XML support. (--with-libxml) */
 #undef USE_LIBXML
 
-/* Define to 1 to build with XSLT support. (--with-libxslt) */
+/* Define to 1 to use XSLT support when building /contrib/xml2.
+   (--with-libxslt) */
 #undef USE_LIBXSLT
 
 /* Define to select named POSIX semaphores. */