summaryrefslogtreecommitdiff
path: root/doc/src/sgml/installation.sgml
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/sgml/installation.sgml')
-rw-r--r--doc/src/sgml/installation.sgml34
1 files changed, 22 insertions, 12 deletions
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index cc242dccee..4f89b4e930 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1117,21 +1117,31 @@ build-postgresql:
<term><option>--with-libxml</option></term>
<listitem>
<para>
- Build with libxml, enabling SQL/XML support. Libxml version 2.6.23 or
+ Build with libxml2, enabling SQL/XML support. Libxml2 version 2.6.23 or
later is required for this feature.
</para>
<para>
- Libxml installs a program <command>xml2-config</command> that
- can be used to detect the required compiler and linker
- options. PostgreSQL will use it automatically if found. To
- specify a libxml installation at an unusual location, you can
- either set the environment variable
- <envar>XML2_CONFIG</envar> to point to the
- <command>xml2-config</command> program belonging to the
- installation, or use the options
- <option>--with-includes</option> and
- <option>--with-libraries</option>.
+ To detect the required compiler and linker options, PostgreSQL will
+ query <command>pkg-config</command>, if that is installed and knows
+ about libxml2. Otherwise the program <command>xml2-config</command>,
+ which is installed by libxml2, will be used if it is found. Use
+ of <command>pkg-config</command> is preferred, because it can deal
+ with multi-architecture installations better.
+ </para>
+
+ <para>
+ To use a libxml2 installation that is in an unusual location, you
+ can set <command>pkg-config</command>-related environment
+ variables (see its documentation), or set the environment variable
+ <envar>XML2_CONFIG</envar> to point to
+ the <command>xml2-config</command> program belonging to the libxml2
+ installation, or set the variables <envar>XML2_CFLAGS</envar>
+ and <envar>XML2_LIBS</envar>. (If <command>pkg-config</command> is
+ installed, then to override its idea of where libxml2 is you must
+ either set <envar>XML2_CONFIG</envar> or set
+ both <envar>XML2_CFLAGS</envar> and <envar>XML2_LIBS</envar> to
+ nonempty strings.)
</para>
</listitem>
</varlistentry>
@@ -1857,7 +1867,7 @@ build-postgresql:
<listitem>
<para>
<command>xml2-config</command> program used to locate the
- libxml installation
+ libxml2 installation
</para>
</listitem>
</varlistentry>