2005-12-19 [paul] 1.9.100cvs94

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a91d6435fd55d84f5e5df3b81ddd0c75ab2ea742..c35f2f0f389b579f7b38b3b5ec9d5195efaf5678 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=94
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -160,17 +160,12 @@ AC_ARG_WITH(localedir,
        [localedir="$withval"])
 AC_SUBST(localedir)
 
-manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
-AC_ARG_WITH(manualdir,
-       [  --with-manualdir=DIR    Manual directory],
-       [manualdir="$withval"])
-AC_SUBST(manualdir)
-
-faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq'
-AC_ARG_WITH(faqdir,
-       [  --with-faqdir=DIR       FAQ directory],
-       [faqdir="$withval"])
-AC_SUBST(faqdir)
+dnl waiting for the new manual to be finished
+dnl manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
+dnl AC_ARG_WITH(manualdir,
+dnl    [  --with-manualdir=DIR    Manual directory],
+dnl    [manualdir="$withval"])
+dnl AC_SUBST(manualdir)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
 if test "x${datadir}" = 'x${prefix}/share'; then
@@ -581,8 +576,8 @@ AM_CONDITIONAL(BUILD_TRAYICON_PLUGIN, test x"$ac_cv_enable_trayicon_plugin" = xy
 dnl --- SpamAssassin ---
 AC_MSG_CHECKING([whether to build SpamAssassin plugin])
 AC_ARG_ENABLE(spamassassin-plugin,
-       [  --enable-spamassassin-plugin      Build SpamAssassin plugin [default=no]],
-       [ac_cv_enable_spamassassin_plugin=$enableval], [ac_cv_enable_spamassassin_plugin=no])
+       [  --disable-spamassassin-plugin      Build SpamAssassin plugin [default=yes]],
+       [ac_cv_enable_spamassassin_plugin=$enableval], [ac_cv_enable_spamassassin_plugin=yes])
 if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
        AC_MSG_RESULT(yes)
        AC_SPAMASSASSIN
@@ -645,29 +640,6 @@ else
 fi
 AM_CONDITIONAL(BUILD_PGPINLINE_PLUGIN, test x"$ac_cv_enable_pgpinline_plugin" = xyes)
 
-dnl --- MathML Viewer ---
-AC_MSG_CHECKING([whether to build MathML-Viewer plugin])
-AC_ARG_ENABLE(mathml-viewer-plugin,
-       [  --disable-mathml-viewer-plugin    Do not build MathML-Viewer plugin],
-       [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=yes])
-if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
-       AC_MSG_RESULT(yes)
-       PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.5, :, ac_cv_enable_mathml_viewer_plugin=no)
-
-       if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
-
-               PLUGINS="mathml-viewer $PLUGINS"
-       else
-               AC_MSG_RESULT(not found)
-               AC_MSG_WARN([*** MathML-Viewer plugin will not be built ***])
-       fi
-else
-       AC_MSG_RESULT(no)
-fi
-AC_SUBST(GTK_MATH_VIEW_CFLAGS)
-AC_SUBST(GTK_MATH_VIEW_LIBS)
-AM_CONDITIONAL(BUILD_MATHML_VIEWER_PLUGIN, test x"$ac_cv_enable_mathml_viewer_plugin" = xyes)
-
 dnl --- Dillo Viewer ---
 AC_MSG_CHECKING([whether to build Dillo plugin])
 AC_ARG_ENABLE(dillo-viewer-plugin,
@@ -734,18 +706,18 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
-          if test "$LIBETPAN_VERSION" -lt "040"; then
-               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.40 or newer. See http://www.etpan.org/])
+          if test "$LIBETPAN_VERSION" -lt "041"; then
+               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.41 or newer. See http://www.etpan.org/])
                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
-                AC_MSG_ERROR([libetpan 0.40 not found])
+                AC_MSG_ERROR([libetpan 0.41 not found])
           fi
           AC_SUBST(LIBETPAN_FLAGS)
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
        else
-          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.40 or newer. See http://www.etpan.org/ ])
+          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.41 or newer. See http://www.etpan.org/ ])
           AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
-           AC_MSG_ERROR([libetpan 0.40 not found])
+           AC_MSG_ERROR([libetpan 0.41 not found])
        fi
 else
        AC_MSG_RESULT(no)
@@ -789,7 +761,6 @@ src/etpan/Makefile
 src/plugins/Makefile
 src/plugins/demo/Makefile
 src/plugins/spamassassin/Makefile
-src/plugins/mathml_viewer/Makefile
 src/plugins/dillo_viewer/Makefile
 src/plugins/trayicon/Makefile
 src/plugins/trayicon/libeggtrayicon/Makefile
@@ -798,19 +769,7 @@ src/plugins/pgpcore/Makefile
 src/plugins/pgpmime/Makefile
 src/plugins/pgpinline/Makefile
 doc/Makefile
-doc/faq/Makefile
-doc/faq/de/Makefile
-doc/faq/en/Makefile
-doc/faq/es/Makefile
-doc/faq/fr/Makefile
-doc/faq/it/Makefile
 doc/man/Makefile
-doc/manual/Makefile
-doc/manual/de/Makefile
-doc/manual/en/Makefile
-doc/manual/es/Makefile
-doc/manual/fr/Makefile
-doc/manual/ja/Makefile
 tools/Makefile
 config/Makefile
 sylpheed-claws.pc