Index: configure
===================================================================
RCS file: /cvsroot/pgsql/configure,v
retrieving revision 1.568
diff -c -c -r1.568 configure
*** configure	4 Nov 2007 18:53:39 -0000	1.568
--- configure	5 Nov 2007 17:42:10 -0000
***************
*** 896,902 ****
    --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-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
--- 896,902 ----
    --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        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
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql/configure.in,v
retrieving revision 1.534
diff -c -c -r1.534 configure.in
*** configure.in	4 Nov 2007 18:53:39 -0000	1.534
--- configure.in	5 Nov 2007 17:42:11 -0000
***************
*** 569,575 ****
  #
  # OSSP UUID library
  #
! PGAC_ARG_BOOL(with, ossp-uuid, no, [  --with-ossp-uuid        build with OSSP UUID library for UUID generation])
  AC_SUBST(with_ossp_uuid)

--- 569,575 ----
  #
  # OSSP UUID library
  #
! PGAC_ARG_BOOL(with, ossp-uuid, no, [  --with-ossp-uuid        use OSSP UUID library when building /contrib/uuid-ossp ])
  AC_SUBST(with_ossp_uuid)

Index: doc/src/sgml/installation.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v
retrieving revision 1.296
diff -c -c -r1.296 installation.sgml
*** doc/src/sgml/installation.sgml	4 Nov 2007 18:53:39 -0000	1.296
--- doc/src/sgml/installation.sgml	5 Nov 2007 17:42:11 -0000
***************
*** 937,947 ****
         <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>
          </para>
         </listitem>
        </varlistentry>
--- 937,946 ----
         <term><option>--with-ossp-uuid</option></term>
         <listitem>
          <para>
!          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>
Index: src/include/pg_config.h.in
===================================================================
RCS file: /cvsroot/pgsql/src/include/pg_config.h.in,v
retrieving revision 1.125
diff -c -c -r1.125 pg_config.h.in
*** src/include/pg_config.h.in	29 Oct 2007 11:25:42 -0000	1.125
--- src/include/pg_config.h.in	5 Nov 2007 17:42:12 -0000
***************
*** 672,678 ****
  /* Define to 1 to build with XML support. (--with-libxml) */
  #undef USE_LIBXML

! /* Define to 1 to build with XSLT support. (--with-libxslt) */
  #undef USE_LIBXSLT

  /* Define to select named POSIX semaphores. */
--- 672,679 ----
  /* Define to 1 to build with XML support. (--with-libxml) */
  #undef USE_LIBXML

! /* Define to 1 to use XSLT support when building /contrib/xml2.
!    (--with-libxslt) */
  #undef USE_LIBXSLT

  /* Define to select named POSIX semaphores. */