@@ -149,8 +149,8 @@ libclamav_nocxx_la_CFLAGS=$(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPF

 libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@

 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@

-libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined

+libclamav_la_CFLAGS =$(AM_CFLAGS) $(XML_CPPFLAGS) $(YARA_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ICONV_CPPFLAGS@ @PCRE_CPPFLAGS@

+libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ @ICONV_LDFLAGS@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined

 if VERSIONSCRIPT

 libclamav_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map

@@ -9,24 +9,44 @@ AC_ARG_WITH([iconv], [AS_HELP_STRING([--with-iconv], [supports iconv() @<:@defau

  esac],

 [ wiconv=auto ])

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

-	AC_CHECK_LIB([iconv], [libiconv_open], LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv")

-	AC_MSG_CHECKING([for iconv])

-	save_LIBS="$LIBS"

-	LIBS="$LIBCLAMAV_LIBS"

-	AC_TRY_LINK([

+        save_LDFLAGS="$LDFLAGS"

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

+        ICONV_HOME=""

+        AC_CHECK_LIB([iconv], [libiconv_open], [ICONV_HOME="/usr/local"],

+        [

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

+          AC_CHECK_LIB([iconv], [libiconv_open], [ICONV_HOME="/usr"], [LDFLAGS="$save_LDFLAGS"])

+        ])

+        AC_MSG_CHECKING([for iconv])

+        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"

+        AC_TRY_LINK([

 		     #include <iconv.h>

-	],[

-	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);

-],[

-   AC_MSG_RESULT(yes)

-   AC_DEFINE([HAVE_ICONV], 1, [iconv() available])

-],[

-	AC_MSG_RESULT(no)

-])

-	LIBS="$save_LIBS"

+        ],[

+	  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);

+        ],[

+          AC_MSG_RESULT(yes)

+          AC_DEFINE([HAVE_ICONV], 1, [iconv() available])

+          AC_SUBST(ICONV_LDFLAGS)

+          AC_SUBST(ICONV_CPPFLAGS)

+        ],[

+	  AC_MSG_RESULT(no)

+        ])

+        LIBS="$save_LIBS"

+        LDFLAGS="$save_LDFLAGS"

+        CPPFLAGS="$save_CPPFLAGS"

 fi