From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 19 May 2003 20:49:03 +0000 (+0000)
Subject: link clamav_lib to the plugin and not to the main program
X-Git-Tag: rel_0_9_0~20
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=1cf4210655d9c8619489205e92387e07a0d069fe;hp=e21cd6dca84b7c13ffef37d3b232104efb0f3436

link clamav_lib to the plugin and not to the main program
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 6a3006c5f..794029c21 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,7 +1,8 @@
-2003-05-19 [christoph]
+2003-05-19 [paul]	0.8.11claws167
 
-	* src/Makefile.am
-		add -export-dynamic for linking
+	* src/plugins/clamav/Makefile.am
+	  configure.ac
+	  	link clamav_lib to the plugin and not to the main program
 
 2003-05-19 [paul]	0.8.11claws166
 
@@ -24,7 +25,7 @@
 	* src/plugins/dillo_viewer/dillo_viewer.c
 	* src/plugins/image_viewer/viewer.c
 	* src/plugins/mathml_viewer/mathml_viewer.c
-		let a viewer have a list of Content-Types
+		let a viewer to have a list of Content-Types
 
 2003-05-18 [paul]	0.8.11claws162
 
diff --git a/configure.ac b/configure.ac
index 752142bf5..d10657360 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws166
+EXTRA_VERSION=claws167
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -445,7 +445,9 @@ if test x"$ac_cv_enable_clamav_plugin" = xyes; then
 	then
 		AC_MSG_ERROR(clamav library not found)
 	fi
-	LIBS="${clamav_lib} ${LIBS}"
+	CLAMAV_LIBS="${clamav_lib}"
+	AC_SUBST(CLAMAV_LIBS)
+
 	PLUGINS="clamav $PLUGINS"
 fi
 
diff --git a/src/plugins/clamav/Makefile.am b/src/plugins/clamav/Makefile.am
index 7e5f04ee5..5614e7df2 100644
--- a/src/plugins/clamav/Makefile.am
+++ b/src/plugins/clamav/Makefile.am
@@ -7,8 +7,9 @@ clamav_plugin_la_SOURCES = \
 
 clamav_plugin_la_LDFLAGS = \
 	-avoid-version -module \
-	$(GTK_LIBS)
-
+	$(GTK_LIBS) \
+	$(CLAMAV_LIBS)
+	
 clamav_plugin_gtk_la_SOURCES = \
 	clamav_plugin_gtk.c clamav_plugin.h
 
@@ -20,8 +21,7 @@ INCLUDES = \
 	-I../.. \
 	-I../../common \
 	-I../../gtk \
-	$(CLAMAV_CFLAGS) \
-	-I$(includedir)
+	-I$(CLAMAV_LIBS)
 
 CPPFLAGS = \
 	$(ASPELL_CFLAGS) \