revert to get ldap into it previous working state and add new Taiwanese translation

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 113144db041ea88b2659acb43bffd96d295c3d28..f680ff8992c2262b483445f6fec4016b228244dc 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=claws105
+EXTRA_VERSION=claws175
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -79,7 +79,7 @@ case "$target" in
 esac
 
 dnl for gettext
-ALL_LINGUAS="bg cs de el en_GB es fr hr hu it ja ko nl pl pt_BR ru sr sv"
+ALL_LINGUAS="bg cs de el en_GB es fr hr hu it ja ko nl pl pt_BR ru sr sv zh_TW.Big5"
 AM_GNU_GETTEXT
 dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
 localedir='${prefix}/${DATADIRNAME}/locale'
@@ -355,16 +355,16 @@ dnl *************************
 
 PLUGINS=""
 
-AC_ARG_ENABLE(demo-plugin,
-       [  --enable-demo-plugin    Build demo plugin [default=no]],
-       [ac_cv_enable_demo_plugin=$enableval], [ac_cv_enable_demo_plugin=no])
-AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
-if test x"$ac_cv_enable_demo_plugin" = xyes; then
-       PLUGINS="demo $PLUGINS"
+AC_ARG_ENABLE(trayicon-plugin,
+       [  --enable-trayicon-plugin   System Tray Icon [default=no]],
+       [ac_cv_enable_trayicon_plugin=$enableval], [ac_cv_enable_trayicon_plugin=no])
+AM_CONDITIONAL(BUILD_TRAYICON_PLUGIN, test x"$ac_cv_enable_trayicon_plugin" = xyes)
+if test x"$ac_cv_enable_trayicon_plugin" = xyes; then
+       PLUGINS="trayicon $PLUGINS"
 fi
 
 AC_ARG_ENABLE(spamassassin-plugin,
-       [  --enable-spamassassin-plugin    Build spamassassin plugin [default=no]],
+       [  --enable-spamassassin-plugin    Build SpamAssassin plugin [default=no]],
        [ac_cv_enable_spamassassin_plugin=$enableval], [ac_cv_enable_spamassassin_plugin=no])
 AM_CONDITIONAL(BUILD_SPAMASSASSIN_PLUGIN, test x"$ac_cv_enable_spamassassin_plugin" = xyes)
 if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
@@ -373,7 +373,7 @@ if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
 fi
 
 AC_ARG_ENABLE(mathml-viewer-plugin,
-       [  --enable-mathml-viewer-plugin    Build MarhML-Viewer plugin [default=no]],
+       [  --enable-mathml-viewer-plugin    Build MathML-Viewer plugin [default=no]],
        [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=no])
 AM_CONDITIONAL(BUILD_MATHML_VIEWER_PLUGIN, test x"$ac_cv_enable_mathml_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
@@ -385,14 +385,6 @@ if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
        PLUGINS="mathml-viewer $PLUGINS"
 fi
 
-AC_ARG_ENABLE(dillo-viewer-plugin,
-       [  --enable-dillo-viewer-plugin   Build Dillo plugin for html mail rendering [default=no]],
-       [ac_cv_enable_dillo_viewer_plugin=$enableval], [ac_cv_enable_dillo_viewer_plugin=no])
-AM_CONDITIONAL(BUILD_DILLO_VIEWER_PLUGIN, test x"$ac_cv_enable_dillo_viewer_plugin" = xyes)
-if test x"$ac_cv_enable_dillo_viewer_plugin" = xyes; then
-       PLUGINS="dillo-viewer $PLUGINS"
-fi
-
 AC_ARG_ENABLE(image-viewer-plugin,
        [  --disable-image-viewer-plugin   Do not build image viewer plugin],
        [ac_cv_enable_image_viewer_plugin=$enableval], [ac_cv_enable_image_viewer_plugin=yes])
@@ -420,19 +412,31 @@ 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 $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(trayicon-plugin,
-       [  --enable-trayicon-plugin   System Tray Icon [default=no]],
-       [ac_cv_enable_trayicon_plugin=$enableval], [ac_cv_enable_trayicon_plugin=no])
-AM_CONDITIONAL(BUILD_TRAYICON_PLUGIN, test x"$ac_cv_enable_trayicon_plugin" = xyes)
-if test x"$ac_cv_enable_trayicon_plugin" = xyes; then
-       PLUGINS="trayicon $PLUGINS"
+AC_ARG_ENABLE(dillo-viewer-plugin,
+       [  --enable-dillo-viewer-plugin   Build Dillo plugin for html mail rendering [default=no]],
+       [ac_cv_enable_dillo_viewer_plugin=$enableval], [ac_cv_enable_dillo_viewer_plugin=no])
+AM_CONDITIONAL(BUILD_DILLO_VIEWER_PLUGIN, test x"$ac_cv_enable_dillo_viewer_plugin" = xyes)
+if test x"$ac_cv_enable_dillo_viewer_plugin" = xyes; then
+       PLUGINS="dillo-viewer $PLUGINS"
+fi
+
+AC_ARG_ENABLE(demo-plugin,
+       [  --enable-demo-plugin    Build demo plugin [default=no]],
+       [ac_cv_enable_demo_plugin=$enableval], [ac_cv_enable_demo_plugin=no])
+AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
+if test x"$ac_cv_enable_demo_plugin" = xyes; then
+       PLUGINS="demo $PLUGINS"
 fi
 
 AC_ARG_ENABLE(clamav-plugin,
-       [  --enable-clamav-plugin    Build clamav plugin [default=no]],
+       [  --enable-clamav-plugin    Build Clam AntiVirus plugin [default=no]],
        [ac_cv_enable_clamav_plugin=$enableval], [ac_cv_enable_clamav_plugin=no])
 AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes)
 if test x"$ac_cv_enable_clamav_plugin" = xyes; then
@@ -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"