commit:     948d05626dc945da43baa24204331dd87fe534fb
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 01:45:45 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 01:45:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=948d0562

app-antivirus/clamav: remove older vulnerable versions.

Bug: https://bugs.gentoo.org/722726
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 app-antivirus/clamav/Manifest                      |   1 -
 app-antivirus/clamav/clamav-0.102.2-r1.ebuild      | 214 --------------------
 app-antivirus/clamav/clamav-0.102.2-r3.ebuild      | 225 ---------------------
 .../files/clamav-0.101.2-libxml2_pkgconfig.patch   |  78 -------
 4 files changed, 518 deletions(-)

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 213281bf6a9..c908a9c0522 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,2 +1 @@
-DIST clamav-0.102.2.tar.gz 13227538 BLAKE2B 
09d18f507a439f1dd63ebc038b129e0ead75bb344bfad2b5bd36e2c0c76af01f42fcacc60ff40b5676cb5fb7b38b90747452654a5d104b9b7b5e2d5a06b3dc2d
 SHA512 
7db53e0e2b4d6b0e4cf5048d3c9dfbcabcffd680c3a2b718c763b9599b0c1c14e56bae70c54c251ee9e8fd1acd3134657196dbaad2d23a16bad76a088c6fc41f
 DIST clamav-0.102.3.tar.gz 13226108 BLAKE2B 
741c0cc6a088ffe880eabb7a59151b3c13c5754f9cb36582ffca9cbeea6b039e3c49b7155ba14fa302e9ee4bfa6adf8b98f0e29f2354ea8569b11b1ed2b2532c
 SHA512 
d239718814b303fb0f1655d9bdaf3675d888eea57e786d927eafabb7b6f58cd7f5fb7dc149511c2af6f800dcc919f2e1d6954110d45b9e16619c632e8d2b37f2

diff --git a/app-antivirus/clamav/clamav-0.102.2-r1.ebuild 
b/app-antivirus/clamav/clamav-0.102.2-r1.ebuild
deleted file mode 100644
index 8809377758e..00000000000
--- a/app-antivirus/clamav/clamav-0.102.2-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="https://www.clamav.net/";
-SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter 
metadata-analysis-api selinux static-libs test uclibc xml"
-
-REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter 
!metadata-analysis-api )"
-
-RESTRICT="!test? ( test )"
-
-# Require acct-{user,group}/clamav at build time so that we can set
-# the permissions on /var/lib/clamav in src_install rather than in
-# pkg_postinst; calling "chown" on the live filesystem scares me.
-CDEPEND="acct-group/clamav
-       acct-user/clamav
-       dev-libs/libltdl
-       dev-libs/libmspack
-       || ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
-       >=sys-libs/zlib-1.2.2:=
-       bzip2? ( app-arch/bzip2 )
-       clamdtop? ( sys-libs/ncurses:0 )
-       clamsubmit? ( net-misc/curl dev-libs/json-c:= )
-       elibc_musl? ( sys-libs/fts-standalone )
-       iconv? ( virtual/libiconv )
-       !libclamav-only? ( net-misc/curl )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
-       milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-       xml? ( dev-libs/libxml2 )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-       metadata-analysis-api? ( dev-libs/json-c:* )
-       test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-clamav )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
-       "${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
-       "${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
-)
-
-src_prepare() {
-       default
-       eautoconf
-}
-
-src_configure() {
-       use elibc_musl && append-ldflags -lfts
-       use ppc64 && append-flags -mminimal-toc
-       use uclibc && export ac_cv_type_error_t=yes
-
-       # according to configure help it should be
-       # $(use_enable xml)
-       # but that does not work
-       # do not add this, since --disable-xml seems to override
-       # --without-xml
-       JSONUSE="--without-libjson"
-
-       if use clamsubmit || use metadata-analysis-api; then
-               # either of those 2 requires libjson.
-               # clamsubmit will be built as soon as libjson and curl are found
-               # but we only install the binary if requested
-               JSONUSE="--with-libjson=${EPREFIX}/usr"
-       fi
-
-       local myeconfargs=(
-               $(use_enable bzip2)
-               $(use_enable clamdtop)
-               $(use_enable ipv6)
-               $(use_enable milter)
-               $(use_enable static-libs static)
-               $(use_enable test check)
-               $(use_with xml)
-               $(use_with iconv)
-               ${JSONUSE}
-               $(use_enable libclamav-only)
-               $(use_with !libclamav-only libcurl)
-               --with-system-libmspack
-               --cache-file="${S}"/config.cache
-               --disable-experimental
-               --disable-zlib-vcheck
-               --enable-id-check
-               --with-dbdir="${EPREFIX}"/var/lib/clamav
-               # Don't call --with-zlib=/usr (see bug #699296)
-               --with-zlib
-               --disable-llvm
-       )
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-
-       rm -rf "${ED}"/var/lib/clamav || die
-
-       if ! use libclamav-only ; then
-               newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-               newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-               systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-               systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-               systemd_dounit "${FILESDIR}/clamd.service"
-               systemd_dounit "${FILESDIR}/freshclamd.service"
-
-               insinto /etc/logrotate.d
-               newins "${FILESDIR}"/clamav.logrotate clamav
-
-               # Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-               sed -i -e "s:^\(Example\):\# \1:" \
-                       -e "s:.*\(PidFile\) .*:\1 
${EPREFIX}/var/run/clamav/clamd.pid:" \
-                       -e "s:.*\(LocalSocket\) .*:\1 
${EPREFIX}/var/run/clamav/clamd.sock:" \
-                       -e "s:.*\(User\) .*:\1 clamav:" \
-                       -e "s:^\#\(LogFile\) .*:\1 
${EPREFIX}/var/log/clamav/clamd.log:" \
-                       -e "s:^\#\(LogTime\).*:\1 yes:" \
-                       -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-                       -e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-                       "${ED}"/etc/clamd.conf.sample || die
-
-               sed -i -e "s:^\(Example\):\# \1:" \
-                       -e "s:.*\(PidFile\) .*:\1 
${EPREFIX}/var/run/clamav/freshclam.pid:" \
-                       -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-                       -e "s:^\#\(UpdateLogFile\) .*:\1 
${EPREFIX}/var/log/clamav/freshclam.log:" \
-                       -e "s:^\#\(NotifyClamd\).*:\1 
${EPREFIX}/etc/clamd.conf:" \
-                       -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-                       -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-                       -e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-                       "${ED}"/etc/freshclam.conf.sample || die
-
-               if use milter ; then
-                       # MilterSocket one to include ' /' because there is a 
2nd line for
-                       # inet: which we want to leave
-                       ##dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-                       sed -i -e "s:^\(Example\):\# \1:" \
-                               -e "s:.*\(PidFile\) .*:\1 
${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-                               -e "s+^\#\(ClamdSocket\) .*+\1 
unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-                               -e "s:.*\(User\) .*:\1 clamav:" \
-                               -e "s+^\#\(MilterSocket\) /.*+\1 
unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-                               -e "s:^\#\(AllowSupplementaryGroups\).*:\1 
yes:" \
-                               -e "s:^\#\(LogFile\) .*:\1 
${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-                               "${ED}"/etc/clamav-milter.conf.sample || die
-
-                       cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-                               MILTER_NICELEVEL=19
-                               START_MILTER=no
-                       EOF
-
-                       systemd_newunit "${FILESDIR}/clamav-milter.service-r1" 
clamav-milter.service
-               fi
-
-               local i
-               for i in clamd freshclam clamav-milter
-               do
-                       if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then
-                               mv "${ED}"/etc/"${i}".conf{.sample,} || die
-                       fi
-               done
-
-               # These both need to be writable by the clamav user.
-               # TODO: use syslog by default; that's what it's for.
-               diropts -o clamav -g clamav
-               keepdir /var/lib/clamav
-               keepdir /var/log/clamav
-       fi
-
-       if use doc ; then
-               local HTML_DOCS=( docs/html/. )
-               einstalldocs
-
-               if ! use libclamav-only ; then
-                       doman docs/man/*.[1-8]
-               fi
-       fi
-
-       find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
-       if use libclamav-only ; then
-               ewarn "Test target not available when USE=libclamav-only is 
set, skipping tests ..."
-               return 0
-       fi
-
-       emake quick-check
-}
-
-pkg_postinst() {
-       if use milter ; then
-               elog "For simple instructions how to setup the clamav-milter 
read the"
-               elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-       fi
-
-       local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
-       if [[ ! -f "${databases}" ]] ; then
-               ewarn "You must run freshclam manually to populate the virus 
database"
-               ewarn "before starting clamav for the first time."
-       fi
-
-       elog "For instructions on how to use clamonacc, see"
-       elog
-       elog "  https://www.clamav.net/documents/on-access-scanning";
-}

diff --git a/app-antivirus/clamav/clamav-0.102.2-r3.ebuild 
b/app-antivirus/clamav/clamav-0.102.2-r3.ebuild
deleted file mode 100644
index e4700595b03..00000000000
--- a/app-antivirus/clamav/clamav-0.102.2-r3.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="https://www.clamav.net/";
-SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter 
metadata-analysis-api selinux test uclibc xml"
-
-REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter 
!metadata-analysis-api )"
-
-RESTRICT="!test? ( test )"
-
-# Require acct-{user,group}/clamav at build time so that we can set
-# the permissions on /var/lib/clamav in src_install rather than in
-# pkg_postinst; calling "chown" on the live filesystem scares me.
-CDEPEND="acct-group/clamav
-       acct-user/clamav
-       dev-libs/libltdl
-       dev-libs/libmspack
-       || ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
-       >=sys-libs/zlib-1.2.2:=
-       bzip2? ( app-arch/bzip2 )
-       clamdtop? ( sys-libs/ncurses:0 )
-       clamsubmit? ( net-misc/curl dev-libs/json-c:= )
-       elibc_musl? ( sys-libs/fts-standalone )
-       iconv? ( virtual/libiconv )
-       !libclamav-only? ( net-misc/curl )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
-       metadata-analysis-api? ( dev-libs/json-c:= )
-       milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-       xml? ( dev-libs/libxml2 )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-       test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-clamav )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
-       "${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
-       "${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
-)
-
-src_prepare() {
-       default
-       eautoconf
-
-       if ! use clamsubmit; then
-               # ENABLE_CLAMSUBMIT is defined in the configure script based on
-               # only the values of $have_curl and $have_json (so we have no
-               # easy way to disable it). Here we hack the configure script to
-               # manually set the value of ENABLE_CLAMSUBMIT to something falsy
-               # when USE=clamsubmit is not set. Yes, this looks backwards. The
-               # value '#' is not a boolean indicator, it's a comment 
character.
-               sed -e "s/ENABLE_CLAMSUBMIT_TRUE=$/ENABLE_CLAMSUBMIT_TRUE='#'/" 
\
-                       -e 
"s/ENABLE_CLAMSUBMIT_FALSE='#'/ENABLE_CLAMSUBMIT_FALSE=/" \
-                       -i configure \
-                       || die 'failed to disable clamsubmit in ./configure 
script'
-       fi
-}
-
-src_configure() {
-       use elibc_musl && append-ldflags -lfts
-       use ppc64 && append-flags -mminimal-toc
-       use uclibc && export ac_cv_type_error_t=yes
-
-       # according to configure help it should be
-       # $(use_enable xml)
-       # but that does not work
-       # do not add this, since --disable-xml seems to override
-       # --without-xml
-       JSONCONF="--without-libjson"
-
-       if use clamsubmit || use metadata-analysis-api; then
-               # Either of these requires libjson-c.
-               JSONCONF="--with-libjson=${EPREFIX}/usr"
-       fi
-
-       local myeconfargs=(
-               $(use_enable bzip2)
-               $(use_enable clamdtop)
-               $(use_enable ipv6)
-               $(use_enable milter)
-               $(use_enable test check)
-               $(use_with xml)
-               $(use_with iconv)
-               ${JSONCONF}
-               $(use_enable libclamav-only)
-               $(use_with !libclamav-only libcurl)
-               --with-system-libmspack
-               --cache-file="${S}"/config.cache
-               --disable-experimental
-               --disable-static
-               --disable-zlib-vcheck
-               --enable-id-check
-               --with-dbdir="${EPREFIX}"/var/lib/clamav
-               # Don't call --with-zlib=/usr (see bug #699296)
-               --with-zlib
-               --disable-llvm
-       )
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-
-       rm -rf "${ED}"/var/lib/clamav || die
-
-       if ! use libclamav-only ; then
-               newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-               newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-               systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-               systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-               systemd_dounit "${FILESDIR}/clamd.service"
-               systemd_dounit "${FILESDIR}/freshclamd.service"
-
-               insinto /etc/logrotate.d
-               newins "${FILESDIR}"/clamav.logrotate clamav
-
-               # Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-               sed -i -e "s:^\(Example\):\# \1:" \
-                       -e "s:.*\(PidFile\) .*:\1 
${EPREFIX}/var/run/clamav/clamd.pid:" \
-                       -e "s:.*\(LocalSocket\) .*:\1 
${EPREFIX}/var/run/clamav/clamd.sock:" \
-                       -e "s:.*\(User\) .*:\1 clamav:" \
-                       -e "s:^\#\(LogFile\) .*:\1 
${EPREFIX}/var/log/clamav/clamd.log:" \
-                       -e "s:^\#\(LogTime\).*:\1 yes:" \
-                       -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-                       -e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-                       "${ED}"/etc/clamd.conf.sample || die
-
-               sed -i -e "s:^\(Example\):\# \1:" \
-                       -e "s:.*\(PidFile\) .*:\1 
${EPREFIX}/var/run/clamav/freshclam.pid:" \
-                       -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-                       -e "s:^\#\(UpdateLogFile\) .*:\1 
${EPREFIX}/var/log/clamav/freshclam.log:" \
-                       -e "s:^\#\(NotifyClamd\).*:\1 
${EPREFIX}/etc/clamd.conf:" \
-                       -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-                       -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-                       -e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-                       "${ED}"/etc/freshclam.conf.sample || die
-
-               if use milter ; then
-                       # MilterSocket one to include ' /' because there is a 
2nd line for
-                       # inet: which we want to leave
-                       ##dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-                       sed -i -e "s:^\(Example\):\# \1:" \
-                               -e "s:.*\(PidFile\) .*:\1 
${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-                               -e "s+^\#\(ClamdSocket\) .*+\1 
unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-                               -e "s:.*\(User\) .*:\1 clamav:" \
-                               -e "s+^\#\(MilterSocket\) /.*+\1 
unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-                               -e "s:^\#\(AllowSupplementaryGroups\).*:\1 
yes:" \
-                               -e "s:^\#\(LogFile\) .*:\1 
${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-                               "${ED}"/etc/clamav-milter.conf.sample || die
-
-                       cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-                               MILTER_NICELEVEL=19
-                               START_MILTER=no
-                       EOF
-
-                       systemd_newunit "${FILESDIR}/clamav-milter.service-r1" 
clamav-milter.service
-               fi
-
-               local i
-               for i in clamd freshclam clamav-milter
-               do
-                       if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then
-                               mv "${ED}"/etc/"${i}".conf{.sample,} || die
-                       fi
-               done
-
-               # These both need to be writable by the clamav user.
-               # TODO: use syslog by default; that's what it's for.
-               diropts -o clamav -g clamav
-               keepdir /var/lib/clamav
-               keepdir /var/log/clamav
-       fi
-
-       if use doc ; then
-               local HTML_DOCS=( docs/html/. )
-               einstalldocs
-
-               if ! use libclamav-only ; then
-                       doman docs/man/*.[1-8]
-               fi
-       fi
-
-       find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
-       if use libclamav-only ; then
-               ewarn "Test target not available when USE=libclamav-only is 
set, skipping tests ..."
-               return 0
-       fi
-
-       emake quick-check
-}
-
-pkg_postinst() {
-       if use milter ; then
-               elog "For simple instructions how to setup the clamav-milter 
read the"
-               elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-       fi
-
-       local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
-       if [[ ! -f "${databases}" ]] ; then
-               ewarn "You must run freshclam manually to populate the virus 
database"
-               ewarn "before starting clamav for the first time."
-       fi
-
-       elog "For instructions on how to use clamonacc, see"
-       elog
-       elog "  https://www.clamav.net/documents/on-access-scanning";
-}

diff --git a/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch 
b/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch
deleted file mode 100644
index e1f5bb9b338..00000000000
--- a/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://bugs.gentoo.org/661328
-
---- clamav-0.101.2/m4/reorganization/libs/xml.m4
-+++ clamav-0.101.2/m4/reorganization/libs/xml.m4
-@@ -4,55 +4,19 @@
- [AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])],
- want_xml=$enableval, want_xml="auto")
- 
--XML_HOME=""
--if test "X$want_xml" != "Xno"; then
--  AC_MSG_CHECKING([for libxml2 installation])
--  AC_ARG_WITH([xml],
--    AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing 
libxml2 library
--                    @<:@default=/usr/local or /usr if not found in 
/usr/local@:>@]),
--    [with_xml_val=$withval]
--  )
--fi
--
--AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""],
--  [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"],
--  [XML_HOME="$with_xml_val"])
--
--AS_IF([test "x$XML_HOME" != "x"], [
--   AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""])
--   ])
--
--AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [
--   AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"])
--   ])
--
--if test "x$XML_HOME" != "x"; then
--  AC_MSG_RESULT([$XML_HOME])
--else
--  AC_MSG_RESULT([not found])
--fi
--
--found_xml="no"
--XMLCONF_VERSION=""
--XML_CPPFLAGS=""
--XML_LIBS=""
--if test "x$XML_HOME" != "x"; then
--  AC_MSG_CHECKING([xml2-config version])
--  XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
--  if test "x%XMLCONF_VERSION" != "x"; then
--    AC_MSG_RESULT([$XMLCONF_VERSION])
--    found_xml="yes"
--    XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
--    XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
--    AS_ECHO("$XML_CPPFLAGS")
--    AS_ECHO("$XML_LIBS")
--  else
--    AC_MSG_ERROR([xml2-config failed])
--  fi
--fi
-+PKG_CHECK_MODULES([XML], [libxml-2.0],
-+      [found_xml=yes],
-+      [
-+              found_xml=no
-+              AS_IF([test "x$want_xml" = xyes],
-+                      [AC_MSG_ERROR([--enable-xml set but cannot find 
libxml2])]
-+              )
-+      ]
-+)
- 
- working_xml="no"
- if test "X$found_xml" != "Xno"; then
-+  XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0)
-   AC_MSG_CHECKING([for xmlreader.h in $XML_HOME])
- 
-   if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
-@@ -61,6 +25,7 @@
-     AC_MSG_RESULT([found])
-     save_LIBS="$LIBS"
-     save_CPPFLAGS="$CPPFLAGS"
-+    XML_CPPFLAGS="$XML_CFLAGS"
-     CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
-     save_LDFLAGS="$LDFLAGS"
-     LDFLAGS="$LDFLAGS $XML_LIBS"

Reply via email to