@@ -1,3 +1,7 @@

+Mon Feb 25 13:01:46 EET 2008 (edwin)

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

+  * revert the Makefile changes in r3671.

+

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

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

   * configure, configure.in:

@@ -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 ../libclamunrar_iface/libclamunrar_iface.la

+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la $(top_builddir)/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@	../libclamunrar_iface/libclamunrar_iface.la

+@ENABLE_UNRAR_TRUE@	$(top_builddir)/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 ../libclamunrar_iface/libclamunrar_iface.la

+@ENABLE_UNRAR_TRUE@libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la $(top_builddir)/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 = ../libclamunrar/libclamunrar.la

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

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

@@ -58,8 +58,7 @@ 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 =  \

-@ENABLE_UNRAR_TRUE@	../libclamunrar/libclamunrar.la

+@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_DEPENDENCIES = $(top_builddir)/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)

@@ -211,7 +210,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 = ../libclamunrar/libclamunrar.la

+@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LIBADD = $(top_builddir)/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)