sync with 0.9.0cvs3

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b2a44230c5c6131e4cd85dbf94f9e85e05676181..625126e4b6fd5f0b6ceb174064a175576f7f4548 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=claws145
+EXTRA_VERSION=claws168
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -413,9 +413,9 @@ 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
        if test "$ac_cv_enable_gdk_pixbuf" = yes; then
-               PLUGINS="image-viewer(gdk-pixbuf)"
+               PLUGINS="image-viewer(gdk-pixbuf) $PLUGINS"
        elif test "$ac_cv_enable_imlib" = yes; then
-               PLUGINS="image-viewer(gdk_imlib)"
+               PLUGINS="image-viewer(gdk_imlib) $PLUGINS"
        fi
 fi
 
@@ -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