Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit de9aa5a

Browse files
committed
Check and document minimum required version of libxml.
1 parent fe73396 commit de9aa5a

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

configure

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7307,9 +7307,9 @@ fi
73077307

73087308
if test "$with_libxml" = yes ; then
73097309

7310-
echo "$as_me:$LINENO: checking for xmlInitParser in -lxml2" >&5
7311-
echo $ECHO_N "checking for xmlInitParser in -lxml2... $ECHO_C" >&6
7312-
if test "${ac_cv_lib_xml2_xmlInitParser+set}" = set; then
7310+
echo "$as_me:$LINENO: checking for xmlSaveToBuffer in -lxml2" >&5
7311+
echo $ECHO_N "checking for xmlSaveToBuffer in -lxml2... $ECHO_C" >&6
7312+
if test "${ac_cv_lib_xml2_xmlSaveToBuffer+set}" = set; then
73137313
echo $ECHO_N "(cached) $ECHO_C" >&6
73147314
else
73157315
ac_check_lib_save_LIBS=$LIBS
@@ -7327,11 +7327,11 @@ extern "C"
73277327
#endif
73287328
/* We use char because int might match the return type of a gcc2
73297329
builtin and then its argument prototype would still apply. */
7330-
char xmlInitParser ();
7330+
char xmlSaveToBuffer ();
73317331
int
73327332
main ()
73337333
{
7334-
xmlInitParser ();
7334+
xmlSaveToBuffer ();
73357335
;
73367336
return 0;
73377337
}
@@ -7358,29 +7358,29 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
73587358
ac_status=$?
73597359
echo "$as_me:$LINENO: \$? = $ac_status" >&5
73607360
(exit $ac_status); }; }; then
7361-
ac_cv_lib_xml2_xmlInitParser=yes
7361+
ac_cv_lib_xml2_xmlSaveToBuffer=yes
73627362
else
73637363
echo "$as_me: failed program was:" >&5
73647364
sed 's/^/| /' conftest.$ac_ext >&5
73657365

7366-
ac_cv_lib_xml2_xmlInitParser=no
7366+
ac_cv_lib_xml2_xmlSaveToBuffer=no
73677367
fi
73687368
rm -f conftest.err conftest.$ac_objext \
73697369
conftest$ac_exeext conftest.$ac_ext
73707370
LIBS=$ac_check_lib_save_LIBS
73717371
fi
7372-
echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlInitParser" >&5
7373-
echo "${ECHO_T}$ac_cv_lib_xml2_xmlInitParser" >&6
7374-
if test $ac_cv_lib_xml2_xmlInitParser = yes; then
7372+
echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlSaveToBuffer" >&5
7373+
echo "${ECHO_T}$ac_cv_lib_xml2_xmlSaveToBuffer" >&6
7374+
if test $ac_cv_lib_xml2_xmlSaveToBuffer = yes; then
73757375
cat >>confdefs.h <<_ACEOF
73767376
#define HAVE_LIBXML2 1
73777377
_ACEOF
73787378

73797379
LIBS="-lxml2 $LIBS"
73807380

73817381
else
7382-
{ { echo "$as_me:$LINENO: error: library 'xml2' is required for XML support" >&5
7383-
echo "$as_me: error: library 'xml2' is required for XML support" >&2;}
7382+
{ { echo "$as_me:$LINENO: error: library 'xml2' (version >= 2.6.23) is required for XML support" >&5
7383+
echo "$as_me: error: library 'xml2' (version >= 2.6.23) is required for XML support" >&2;}
73847384
{ (exit 1); exit 1; }; }
73857385
fi
73867386

configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.495 2007/01/05 22:19:17 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.496 2007/01/07 21:10:40 petere Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -724,7 +724,7 @@ if test "$with_pam" = yes ; then
724724
fi
725725

726726
if test "$with_libxml" = yes ; then
727-
AC_CHECK_LIB(xml2, xmlInitParser, [], [AC_MSG_ERROR([library 'xml2' is required for XML support])])
727+
AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])])
728728
fi
729729

730730

doc/src/sgml/installation.sgml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.270 2006/12/24 00:29:17 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.271 2007/01/07 21:10:41 petere Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -909,7 +909,8 @@ su - postgres
909909
<term><option>--with-libxml</option></term>
910910
<listitem>
911911
<para>
912-
Build with libxml (enables SQL/XML support).
912+
Build with libxml (enables SQL/XML support). Libxml version 2.6.23 or
913+
later is required for this feature.
913914
</para>
914915
</listitem>
915916
</varlistentry>

0 commit comments

Comments
 (0)