@@ -1,3 +1,11 @@

+Mon Feb 25 12:25:03 EET 2008 (edwin)

+------------------------------------

+  * configure, configure.in:

+	* improve check for bzip2

+	* test for attribute((packed)) only on GNUC compilers, because Sun's cc ignores it

+	* move iconv check after zlib/bzip2 checks

+  * libclamav, libclamunrar_iface/Makefile*: use ../ to avoid problems with spaces in directory names

+

 Fri Feb 22 11:38:41 CET 2008 (tk)

 ---------------------------------

   * libclamav/scanners.c: avoid calling cli_scanscript() for HTML files

@@ -1526,7 +1526,6 @@ Optional Packages:

   --with-pic              try to use only PIC/non-PIC objects [default=use

                           both]

   --with-fpu-words-bigendian=(yes/no/auto)    specify FPU endianess (default=auto)

-  --with-iconv supports iconv() (default=auto)

   --with-zlib=DIR	  path to directory containing zlib library (default=

 			  /usr/local or /usr if not found in /usr/local)

   --with-gnu-ld           assume the C compiler uses GNU ld default=no

@@ -1536,6 +1535,7 @@ Optional Packages:

   --with-sendmail-version=VERSION    specify version of Sendmail (default=auto find)

   --with-libgmp-prefix[=DIR]  search for libgmp in DIR/include and DIR/lib

   --without-libgmp-prefix     don't search for libgmp in includedir and libdir

+  --with-iconv supports iconv() (default=auto)

   --with-user=uid	  name of the clamav user (default=clamav)

   --with-group=gid	  name of the clamav group (default=clamav)

   --with-dbdir=path	  path to virus database directory

@@ -12377,156 +12377,6 @@ fi

-# Check whether --with-iconv was given.

-if test "${with_iconv+set}" = set; then

-  withval=$with_iconv;

- case "$withval" in

-	 yes|no) wiconv="$withval";;

-	 *) { { echo "$as_me:$LINENO: error: --with-iconv does not take an argument" >&5

-echo "$as_me: error: --with-iconv does not take an argument" >&2;}

-   { (exit 1); exit 1; }; };;

- esac

-else

-   wiconv=auto

-fi

-

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

-	{ echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5

-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }

-if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then

-  echo $ECHO_N "(cached) $ECHO_C" >&6

-else

-  ac_check_lib_save_LIBS=$LIBS

-LIBS="-liconv  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* 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

-rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"

-case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_link") 2>conftest.er1

-  ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {

-	 test -z "$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       } && test -s conftest$ac_exeext &&

-       $as_test_x conftest$ac_exeext; then

-  ac_cv_lib_iconv_libiconv_open=yes

-else

-  echo "$as_me: failed program was:" >&5

-sed 's/^/| /' conftest.$ac_ext >&5

-

-	ac_cv_lib_iconv_libiconv_open=no

-fi

-

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

-      conftest$ac_exeext conftest.$ac_ext

-LIBS=$ac_check_lib_save_LIBS

-fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5

-echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }

-if test $ac_cv_lib_iconv_libiconv_open = yes; then

-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv"

-fi

-

-	{ echo "$as_me:$LINENO: checking for iconv" >&5

-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }

-	save_LIBS="$LIBS"

-	LIBS="$LIBCLAMAV_LIBS"

-	cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-

-		     #include <iconv.h>

-

-int

-main ()

-{

-

-	char** xin,**xout;

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

-}

-_ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"

-case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_link") 2>conftest.er1

-  ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {

-	 test -z "$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       } && test -s conftest$ac_exeext &&

-       $as_test_x conftest$ac_exeext; then

-

-   { echo "$as_me:$LINENO: result: yes" >&5

-echo "${ECHO_T}yes" >&6; }

-

-cat >>confdefs.h <<\_ACEOF

-#define HAVE_ICONV 1

-_ACEOF

-

-

-else

-  echo "$as_me: failed program was:" >&5

-sed 's/^/| /' conftest.$ac_ext >&5

-

-

-	{ echo "$as_me:$LINENO: result: no" >&5

-echo "${ECHO_T}no" >&6; }

-

-fi

-

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

-      conftest$ac_exeext conftest.$ac_ext

-	LIBS="$save_LIBS"

-fi

-

-

@@ -14240,13 +14090,15 @@ echo "${ECHO_T}$ac_cv_libbz2_libs" >&6; }

+    save_LDFLAGS="$LDFLAGS"

+    LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/lib";

     { echo "$as_me:$LINENO: checking for bzReadOpen in -lbz2" >&5

 echo $ECHO_N "checking for bzReadOpen in -lbz2... $ECHO_C" >&6; }

 if test "${ac_cv_lib_bz2_bzReadOpen+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6

 else

   ac_check_lib_save_LIBS=$LIBS

-LIBS="-lbz2 -L$LIBBZ2_PREFIX/lib $LIBS"

+LIBS="-lbz2  $LIBS"

 cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

@@ -14307,8 +14159,10 @@ cat >>confdefs.h <<\_ACEOF

 #define NOBZ2PREFIX 1

 _ACEOF

+

 fi

+    LDFLAGS="$save_LDFLAGS"

     if test "$HAVE_LIBBZ2" = "yes"; then

 	if test "${ac_cv_header_bzlib_h+set}" = set; then

   { echo "$as_me:$LINENO: checking for bzlib.h" >&5

@@ -15490,6 +15344,156 @@ echo "$as_me: WARNING: ****** GNU MP 2 or newer NOT FOUND - digital signature su

     fi

 fi

+

+# Check whether --with-iconv was given.

+if test "${with_iconv+set}" = set; then

+  withval=$with_iconv;

+ case "$withval" in

+	 yes|no) wiconv="$withval";;

+	 *) { { echo "$as_me:$LINENO: error: --with-iconv does not take an argument" >&5

+echo "$as_me: error: --with-iconv does not take an argument" >&2;}

+   { (exit 1); exit 1; }; };;

+ esac

+else

+   wiconv=auto

+fi

+

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

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

+echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }

+if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-liconv  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* 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

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+  ac_cv_lib_iconv_libiconv_open=yes

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	ac_cv_lib_iconv_libiconv_open=no

+fi

+

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

+      conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5

+echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }

+if test $ac_cv_lib_iconv_libiconv_open = yes; then

+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv"

+fi

+

+	{ echo "$as_me:$LINENO: checking for iconv" >&5

+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }

+	save_LIBS="$LIBS"

+	LIBS="$LIBCLAMAV_LIBS"

+	cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+		     #include <iconv.h>

+

+int

+main ()

+{

+

+	char** xin,**xout;

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

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+

+   { echo "$as_me:$LINENO: result: yes" >&5

+echo "${ECHO_T}yes" >&6; }

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_ICONV 1

+_ACEOF

+

+

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+

+	{ echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

+

+fi

+

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

+      conftest$ac_exeext conftest.$ac_ext

+	LIBS="$save_LIBS"

+fi

+

 # Check whether --enable-pthreads was given.

 if test "${enable_pthreads+set}" = set; then

   enableval=$enable_pthreads; have_pthreads=$enableval

@@ -17905,7 +17909,11 @@ cat >>conftest.$ac_ext <<_ACEOF

 int

 main ()

 {

-struct { int i __attribute__((packed)); } s;

+#ifdef __GNUC__

+		 struct { int i __attribute__((packed)); } s;

+		 #else

+		 #error Only checking for packed attribute on gcc-like compilers

+		 #endif

   ;

   return 0;

 }

@@ -309,38 +309,6 @@ fi

 AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])

 AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])

-dnl we need to try to link with iconv, otherwise there could be a 

-dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.

-AC_ARG_WITH([iconv], [  --with-iconv supports iconv() (default=auto)],

-[

- case "$withval" in

-	 yes|no) wiconv="$withval";;

-	 *) AC_MSG_ERROR([--with-iconv does not take an argument]);;

- 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([

-		     #include <iconv.h>

-	],[

-	char** xin,**xout;

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

-fi

-

 AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp])

 AC_FUNC_MMAP

 AC_FUNC_FSEEKO

@@ -410,9 +378,12 @@ want_bzip2=$enableval, want_bzip2="yes")

 if test "$want_bzip2" = "yes"

 then

     AC_LIB_LINKFLAGS([bz2])

+    save_LDFLAGS="$LDFLAGS"

+    LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/lib";

     AC_CHECK_LIB([bz2], [bzReadOpen],

-		 [AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])],,

-		 [-L$LIBBZ2_PREFIX/lib])

+		 [AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])]

+		)

+    LDFLAGS="$save_LDFLAGS"

     if test "$HAVE_LIBBZ2" = "yes"; then

 	AC_CHECK_HEADER([bzlib.h],

 			[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2";

@@ -524,6 +495,39 @@ then

     fi

 fi

+dnl we need to try to link with iconv, otherwise there could be a 

+dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.

+dnl we need to check after zlib/bzip2, because they can change the include path

+AC_ARG_WITH([iconv], [  --with-iconv supports iconv() (default=auto)],

+[

+ case "$withval" in

+	 yes|no) wiconv="$withval";;

+	 *) AC_MSG_ERROR([--with-iconv does not take an argument]);;

+ 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([

+		     #include <iconv.h>

+	],[

+	char** xin,**xout;

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

+fi

+

 AC_ARG_ENABLE([pthreads],

 [  --disable-pthreads      disable POSIX threads support],

 have_pthreads=$enableval,)

@@ -1268,10 +1272,16 @@ then

 fi

 dnl check for __attribute__((packed))

+dnl but only on compilers claiming to be gcc compatible

+dnl because for example Sun's compiler silently ignores the packed attribute.

 AC_MSG_CHECKING([for structure packing via __attribute__((packed))])

 AC_CACHE_VAL([have_attrib_packed],[

 	AC_TRY_COMPILE(,

-		[struct { int i __attribute__((packed)); } s; ],

+		[#ifdef __GNUC__

+		 struct { int i __attribute__((packed)); } s;

+		 #else

+		 #error Only checking for packed attribute on gcc-like compilers

+		 #endif],

 		[have_attrib_packed=yes],

 		[have_attrib_packed=no])

 	])

@@ -21,7 +21,7 @@ SUBDIRS = lzma .

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

 if ENABLE_UNRAR

-libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la

+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la ../libclamunrar_iface/libclamunrar_iface.la

 else

 libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la

 endif

@@ -76,7 +76,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)

 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)

 @ENABLE_UNRAR_FALSE@libclamav_la_DEPENDENCIES = lzma/liblzma.la

 @ENABLE_UNRAR_TRUE@libclamav_la_DEPENDENCIES = lzma/liblzma.la \

-@ENABLE_UNRAR_TRUE@	$(top_builddir)/libclamunrar_iface/libclamunrar_iface.la

+@ENABLE_UNRAR_TRUE@	../libclamunrar_iface/libclamunrar_iface.la

 am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \

 	md5.lo others.lo readdb.lo cvd.lo dsig.lo str.lo scanners.lo \

 	textdet.lo filetypes.lo rtf.lo blob.lo mbox.lo message.lo \

@@ -264,7 +264,7 @@ top_srcdir = @top_srcdir@

 SUBDIRS = lzma .

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

 @ENABLE_UNRAR_FALSE@libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la

-@ENABLE_UNRAR_TRUE@libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la

+@ENABLE_UNRAR_TRUE@libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la ../libclamunrar_iface/libclamunrar_iface.la

 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \

 	-no-undefined $(am__append_1)

 include_HEADERS = clamav.h

@@ -6,7 +6,7 @@ if ENABLE_UNRAR

 AM_CPPFLAGS = -I$(top_srcdir)

-libclamunrar_iface_la_LIBADD = $(top_builddir)/libclamunrar/libclamunrar.la

+libclamunrar_iface_la_LIBADD = ../libclamunrar/libclamunrar.la

 libclamunrar_iface_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

@@ -58,7 +58,8 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

 am__installdirs = "$(DESTDIR)$(libdir)"

 libLTLIBRARIES_INSTALL = $(INSTALL)

 LTLIBRARIES = $(lib_LTLIBRARIES)

-@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_DEPENDENCIES = $(top_builddir)/libclamunrar/libclamunrar.la

+@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_DEPENDENCIES =  \

+@ENABLE_UNRAR_TRUE@	../libclamunrar/libclamunrar.la

 am__libclamunrar_iface_la_SOURCES_DIST = unrar_iface.c unrar_iface.h

 @ENABLE_UNRAR_TRUE@am_libclamunrar_iface_la_OBJECTS = unrar_iface.lo

 libclamunrar_iface_la_OBJECTS = $(am_libclamunrar_iface_la_OBJECTS)

@@ -210,7 +211,7 @@ target_vendor = @target_vendor@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 @ENABLE_UNRAR_TRUE@AM_CPPFLAGS = -I$(top_srcdir)

-@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LIBADD = $(top_builddir)/libclamunrar/libclamunrar.la

+@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LIBADD = ../libclamunrar/libclamunrar.la

 @ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LDFLAGS = @TH_SAFE@ \

 @ENABLE_UNRAR_TRUE@	-version-info @LIBCLAMAV_VERSION@ \

 @ENABLE_UNRAR_TRUE@	-no-undefined $(am__append_1)