[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 0acfa48d76f9b26d5edcbac335aa23b7cc6a199c
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:32 2008 +0100

    Revert "merge r3835 from trunk (bb #1011)."
    
    This reverts commit dd9e0816abc456f49f011b0f45adac2aae30dedc.

diff --git a/ChangeLog b/ChangeLog
index 8a6432c..75759a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Sun May  4 21:57:33 EEST 2008 (edwin)
-------------------------------------
-  * libclamav/Makefile.am: link .la files first, this
-	should avoid linking to old libclamav as in bb #931
-
 Sat May  3 14:46:41 CEST 2008 (tk)
 ----------------------------------
   * libclamav/readdb.h: read daily.cfg stored inside .cld containers (bb#1006)
diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am
index 8b18939..1596e73 100644
--- a/libclamav/Makefile.am
+++ b/libclamav/Makefile.am
@@ -21,9 +21,9 @@ SUBDIRS = lzma .
 AM_CPPFLAGS = -I$(top_srcdir) -I at srcdir@/nsis -I at srcdir@/lzma
 
 if ENABLE_UNRAR
-libclamav_la_LIBADD = $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la
 else
-libclamav_la_LIBADD = lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la
 endif
 
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in
index 85d2052..24467b9 100644
--- a/libclamav/Makefile.in
+++ b/libclamav/Makefile.in
@@ -75,8 +75,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 @ENABLE_UNRAR_FALSE at libclamav_la_DEPENDENCIES = lzma/liblzma.la
- at ENABLE_UNRAR_TRUE@libclamav_la_DEPENDENCIES = $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la \
- at ENABLE_UNRAR_TRUE@	lzma/liblzma.la
+ at ENABLE_UNRAR_TRUE@libclamav_la_DEPENDENCIES = lzma/liblzma.la \
+ at 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 \
@@ -263,8 +263,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = lzma .
 AM_CPPFLAGS = -I$(top_srcdir) -I at srcdir@/nsis -I at srcdir@/lzma
- at ENABLE_UNRAR_FALSE@libclamav_la_LIBADD = lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
- at ENABLE_UNRAR_TRUE@libclamav_la_LIBADD = $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la lzma/liblzma.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
+ at ENABLE_UNRAR_FALSE@libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la
+ at 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

-- 
Debian repository for ClamAV