@@ -1,3 +1,8 @@

+Fri Oct  3 20:22:58 EEST 2008 (edwin)

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

+  * configure.in, */Makefile.am:  link to libclamunrar_iface explicitly to allow non-rpath builds to work. (bb #1203)

+				  thanks to James Ralston <ralston*pobox.com>

+

 Fri Oct  3 18:55:37 EEST 2008 (edwin)

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

   * configure.in: fix build failure when using LDFLAGS="-Wl,--as-needed" (bb  #1204)

@@ -139,6 +139,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -39,7 +39,7 @@ man_MANS = $(top_builddir)/docs/man/clamav-milter.8

 endif

 endif

-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@

 AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)

 EXTRA_DIST = clamav-milter.c INSTALL

 CLEANFILES=*.gcda *.gcno

@@ -122,6 +122,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -159,7 +160,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@

 LIBTOOL = @LIBTOOL@

 LIPO = @LIPO@

 LN_S = @LN_S@

@@ -29,6 +29,6 @@ clamconf_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @THREAD_LIBS@

 CLEANFILES=*.gcda *.gcno

@@ -107,6 +107,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -144,7 +145,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @THREAD_LIBS@

 LIBTOOL = @LIBTOOL@

 LIPO = @LIPO@

 LN_S = @LN_S@

@@ -60,7 +60,7 @@ clamd_SOURCES = \

 endif

-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 # it does support --help and --version but with the default config file

@@ -127,6 +127,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -164,7 +165,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@

 LIBTOOL = @LIBTOOL@

 LIPO = @LIPO@

 LN_S = @LN_S@

@@ -118,6 +118,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -39,7 +39,7 @@ clamscan_SOURCES = \

     manager.h

 DEFS = @DEFS@ -DCL_NOTHREADS

-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @THREAD_LIBS@

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 CLEANFILES=*.gcda *.gcno

@@ -109,6 +109,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -146,7 +147,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @THREAD_LIBS@

 LIBTOOL = @LIBTOOL@

 LIPO = @LIPO@

 LN_S = @LN_S@

@@ -910,6 +910,7 @@ HAVE_MILTER_TRUE

 HAVE_MILTER_FALSE

 ENABLE_UNRAR_TRUE

 ENABLE_UNRAR_FALSE

+CLAMAV_UNRAR_LIBS

 GETENT

 CLAMAVUSER

 CLAMAVGROUP

@@ -4753,13 +4754,13 @@ if test "${lt_cv_nm_interface+set}" = set; then

 else

   lt_cv_nm_interface="BSD nm"

   echo "int some_variable = 0;" > conftest.$ac_ext

-  (eval echo "\"\$as_me:4756: $ac_compile\"" >&5)

+  (eval echo "\"\$as_me:4757: $ac_compile\"" >&5)

   (eval "$ac_compile" 2>conftest.err)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:4759: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

+  (eval echo "\"\$as_me:4760: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:4762: output\"" >&5)

+  (eval echo "\"\$as_me:4763: output\"" >&5)

   cat conftest.out >&5

   if $GREP 'External.*some_variable' conftest.out > /dev/null; then

     lt_cv_nm_interface="MS dumpbin"

@@ -5970,7 +5971,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 5973 "configure"' > conftest.$ac_ext

+  echo '#line 5974 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7821,11 +7822,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7824: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7825: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

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

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

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8160,11 +8161,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8163: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8164: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

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

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

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8265,11 +8266,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8268: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8269: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

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

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

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -8320,11 +8321,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8323: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8324: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

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

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

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -11076,7 +11077,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11079 "configure"

+#line 11080 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11172,7 +11173,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11175 "configure"

+#line 11176 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -18960,10 +18961,14 @@ cat >>confdefs.h <<\_ACEOF

 #define ENABLE_UNRAR 1

 _ACEOF

+    CLAMAV_UNRAR_LIBS='$(top_builddir)/libclamunrar_iface/libclamunrar_iface.la'

+else

+    CLAMAV_UNRAR_LIBS=''

 fi

+

 # Check whether --with-tcpwrappers was given.

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

   withval=$with_tcpwrappers;  case "$withval" in

@@ -22144,6 +22149,7 @@ HAVE_MILTER_TRUE!$HAVE_MILTER_TRUE$ac_delim

 HAVE_MILTER_FALSE!$HAVE_MILTER_FALSE$ac_delim

 ENABLE_UNRAR_TRUE!$ENABLE_UNRAR_TRUE$ac_delim

 ENABLE_UNRAR_FALSE!$ENABLE_UNRAR_FALSE$ac_delim

+CLAMAV_UNRAR_LIBS!$CLAMAV_UNRAR_LIBS$ac_delim

 GETENT!$GETENT$ac_delim

 CLAMAVUSER!$CLAMAVUSER$ac_delim

 CLAMAVGROUP!$CLAMAVGROUP$ac_delim

@@ -22151,7 +22157,7 @@ LIBOBJS!$LIBOBJS$ac_delim

 LTLIBOBJS!$LTLIBOBJS$ac_delim

 _ACEOF

-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then

+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then

     break

   elif $ac_last_try; then

     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

@@ -1059,7 +1059,11 @@ fi

 if test "$want_unrar" = "yes"

 then

     AC_DEFINE([ENABLE_UNRAR], 1, "build unrar code")

+    CLAMAV_UNRAR_LIBS='$(top_builddir)/libclamunrar_iface/libclamunrar_iface.la'

+else

+    CLAMAV_UNRAR_LIBS=''

 fi

+AC_SUBST([CLAMAV_UNRAR_LIBS])

 dnl tcpwrappers support

@@ -85,6 +85,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -91,6 +91,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -84,6 +84,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -51,7 +51,7 @@ freshclam_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @FRESHCLAM_LIBS@ @THREAD_LIBS@

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)

 CLEANFILES=*.gcda *.gcno

@@ -112,6 +112,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -149,7 +150,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @FRESHCLAM_LIBS@ @THREAD_LIBS@

 LIBTOOL = @LIBTOOL@

 LIPO = @LIPO@

 LN_S = @LN_S@

@@ -20,11 +20,7 @@ SUBDIRS = lzma .

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

-if ENABLE_UNRAR

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

-else

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

-endif

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

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

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

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

 libLTLIBRARIES_INSTALL = $(INSTALL)

 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)

-@ENABLE_UNRAR_FALSE@libclamav_la_DEPENDENCIES = lzma/liblzma.la

-@ENABLE_UNRAR_TRUE@libclamav_la_DEPENDENCIES = $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la \

-@ENABLE_UNRAR_TRUE@	lzma/liblzma.la

+libclamav_la_DEPENDENCIES = lzma/liblzma.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 \

@@ -156,6 +154,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -283,8 +282,7 @@ top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 SUBDIRS = lzma .

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

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

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

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

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

 	-no-undefined $(am__append_1)

 include_HEADERS = clamav.h

@@ -104,6 +104,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -108,6 +108,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -103,6 +103,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -42,5 +42,5 @@ sigtool_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @FRESHCLAM_LIBS@ @THREAD_LIBS@

 CLEANFILES=*.gcda *.gcno

@@ -109,6 +109,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -148,7 +149,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_UNRAR_LIBS@ @FRESHCLAM_LIBS@ @THREAD_LIBS@

 LIBTOOL = @LIBTOOL@

 LIPO = @LIPO@

 LN_S = @LN_S@

@@ -66,6 +66,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -101,6 +101,7 @@ CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

 CLAMAVUSER = @CLAMAVUSER@

 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@

+CLAMAV_UNRAR_LIBS = @CLAMAV_UNRAR_LIBS@

 CLAMD_LIBS = @CLAMD_LIBS@

 CPP = @CPP@

 CPPFLAGS = @CPPFLAGS@

@@ -242,7 +243,7 @@ check_SCRIPTS = $(scripts)

 @HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

 @HAVE_LIBCHECK_TRUE@check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@

-CLEANFILES = lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log valgrind-*.log duma.log duma2.log

+CLEANFILES = lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log valgrind-*.log duma.log duma2.log clamscan2.log

 EXTRA_DIST = .split $(srcdir)/*.ref input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) preload_run.sh

 @ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out

 @ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html