<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d9d62e94463da2b849f73c1368647fdf66c1c06e">https://github.com/macports/macports-ports/commit/d9d62e94463da2b849f73c1368647fdf66c1c06e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d9d62e9 xar: use pkg-config with --libs --static rather than xml2-config
</span>d9d62e9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d9d62e94463da2b849f73c1368647fdf66c1c06e
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Wed Oct 23 16:37:44 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> xar: use pkg-config with --libs --static rather than xml2-config
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59400
</span>---
archivers/xar/Portfile | 9 +-
archivers/xar/files/patch-configure.ac | 26 -----
archivers/xar/files/patch-xar-configure.ac.diff | 140 ++++++++++++++++++++++++
3 files changed, 146 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/xar/Portfile b/archivers/xar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a677007..6eff998 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/xar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/xar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup clang_dependency 1.0
github.setup mackyle xar 1.6.1 xar-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
categories archivers sysutils
platforms darwin freebsd linux
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,10 @@ long_description ${description}
</span> worksrcdir ${distname}/xar
checksums rmd160 6bcdbf03f6c58d64eace10b4c52104d642995063 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e5edbb3e350c3aaee030c2c20909f0532938cdd2b9ed9da4476088c87eb7a65e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e5edbb3e350c3aaee030c2c20909f0532938cdd2b9ed9da4476088c87eb7a65e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 169715
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span>
depends_lib port:bzip2 \
port:icu \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +30,6 @@ depends_lib port:bzip2 \
</span> port:zlib
patchfiles patch-ext2.c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-xar-configure.ac.diff
</span>
use_autoconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/xar/files/patch-configure.ac b/archivers/xar/files/patch-configure.ac
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f5a910c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/xar/files/patch-configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From bab8837fd993385115d58763e15487dc8cc13f97 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Erik Goldman <erik.goldman@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 30 Apr 2018 22:02:39 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] fix https://github.com/mackyle/xar/issues/18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 812b5ff..1b70c06 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -329,7 +329,11 @@ dnl Configure libcrypto (part of OpenSSL).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_libcrypto="1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_HEADERS([openssl/evp.h], , [have_libcrypto="0"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_CHECK_LIB([crypto], [OpenSSL_add_all_ciphers], , [have_libcrypto="0"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_LIB([crypto], [OpenSSL_add_all_ciphers], , [have_libcrypto_ossl10="0"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_LIB([crypto], [OPENSSL_init_crypto], , [have_libcrypto_ossl11="0"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x${have_libcrypto_ossl10}" = "x0" -a "x${have_libcrypto_ossl11}" = "x0" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ have_libcrypto="0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x${have_libcrypto}" = "x0" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([Cannot build without libcrypto (OpenSSL)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/xar/files/patch-xar-configure.ac.diff b/archivers/xar/files/patch-xar-configure.ac.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..84172c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/xar/files/patch-xar-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,140 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2012-09-17 06:30:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2019-10-23 16:19:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -266,56 +266,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Configure libxml2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBXML2_VERSION_MIN=2.6.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-have_libxml2="1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_ARG_WITH([xml2-config], [ --with-xml2-config libxml2 config program],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x${with_xml2_config}" = "xno" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XML2_CONFIG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_ARG_WITH([pkg-config], [ --with-pkg-config pkg config program]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x${with_pkg_config}" = "xno" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CONFIG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XML2_CONFIG="${with_xml2_config}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKG_CONFIG="${with_pkg_config}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XML2_CONFIG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x${XML2_CONFIG}" != "x" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test ! -x "${XML2_CONFIG}" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([Unusable or missing xml2-config: ${XML2_CONFIG}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_PATH_PROG([XML2_CONFIG], [xml2-config], , [${PATH}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x${XML2_CONFIG}" = "x" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([Cannot configure without xml2-config])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test -z "$PKG_CONFIG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl Make sure the version of libxml2 found is sufficient.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_MSG_CHECKING([for libxml >= ${LIBXML2_VERSION_MIN}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBXML2_FOUND=`2>&1 ${XML2_CONFIG} --version`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBXML2_MAJOR=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $1}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBXML2_MINOR=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $2}' | tr a-z " " |awk '{print $1}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBXML2_BRANCH=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $3}' | tr a-z " " |awk '{print $1}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x${LIBXML2_BRANCH}" = "x" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBXML2_BRANCH=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBXML2_MAJOR_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $1}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBXML2_MINOR_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $2}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBXML2_BRANCH_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $3}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test ${LIBXML2_MAJOR} -gt ${LIBXML2_MAJOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -o ${LIBXML2_MAJOR} -eq ${LIBXML2_MAJOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -a ${LIBXML2_MINOR} -gt ${LIBXML2_MINOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -o ${LIBXML2_MAJOR} -eq ${LIBXML2_MAJOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -a ${LIBXML2_MINOR} -eq ${LIBXML2_MINOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -a ${LIBXML2_BRANCH} -ge $LIBXML2_BRANCH_MIN ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([${LIBXML2_MAJOR}.${LIBXML2_MINOR}.${LIBXML2_BRANCH}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_libxml2="1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="${CPPFLAGS} `${XML2_CONFIG} --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS="${LIBS} `${XML2_CONFIG} --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- have_libxml2="0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl If pkg-config is found try using it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++have_libxml2="1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libxml-2.0; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if `${PKG_CONFIG} --atleast-version=2.6.11 libxml-2.0`; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ found_libxml=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CPPFLAGS="${CPPFLAGS} `${PKG_CONFIG} --cflags-only-I libxml-2.0`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS="${LIBS} `${PKG_CONFIG} --libs --static libxml-2.0`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ have_libxml2="0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBXML2_VERSION_MIN=2.6.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# have_libxml2="1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# AC_ARG_WITH([xml2-config], [ --with-xml2-config libxml2 config program],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if test "x${with_xml2_config}" = "xno" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# XML2_CONFIG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# XML2_CONFIG="${with_xml2_config}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# XML2_CONFIG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if test "x${XML2_CONFIG}" != "x" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if test ! -x "${XML2_CONFIG}" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# AC_MSG_ERROR([Unusable or missing xml2-config: ${XML2_CONFIG}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# AC_PATH_PROG([XML2_CONFIG], [xml2-config], , [${PATH}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if test "x${XML2_CONFIG}" = "x" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# AC_MSG_ERROR([Cannot configure without xml2-config])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# dnl Make sure the version of libxml2 found is sufficient.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# AC_MSG_CHECKING([for libxml >= ${LIBXML2_VERSION_MIN}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBXML2_FOUND=`2>&1 ${XML2_CONFIG} --version`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBXML2_MAJOR=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $1}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBXML2_MINOR=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $2}' | tr a-z " " |awk '{print $1}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBXML2_BRANCH=`echo ${LIBXML2_FOUND} | tr . " " | awk '{print $3}' | tr a-z " " |awk '{print $1}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if test "x${LIBXML2_BRANCH}" = "x" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBXML2_BRANCH=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBXML2_MAJOR_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $1}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBXML2_MINOR_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $2}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBXML2_BRANCH_MIN=`echo ${LIBXML2_VERSION_MIN} | tr . " " | awk '{print $3}'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if test ${LIBXML2_MAJOR} -gt ${LIBXML2_MAJOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -o ${LIBXML2_MAJOR} -eq ${LIBXML2_MAJOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -a ${LIBXML2_MINOR} -gt ${LIBXML2_MINOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -o ${LIBXML2_MAJOR} -eq ${LIBXML2_MAJOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -a ${LIBXML2_MINOR} -eq ${LIBXML2_MINOR_MIN} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# -a ${LIBXML2_BRANCH} -ge $LIBXML2_BRANCH_MIN ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# AC_MSG_RESULT([${LIBXML2_MAJOR}.${LIBXML2_MINOR}.${LIBXML2_BRANCH}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# have_libxml2="1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# CPPFLAGS="${CPPFLAGS} `${XML2_CONFIG} --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LIBS="${LIBS} `${XML2_CONFIG} --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# have_libxml2="0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x${have_libxml2}" = "x1" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Final sanity check, to make sure that xmlwriter is present.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADER([libxml/xmlwriter.h], , [have_libxml2="0"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,7 +355,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_libcrypto="1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([openssl/evp.h], , [have_libcrypto="0"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_CHECK_LIB([crypto], [OpenSSL_add_all_ciphers], , [have_libcrypto="0"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_LIB([crypto], [OpenSSL_add_all_ciphers], , [have_libcrypto_ossl10="0"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_LIB([crypto], [OPENSSL_init_crypto], , [have_libcrypto_ossl11="0"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x${have_libcrypto_ossl10}" = "x0" -a "x${have_libcrypto_ossl11}" = "x0" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ have_libcrypto="0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x${have_libcrypto}" = "x0" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([Cannot build without libcrypto (OpenSSL)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span></pre><pre style='margin:0'>
</pre>