@@ -323,8 +323,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \

 	$(top_srcdir)/docs/man/sigtool.1.in \

 	$(top_srcdir)/libclammspack/config.h.in COPYING config/ar-lib \

 	config/compile config/config.guess config/config.rpath \

-	config/config.sub config/install-sh config/ltmain.sh \

-	config/missing config/ylwrap

+	config/config.sub config/depcomp config/install-sh \

+	config/ltmain.sh config/missing config/ylwrap

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

 distdir = $(PACKAGE)-$(VERSION)

 top_distdir = $(distdir)

@@ -620,6 +620,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 ACLOCAL_AMFLAGS = -I m4

 SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan \

 	freshclam sigtool clamconf database docs etc clamav-milter \

@@ -568,6 +568,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_SOURCES = \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/optparser.c \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/optparser.h \

@@ -502,6 +502,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 clambc_SOURCES = \

     $(top_srcdir)/shared/optparser.c \

     $(top_srcdir)/shared/optparser.h \

@@ -522,6 +522,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 clamconf_SOURCES = \

     $(top_srcdir)/shared/optparser.c \

     $(top_srcdir)/shared/optparser.h \

@@ -570,6 +570,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 @BUILD_CLAMD_TRUE@clamd_SOURCES = \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.c \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.h \

@@ -532,6 +532,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 @BUILD_CLAMD_TRUE@clamdscan_SOURCES = \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.c \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/output.h \

@@ -537,6 +537,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 @HAVE_CURSES_TRUE@man_MANS = $(top_builddir)/docs/man/clamdtop.1

 @HAVE_CURSES_TRUE@clamdtop_SOURCES = \

 @HAVE_CURSES_TRUE@    $(top_srcdir)/shared/optparser.c \

@@ -542,6 +542,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 clamonacc_SOURCES = $(top_srcdir)/shared/output.c \

 	$(top_srcdir)/shared/output.h $(top_srcdir)/shared/optparser.c \

 	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/misc.c \

@@ -525,6 +525,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 clamscan_SOURCES = \

     $(top_srcdir)/shared/output.c \

     $(top_srcdir)/shared/output.h \

@@ -565,6 +565,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 clamsubmit_SOURCES = $(top_srcdir)/shared/output.c \

 	$(top_srcdir)/shared/output.h $(top_srcdir)/shared/optparser.c \

 	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/getopt.c \

@@ -768,6 +768,7 @@ HAVE_LIBXML2_FALSE

 HAVE_LIBXML2_TRUE

 XML_LIBS

 XML_CPPFLAGS

+xmlconfig

 ENABLE_COVERAGE_FALSE

 ENABLE_COVERAGE_TRUE

 GENHTML

@@ -22080,6 +22081,7 @@ fi

 XML_HOME=""

+xmlconfig=""

 if test "X$want_xml" != "Xno"; then

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 installation" >&5

 $as_echo_n "checking for libxml2 installation... " >&6; }

@@ -22090,9 +22092,8 @@ if test "${with_xml+set}" = set; then :

 fi

-fi

-if test "x$with_xml_val" = "xno"; then :

+  if test "x$with_xml_val" = "xno"; then :

   XML_HOME=""

 elif test "x$with_xml_val" = "xyes"; then :

   XML_HOME="/usr/local"

@@ -22100,72 +22101,134 @@ else

   XML_HOME="$with_xml_val"

 fi

-if test "x$XML_HOME" != "x"; then :

+  if test "x$XML_HOME" != "x"; then :

-   if test ! -x "$XML_HOME/bin/xml2-config"; then :

+     if test ! -x "$XML_HOME/bin/xml2-config"; then :

   XML_HOME=""

 fi

 fi

-if test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"; then :

+  if test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"; then :

-   if test -x "/usr/bin/xml2-config"; then :

+     if test -x "/usr/bin/xml2-config"; then :

   XML_HOME="/usr"

 fi

 fi

-if test "x$XML_HOME" != "x"; then

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_HOME" >&5

+  if test "x$XML_HOME" != "x"; then

+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_HOME" >&5

 $as_echo "$XML_HOME" >&6; }

-else

-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5

+    with_xml="yes"

+  else

+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5

 $as_echo "not found" >&6; }

+  fi

+

+  found_xml="no"

+  XMLCONF_VERSION=""

+  XML_CPPFLAGS=""

+  XML_LIBS=""

+  case "$with_xml" in

+    yes) # Extract the first word of "xml2-config", so it can be a program name with args.

+set dummy xml2-config; ac_word=$2

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

+$as_echo_n "checking for $ac_word... " >&6; }

+if ${ac_cv_path_xmlconfig+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  case $xmlconfig in

+  [\\/]* | ?:[\\/]*)

+  ac_cv_path_xmlconfig="$xmlconfig" # Let the user override the test with a path.

+  ;;

+  *)

+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+    for ac_exec_ext in '' $ac_executable_extensions; do

+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

+    ac_cv_path_xmlconfig="$as_dir/$ac_word$ac_exec_ext"

+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+  done

+IFS=$as_save_IFS

+

+  ;;

+esac

+fi

+xmlconfig=$ac_cv_path_xmlconfig

+if test -n "$xmlconfig"; then

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmlconfig" >&5

+$as_echo "$xmlconfig" >&6; }

+else

+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

 fi

-found_xml="no"

-XMLCONF_VERSION=""

-XML_CPPFLAGS=""

-XML_LIBS=""

-if test "x$XML_HOME" != "x"; then

-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking xml2-config version" >&5

+

+        if test "x$xmlconfig" = x ; then

+            { $as_echo "$as_me:${as_lineno-$LINENO}: can not locate xml2-config in PATH, will search default XML_HOME variants" >&5

+$as_echo "$as_me: can not locate xml2-config in PATH, will search default XML_HOME variants" >&6;}

+

+            if test "x$XML_HOME" != "x"; then

+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking xml2-config version" >&5

 $as_echo_n "checking xml2-config version... " >&6; }

-  XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"

-  if test "x%XMLCONF_VERSION" != "x"; then

-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLCONF_VERSION" >&5

+                XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"

+

+                if test "x%XMLCONF_VERSION" != "x"; then

+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLCONF_VERSION" >&5

 $as_echo "$XMLCONF_VERSION" >&6; }

-    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

-    as_fn_error $? "xml2-config failed" "$LINENO" 5

-  fi

-fi

+                    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

+                    as_fn_error $? "xml2-config failed" "$LINENO" 5

+                fi

+            fi

+        else

+            found_xml="yes"

+            XMLCONF_VERSION="`$xmlconfig --version`"

+            XML_CPPFLAGS="`$xmlconfig --cflags`"

+            XML_LIBS="`$xmlconfig --libs`"

+        fi

+  esac

+

+  working_xml="no"

+  if test "X$found_xml" != "Xno"; then

-working_xml="no"

-if test "X$found_xml" != "Xno"; then

-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlreader.h in $XML_HOME" >&5

-$as_echo_n "checking for xmlreader.h in $XML_HOME... " >&6; }

+    readerresult=""

+    if test "x$xmlconfig" = x ; then

+        readerresult="$XML_HOME/include/libxml2/libxml/xmlreader.h"

+    else

+        readerresult="`$xmlconfig --prefix`/include/libxml2/libxml/xmlreader.h"

+    fi

-  if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then

-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5

+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlreader.h in $readerresult" >&5

+$as_echo_n "checking for xmlreader.h in $readerresult... " >&6; }

+

+    if test ! -f "$readerresult"; then

+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5

 $as_echo "not found" >&6; }

-  else

-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5

+    else

+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5

 $as_echo "found" >&6; }

-    save_LIBS="$LIBS"

-    save_CPPFLAGS="$CPPFLAGS"

-    CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"

-    save_LDFLAGS="$LDFLAGS"

-    LDFLAGS="$LDFLAGS $XML_LIBS"

+      save_LIBS="$LIBS"

+      save_CPPFLAGS="$CPPFLAGS"

+      CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"

+      save_LDFLAGS="$LDFLAGS"

+      LDFLAGS="$LDFLAGS $XML_LIBS"

-    $as_echo "CPPFLAGS: $CPPFLAGS"

-    $as_echo "LD_FLAGS: $LDFLAGS"

+      $as_echo "CPPFLAGS: $CPPFLAGS"

+      $as_echo "LD_FLAGS: $LDFLAGS"

-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlTextReaderRead in -lxml2" >&5

+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlTextReaderRead in -lxml2" >&5

 $as_echo_n "checking for xmlTextReaderRead in -lxml2... " >&6; }

 if ${ac_cv_lib_xml2_xmlTextReaderRead+:} false; then :

   $as_echo_n "(cached) " >&6

@@ -22208,33 +22271,32 @@ else

 fi

-    CPPFLAGS="$save_CPPFLAGS"

-    LDFLAGS="$save_LDFLAGS"

-    LIBS="$save_LIBS"

+      CPPFLAGS="$save_CPPFLAGS"

+      LDFLAGS="$save_LDFLAGS"

+      LIBS="$save_LIBS"

+    fi

   fi

-fi

-if test "$working_xml" = "yes"; then

+  if test "$working_xml" = "yes"; then

 $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h

-  { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with libxml2 from $XML_HOME" >&5

+    { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with libxml2 from $XML_HOME" >&5

 $as_echo "$as_me: Compiling and linking with libxml2 from $XML_HOME" >&6;}

-else

-  if test "$want_xml" = "yes"; then

-     as_fn_error $? "****** Please install libxml2 packages!" "$LINENO" 5

   else

-    if test "$want_xml" != "no"; then

+    if test "$want_xml" = "yes"; then

+      as_fn_error $? "****** Please install libxml2 packages!" "$LINENO" 5

+    else

       { $as_echo "$as_me:${as_lineno-$LINENO}: ****** libxml2 support unavailable" >&5

 $as_echo "$as_me: ****** libxml2 support unavailable" >&6;}

     fi

-  fi

-  XML_CPPFLAGS=""

-  XML_LIBS=""

+    XML_CPPFLAGS=""

+    XML_LIBS=""

+  fi

 fi

  if test "x$HAVE_LIBXML2" = "xyes"; then

@@ -471,6 +471,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 EXTRA_DIST = main.cvd daily.cvd

 DBINST = @DBDIR@

 all: all-am

@@ -505,6 +505,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 EXTRA_DIST = html $(top_srcdir)/docs/man/*.in  

 man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 \

 	man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 \

@@ -501,6 +501,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 EXTRA_DIST = clamd.conf.sample freshclam.conf.sample clamav-milter.conf.sample

 CFGINST = @CFGDIR@

 sysconf_DATA = clamd.conf.sample freshclam.conf.sample $(am__append_1)

@@ -556,6 +556,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 freshclam_SOURCES = \

     $(top_srcdir)/shared/output.h \

     $(top_srcdir)/shared/optparser.c \

@@ -953,6 +953,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 @ENABLE_FUZZ_TRUE@AM_CPPFLAGS = \

 @ENABLE_FUZZ_TRUE@    @SSL_CPPFLAGS@ \

 @ENABLE_FUZZ_TRUE@    -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav \

@@ -1125,6 +1125,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 AM_YFLAGS = -d

 AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis $(LTDLINCL) \

 	$(am__append_1)

@@ -601,6 +601,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 libfreshclam_la_LIBADD = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @CURL_LIBS@ @SSL_LIBS@ @JSON_LIBS@ @LIBLTDL@ @THREAD_LIBS@ @LIBM@

 libfreshclam_la_DEPENDENCIES = @LTDLDEPS@

 libfreshclam_la_LDFLAGS = @CURL_LDFLAGS@ @SSL_LDFLAGS@ @TH_SAFE@ \

@@ -600,6 +600,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 ACLOCAL_AMFLAGS = -I ../m4

 AUTOMAKE_OPTIONS = foreign

@@ -523,6 +523,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 sigtool_SOURCES = \

     $(top_srcdir)/shared/output.c \

     $(top_srcdir)/shared/output.h \

@@ -452,6 +452,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 FILES = clam.cab clam.exe clam.zip clam.arj clam.exe.rtf clam.exe.szdd \

 	clam.tar.gz clam.chm clam.sis clam-aspack.exe clam-pespin.exe \

 	clam-upx.exe clam-fsg.exe clam-mew.exe clam-nsis.exe \

@@ -742,6 +742,7 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

+xmlconfig = @xmlconfig@

 SPLIT_DIR = $(top_srcdir)/unit_tests/.split

 FILES = clam-phish-exe

 programs = check_clamav