link clamav_lib to the plugin and not to the main program

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 6a3006c5f571ed8c5689315f88543aa0dab68cea..794029c21365155fb2fd02c418ddebae28ab2a56 100644 (file)
--- 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
 
 
 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
        * 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
 
 
 2003-05-18 [paul]      0.8.11claws162
 

diff --git a/configure.ac b/configure.ac
index 752142bf544b6a8e9a57549817b894561d626d77..d106573600b3c4471ee46f52b5b6110df464c96c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 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
        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
 
        PLUGINS="clamav $PLUGINS"
 fi
 

diff --git a/src/plugins/clamav/Makefile.am b/src/plugins/clamav/Makefile.am
index 7e5f04ee5c1830151563cfc9bc2b5bac87fc5ec3..5614e7df201c9b2b1d15b25d0ab87b944adee71e 100644 (file)
--- 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 \
 
 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
 
 clamav_plugin_gtk_la_SOURCES = \
        clamav_plugin_gtk.c clamav_plugin.h
 


@@ -20,8 +21,7 @@ INCLUDES = \
        -I../.. \
        -I../../common \
        -I../../gtk \
        -I../.. \
        -I../../common \
        -I../../gtk \

-       $(CLAMAV_CFLAGS) \
-       -I$(includedir)
+       -I$(CLAMAV_LIBS)

 
 CPPFLAGS = \
        $(ASPELL_CFLAGS) \
 
 CPPFLAGS = \
        $(ASPELL_CFLAGS) \