Improve documentation/warning when --with-libxml is not used in the

installation.

diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 9e95f95f011d70c14e22e1853a0a65b7c3af93f2..fc5be3a1061f9a2ebd9637ffaea08608beacfaf6 100644 (file)
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,4 +1,4 @@
-
+
 
  
   Data Types
@@ -3202,11 +3202,13 @@ SELECT * FROM test;
     advantage over storing XML data in a text field is that it
     checks the input values for well-formedness, and there are support
     functions to perform type-safe operations on it; see 
-    linkend="functions-xml">.
+    linkend="functions-xml">.  Use of this data type requires the
+    installation to have been built with configure 
+    --with-libxml.
    
 
    
-    In particular, the xml type can store well-formed
+    The xml type can store well-formed
     documents, as defined by the XML standard, as well
     as content fragments, which are defined by the
     production XMLDecl? content in the XML


diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml

index cc872d8234f42c7a0e218700c24baeaac24bc0ad..b80b4a95c9d4a3afa6e836574f56630f38be5af2 100644 (file)

--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,4 +1,4 @@
-
+
 
  
   Functions and Operators
@@ -7511,7 +7511,9 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
    linkend="datatype-xml"> for information about the xml
    type.  The function-like expressions xmlparse
    and xmlserialize for converting to and from
-   type xml are not repeated here.
+   type xml are not repeated here.  Use of many of these
+   xml functions requires the installation to have been built
+   with configure --with-libxml.
   
 
   


diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c

index 4fea99128343cc0be9f0b0d5a40b34c5f96357eb..b0a75a147808a3ebd3e53b9cf6f8d9de67141b46 100644 (file)

--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.39 2007/04/02 03:49:39 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.40 2007/04/05 01:46:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -112,7 +112,7 @@ XmlOptionType xmloption;
 #define NO_XML_SUPPORT() \
    ereport(ERROR, \
            (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), \
-            errmsg("no XML support in this installation")))
+            errmsg("feature not supported;  no libxml support in this installation")))
 
 
 #define _textin(str) DirectFunctionCall1(textin, CStringGetDatum(str))

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index cc872d8234f42c7a0e218700c24baeaac24bc0ad..b80b4a95c9d4a3afa6e836574f56630f38be5af2 100644 (file)
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,4 +1,4 @@
-
+
 
  
   Functions and Operators
@@ -7511,7 +7511,9 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
    linkend="datatype-xml"> for information about the xml
    type.  The function-like expressions xmlparse
    and xmlserialize for converting to and from
-   type xml are not repeated here.
+   type xml are not repeated here.  Use of many of these
+   xml functions requires the installation to have been built
+   with configure --with-libxml.
   
 
   

diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 4fea99128343cc0be9f0b0d5a40b34c5f96357eb..b0a75a147808a3ebd3e53b9cf6f8d9de67141b46 100644 (file)
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.39 2007/04/02 03:49:39 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.40 2007/04/05 01:46:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -112,7 +112,7 @@ XmlOptionType xmloption;
 #define NO_XML_SUPPORT() \
    ereport(ERROR, \
            (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), \
-            errmsg("no XML support in this installation")))
+            errmsg("feature not supported;  no libxml support in this installation")))
 
 
 #define _textin(str) DirectFunctionCall1(textin, CStringGetDatum(str))