Added html mail viewing using Dillo

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ef7f549b53ad5385516d6fb360be3357b8eda718..63a320625bec43d7fd1f03bc2c40d79c74eac463 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=8
-MICRO_VERSION=10
+MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws26
+EXTRA_VERSION=claws14
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -27,10 +27,16 @@ AC_SUBST(VERSION)
 dnl GNOME installed?
 AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
 if test "$GNOME_CONFIG" != no; then
-       gnomedir="`gnome-config --prefix`"
-       AC_SUBST(gnomedir)
+       gnomedatadir="`gnome-config --datadir`"
+       gnomeprefix="`gnome-config --prefix`"
+       if test "${prefix}" = "NONE"; then
+               gnomedatadir="${ac_default_prefix}/${gnomedatadir#${gnomeprefix}}"
+       else
+               gnomedatadir="${prefix}/${gnomedatadir#${gnomeprefix}}"
+       fi
+       AC_SUBST(gnomedatadir)
 fi
-AM_CONDITIONAL(SYLPHEED_GNOME, test -d "$gnomedir")
+AM_CONDITIONAL(SYLPHEED_GNOME, test -n "$gnomedatadir")
 
 dnl Claws version
 AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)
@@ -194,6 +200,11 @@ fi
 dnl Check for OpenSSL
 AM_PATH_OPENSSL
 
+dnl Key for password encryption
+AC_ARG_WITH(passcrypt-key, [  --with-passcrypt-key=KEY     Key used to encode passwords (8 byte string)],
+           with_passcrypt_key="$withval", with_passcrypt_key="passkey0")
+AC_SUBST(PASSCRYPT_KEY, $with_passcrypt_key)
+
 dnl ************************
 dnl ** GTK user interface **
 dnl ************************
@@ -381,8 +392,31 @@ AM_CONDITIONAL(BUILD_SPAMASSASSIN_PLUGIN, test x"$ac_cv_enable_spamassassin_plug
 if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
        AC_SPAMASSASSIN
        PLUGINS="spamassassin $PLUGINS"
+       AC_DEFINE(USE_SPAMASSASSIN, 1, Define if you use the SpamAssassin plugin)
+fi
+
+AC_ARG_ENABLE(mathml-viewer-plugin,
+       [  --enable-mathml-viewer-plugin    Build MarhML-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
+       GTK_MATH_VIEW_CFLAGS=$( gtkmathview-config --cflags )
+       GTK_MATH_VIEW_LIBS=$( gtkmathview-config --libs )
+       AC_SUBST(GTK_MATH_VIEW_CFLAGS)
+       AC_SUBST(GTK_MATH_VIEW_LIBS)
+
+       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_plugin=$enableval], [ac_cv_enable_dillo_plugin=no])
+AM_CONDITIONAL(BUILD_DILLO_VIEWER_PLUGIN, test x"$ac_cv_enable_dillo_plugin" = xyes)
+if test x"$ac_cv_enable_dillo_plugin" = xyes; then
+       PLUGINS="dillo $PLUGINS"
 fi
 
+
 dnl ****************************
 dnl ** Final configure output **
 dnl ****************************
@@ -396,10 +430,13 @@ po/Makefile.in
 src/common/version.h
 src/Makefile
 src/common/Makefile
+src/common/passcrypt.h
 src/gtk/Makefile
 src/plugins/Makefile
 src/plugins/demo/Makefile
 src/plugins/spamassassin/Makefile
+src/plugins/mathml_viewer/Makefile
+src/plugins/dillo_viewer/Makefile
 faq/Makefile
 faq/de/Makefile
 faq/en/Makefile