mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 05:28:00 +00:00
Code Issues Releases Wiki Activity

3923. [bug] Sanity check the xml2-config output. [RT #22246]

Browse Source
This commit is contained in:
Mark Andrews 2014-08-22 16:10:43 +10:00
parent eeb13c7cd2
commit 53f91cbd80
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,3 +1,5 @@
3923. [bug] Sanity check the xml2-config output. [RT #22246]
3922. [bug] When resigning, dnssec-signzone was removing
all signatures from delegation nodes. It now
retains DS and (if applicable) NSEC signatures.

24
configure vendored
View File

@ -16458,10 +16458,30 @@ esac
if test "X$libxml2_libs" != "X"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
CFLAGS="$CFLAGS $libxml2_cflags"
LIBS="$LIBS $libxml2_libs"
#
# Sanity check xml2-config output.
#
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libxml/xmlwriter.h>
int
main ()
{
return(xmlTextWriterStartElement(NULL, NULL));
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
as_fn_error $? "xml2-config returns badness" "$LINENO" 5
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h

8
configure.in
View File

@ -2085,9 +2085,15 @@ esac
if test "X$libxml2_libs" != "X"
then
AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS $libxml2_cflags"
LIBS="$LIBS $libxml2_libs"
#
# Sanity check xml2-config output.
#
AC_TRY_LINK([#include <libxml/xmlwriter.h>],
[return(xmlTextWriterStartElement(NULL, NULL));],
AC_MSG_RESULT(yes),
AC_MSG_ERROR(xml2-config returns badness))
AC_DEFINE(HAVE_LIBXML2, 1, [Define if libxml2 was found])
else
AC_MSG_RESULT(no)