link clamav_lib to the plugin and not to the main program

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 884e5956454054b4253147ab61feb0e097f6c129..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
-EXTRA_VERSION=claws130
+EXTRA_VERSION=claws167
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -412,7 +412,11 @@ if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
 fi
 AM_CONDITIONAL(BUILD_IMAGE_VIEWER_PLUGIN, test x"$ac_cv_enable_image_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
-       PLUGINS="image-viewer $PLUGINS"
+       if test "$ac_cv_enable_gdk_pixbuf" = yes; then
+               PLUGINS="image-viewer(gdk-pixbuf) $PLUGINS"
+       elif test "$ac_cv_enable_imlib" = yes; then
+               PLUGINS="image-viewer(gdk_imlib) $PLUGINS"
+       fi
 fi
 
 AC_ARG_ENABLE(dillo-viewer-plugin,
@@ -441,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
 
@@ -489,13 +495,6 @@ dnl Output the configuration summary
 echo ""
 echo "$PACKAGE $VERSION"
 echo ""
-if test "$ac_cv_enable_gdk_pixbuf" = yes; then
-       echo "image support : yes (gdk-pixbuf)"
-elif test "$ac_cv_enable_imlib" = yes; then
-       echo "image support : yes (gdk_imlib)"
-else
-       echo "image support : no"
-fi
 echo "GnuPG         : $ac_cv_enable_gpgme"
 echo "JPilot        : $ac_cv_enable_jpilot"
 echo "LDAP          : $ac_cv_enable_ldap"