@@ -406,6 +406,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -360,6 +360,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -296,6 +296,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -314,6 +314,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -367,6 +367,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -325,6 +325,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -331,6 +331,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -316,6 +316,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -314,6 +314,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -712,6 +712,8 @@ BUILD_CLAMD_FALSE

 BUILD_CLAMD_TRUE

 CFGDIR

 DBDIR

+ICONV_CPPFLAGS

+ICONV_LDFLAGS

 INSTALL_SYSTEMD_UNITS_FALSE

 INSTALL_SYSTEMD_UNITS_TRUE

 systemdsystemunitdir

@@ -20382,7 +20384,51 @@ else

 fi

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

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

+        save_LDFLAGS="$LDFLAGS"

+        LDFLAGS="-L/usr/local/lib -liconv"

+        ICONV_HOME=""

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

+$as_echo_n "checking for libiconv_open in -liconv... " >&6; }

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

+  $as_echo_n "(cached) " >&6

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-liconv  $LIBS"

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char libiconv_open ();

+int

+main ()

+{

+return libiconv_open ();

+  ;

+  return 0;

+}

+_ACEOF

+if ac_fn_c_try_link "$LINENO"; then :

+  ac_cv_lib_iconv_libiconv_open=yes

+else

+  ac_cv_lib_iconv_libiconv_open=no

+fi

+rm -f core conftest.err conftest.$ac_objext \

+    conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

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

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

+if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then :

+  ICONV_HOME="/usr/local"

+else

+

+          LDFLAGS="-L/usr/lib -liconv"

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

 $as_echo_n "checking for libiconv_open in -liconv... " >&6; }

 if ${ac_cv_lib_iconv_libiconv_open+:} false; then :

   $as_echo_n "(cached) " >&6

@@ -20419,14 +20465,28 @@ fi

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

 $as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; }

 if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then :

-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv"

+  ICONV_HOME="/usr"

+else

+  LDFLAGS="$save_LDFLAGS"

 fi

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

+

+fi

+

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

 $as_echo_n "checking for iconv... " >&6; }

-	save_LIBS="$LIBS"

-	LIBS="$LIBCLAMAV_LIBS"

-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+        save_LIBS="$LIBS"

+        save_CPPFLAGS="$CPPFLAGS"

+        LIBS="$LIBCLAMAV_LIBS"

+        if test "X$ICONV_HOME" != "X"; then

+          ICONV_LDFLAGS="$LDFLAGS"

+          ICONV_CPPFLAGS="-I$ICONV_HOME/include"

+        else

+          ICONV_LDFLAGS=""

+          ICONV_CPPFLAGS=""

+        fi

+        CPPFLAGS="$ICONV_CPPFLAGS $LIBCLAMAV_CPPFLAGS"

+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext

 /* end confdefs.h.  */

 		     #include <iconv.h>

@@ -20435,12 +20495,12 @@ int

 main ()

 {

-	char** xin,**xout;

-	unsigned long il,ol;

-	int rc;

-	iconv_t iconv_struct = iconv_open("UTF-16BE","UTF-8");

-	rc = iconv(iconv_struct,xin,&il,xout,&ol);

-	iconv_close(iconv_struct);

+	  char** xin,**xout;

+	  unsigned long il,ol;

+	  int rc;

+	  iconv_t iconv_struct = iconv_open("UTF-16BE","UTF-8");

+	  rc = iconv(iconv_struct,xin,&il,xout,&ol);

+	  iconv_close(iconv_struct);

   ;

   return 0;

@@ -20448,21 +20508,25 @@ main ()

 _ACEOF

 if ac_fn_c_try_link "$LINENO"; then :

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

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

 $as_echo "yes" >&6; }

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

+

+

 else

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

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

 $as_echo "no" >&6; }

 fi

 rm -f core conftest.err conftest.$ac_objext \

     conftest$ac_exeext conftest.$ac_ext

-	LIBS="$save_LIBS"

+        LIBS="$save_LIBS"

+        LDFLAGS="$save_LDFLAGS"

+        CPPFLAGS="$save_CPPFLAGS"

 fi

 have_pthreads=no

@@ -262,6 +262,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -296,6 +296,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -292,6 +292,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -349,6 +349,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -804,6 +804,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -1076,11 +1078,11 @@ libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ \

 libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la

 libclamav_la_CFLAGS = $(AM_CFLAGS) $(XML_CPPFLAGS) $(YARA_CFLAGS) \

 	-DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ \

-	@SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ $(am__append_9) \

-	$(am__append_12)

+	@SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ICONV_CPPFLAGS@ \

+	@PCRE_CPPFLAGS@ $(am__append_9) $(am__append_12)

 libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ \

-	$(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined \

-	$(am__append_7) $(am__append_13)

+	@ICONV_LDFLAGS@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ \

+	-no-undefined $(am__append_7) $(am__append_13)

 include_HEADERS = clamav.h

 libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \

 	matcher-bm.h matcher-hash.c matcher-hash.h matcher.c matcher.h \

@@ -5277,12 +5277,13 @@ save_LDFLAGS="$LDFLAGS"

 save_CFLAGS="$CFLAGS"

 save_LIBS="$LIBS"

-SSL_LIBS="-lssl -lcrypto -lz"

+SSL_LIBS="$LIBS -lssl -lcrypto -lz"

+LIBS="$LIBS $SSL_LIBS"

 if test "$LIBSSL_HOME" != "/usr"; then

     SSL_LDFLAGS="-L$LIBSSL_HOME/lib"

     SSL_CPPFLAGS="-I$LIBSSL_HOME/include"

-    LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"

+    LDFLAGS="-L$LIBSSL_HOME/lib"

     CFLAGS="$SSL_CPPFLAGS"

 else

     SSL_LDFLAGS=""

@@ -5292,47 +5293,24 @@ fi

 have_ssl="no"

 have_crypto="no"

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

-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }

-if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :

-  $as_echo_n "(cached) " >&6

-else

-  ac_check_lib_save_LIBS=$LIBS

-LIBS="-lssl -lcrypto -lz $LIBS"

 cat confdefs.h - <<_ACEOF >conftest.$ac_ext

 /* end confdefs.h.  */

-

-/* Override any GCC internal prototype to avoid an error.

-   Use char because int might match the return type of a GCC

-   builtin and then its argument prototype would still apply.  */

-#ifdef __cplusplus

-extern "C"

-#endif

-char SSL_library_init ();

+#include <openssl/ssl.h>

 int

 main ()

 {

-return SSL_library_init ();

+SSL_library_init();

   ;

   return 0;

 }

 _ACEOF

 if ac_fn_c_try_link "$LINENO"; then :

-  ac_cv_lib_ssl_SSL_library_init=yes

+  have_ssl="yes";

 else

-  ac_cv_lib_ssl_SSL_library_init=no

+  as_fn_error $? "Your OpenSSL installation is misconfigured or missing" "$LINENO" 5

 fi

 rm -f core conftest.err conftest.$ac_objext \

     conftest$ac_exeext conftest.$ac_ext

-LIBS=$ac_check_lib_save_LIBS

-fi

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

-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }

-if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :

-  have_ssl="yes"

-else

-  as_fn_error $? "Your OpenSSL installation is misconfigured or missing" "$LINENO" 5

-fi

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

@@ -341,6 +341,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -393,6 +393,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -315,6 +315,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -245,6 +245,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -535,6 +535,8 @@ GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

 HAVE_YARA = @HAVE_YARA@

+ICONV_CPPFLAGS = @ICONV_CPPFLAGS@

+ICONV_LDFLAGS = @ICONV_LDFLAGS@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@