Hi.
The attached patch (from PLD) prevents linking to installed old clamav libs
while building a new clamav version.
--
Regards // Oden Eriksson
diff -Naur clamav-0.71/clamav-milter/Makefile.am clamav-0.71.oden/clamav-milter/Makefile.am
--- clamav-0.71/clamav-milter/Makefile.am 2004-05-25 20:34:11.791124972 +0200
+++ clamav-0.71.oden/clamav-milter/Makefile.am 2004-05-25 20:37:20.948584097 +0200
@@ -35,8 +35,8 @@
endif
endif
-DEFS = @DEFS@ -DSENDMAIL_BIN=\"@[EMAIL PROTECTED]"
+AM_CFLAGS = -DSENDMAIL_BIN=\"$(SENDMAIL)\"
# CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd
-LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
EXTRA_DIST = clamav-milter.c INSTALL
diff -Naur clamav-0.71/clamd/Makefile.am clamav-0.71.oden/clamd/Makefile.am
--- clamav-0.71/clamd/Makefile.am 2004-05-09 23:49:40.000000000 +0200
+++ clamav-0.71.oden/clamd/Makefile.am 2004-05-25 20:35:33.928237227 +0200
@@ -60,6 +60,5 @@
endif
-DEFS = @DEFS@
-LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(CLAMD_LIBS) $(ADDITIONAL_LIBS)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
diff -Naur clamav-0.71/clamdscan/Makefile.am clamav-0.71.oden/clamdscan/Makefile.am
--- clamav-0.71/clamdscan/Makefile.am 2004-05-09 23:51:08.000000000 +0200
+++ clamav-0.71.oden/clamdscan/Makefile.am 2004-05-25 20:35:33.928237227 +0200
@@ -36,4 +36,4 @@
endif
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(FRESHCLAM_LIBS) $(ADDITIONAL_LIBS)
diff -Naur clamav-0.71/clamscan/Makefile.am clamav-0.71.oden/clamscan/Makefile.am
--- clamav-0.71/clamscan/Makefile.am 2004-05-10 01:59:54.000000000 +0200
+++ clamav-0.71.oden/clamscan/Makefile.am 2004-05-25 20:35:33.928237227 +0200
@@ -39,6 +39,5 @@
treewalk.h \
defaults.h
-DEFS = @DEFS@
-LIBS = -L$(top_builddir)/libclamav -lclamav @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(ADDITIONAL_LIBS)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
diff -Naur clamav-0.71/freshclam/Makefile.am clamav-0.71.oden/freshclam/Makefile.am
--- clamav-0.71/freshclam/Makefile.am 2004-05-09 23:50:27.000000000 +0200
+++ clamav-0.71.oden/freshclam/Makefile.am 2004-05-25 20:35:33.927237177 +0200
@@ -37,7 +37,5 @@
notify.c \
notify.h
-
-DEFS = @DEFS@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(FRESHCLAM_LIBS) $(ADDITIONAL_LIBS)
diff -Naur clamav-0.71/sigtool/Makefile.am clamav-0.71.oden/sigtool/Makefile.am
--- clamav-0.71/sigtool/Makefile.am 2004-05-10 02:30:44.000000000 +0200
+++ clamav-0.71.oden/sigtool/Makefile.am 2004-05-25 20:35:33.928237227 +0200
@@ -32,6 +32,5 @@
sigtool_LDADD = $(top_builddir)/clamscan/others.o
-DEFS = @DEFS@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(FRESHCLAM_LIBS) $(ADDITIONAL_LIBS)
