update

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index 8bd98e975afbead84b70e7f3c157b58e1e8213cd..2a32398dd35f75ff51f8abf5064f44c124d009fc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,10 +5,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=7
-MICRO_VERSION=1
+MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws8
+EXTRA_VERSION=claws3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -78,6 +78,8 @@ AC_SUBST(localedir)
 
 manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
 AC_SUBST(manualdir)
+faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq'
+AC_SUBST(faqdir)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
 if test "x${datadir}" = 'x${prefix}/share'; then
@@ -131,35 +133,6 @@ else
        AC_MSG_RESULT(no)
 fi
 
-dnl Check for OpenSSL
-AC_ARG_ENABLE(ssl,
-       [  --enable-ssl            Enable SSL support using OpenSSL [default=no]],
-       [ac_cv_enable_ssl=$enableval], [ac_cv_enable_ssl=no])
-AC_MSG_CHECKING([whether to use OpenSSL])
-if test $ac_cv_enable_ssl = yes; then
-       AC_MSG_RESULT(yes)
-       AC_MSG_CHECKING([if openssl is available])
-       LIBS="$LIBS -lssl -lcrypto"
-       AC_TRY_LINK([
-#include <openssl/opensslv.h>
-],     [ return OPENSSL_VERSION_NUMBER; ],
-       [ AC_MSG_RESULT(yes)
-         AC_DEFINE(USE_SSL) ],
-       [ AC_MSG_RESULT(no)
-         LIBS="$ac_save_LIBS"
-         ac_cv_enable_ssl=no ])
-else
-       AC_MSG_RESULT(no)
-fi
-
-dnl Check for X-Face support
-AC_ARG_ENABLE(compface,
-       [  --disable-compface      Do not use compface (X-Face)],
-       [ac_cv_enable_compface=$enableval], [ac_cv_enable_compface=yes])
-if test "$ac_cv_enable_compface" = yes; then
-       AC_CHECK_LIB(compface, uncompface,,[ac_cv_enable_compface=no])
-fi
-
 dnl for JPilot support in addressbook
 dnl no check for libraries; these are dynamically loaded
 AC_ARG_ENABLE(jpilot,
@@ -208,15 +181,33 @@ else
        AC_MSG_RESULT(no)
 fi
 
-dnl get ispell path
-dnl
-AC_PATH_PROG(ispell_path, ispell, no)
-if test "$ispell_path" != no; then
-       AC_DEFINE_UNQUOTED(ISPELL_PATH, "$ispell_path")
-       AC_SUBST(ISPELL_PATH)
+dnl Check for OpenSSL
+AC_ARG_ENABLE(ssl,
+       [  --enable-ssl            Enable SSL support using OpenSSL [default=no]],
+       [ac_cv_enable_ssl=$enableval], [ac_cv_enable_ssl=no])
+AC_MSG_CHECKING([whether to use OpenSSL])
+if test $ac_cv_enable_ssl = yes; then
+       AC_MSG_RESULT(yes)
+       AC_MSG_CHECKING([if openssl is available])
+       LIBS="$LIBS -lssl -lcrypto"
+       AC_TRY_LINK([
+#include <openssl/opensslv.h>
+],     [ return OPENSSL_VERSION_NUMBER; ],
+       [ AC_MSG_RESULT(yes)
+         AC_DEFINE(USE_SSL) ],
+       [ AC_MSG_RESULT(no)
+         LIBS="$ac_save_LIBS"
+         ac_cv_enable_ssl=no ])
 else
-       AC_DEFINE_UNQUOTED(ISPELL_PATH, "/usr/bin/ispell")
-       AC_SUBST(ISPELL_PATH)
+       AC_MSG_RESULT(no)
+fi
+
+dnl Check for X-Face support
+AC_ARG_ENABLE(compface,
+       [  --disable-compface      Do not use compface (X-Face)],
+       [ac_cv_enable_compface=$enableval], [ac_cv_enable_compface=yes])
+if test "$ac_cv_enable_compface" = yes; then
+       AC_CHECK_LIB(compface, uncompface,,[ac_cv_enable_compface=no])
 fi
 
 dnl Check for libjconv
@@ -286,6 +277,8 @@ if test $ac_cv_enable_pspell = yes; then
        AC_MSG_RESULT(yes)
        AM_PATH_PSPELL(.12.2, AC_DEFINE(USE_PSPELL), [use_pspell=no
                                                    ac_cv_enable_pspell=no])
+       pspell_path="`pspell-config --pkgdatadir`"
+       AC_DEFINE_UNQUOTED(PSPELL_PATH, "${pspell_path}/")
 else
        AC_MSG_RESULT(no)
 fi
@@ -357,8 +350,13 @@ po/Makefile.in
 libkcc/Makefile
 src/version.h
 src/Makefile
+faq/Makefile
+faq/en/Makefile
+faq/es/Makefile
+faq/fr/Makefile
 manual/Makefile
 manual/en/Makefile
+manual/fr/Makefile
 manual/ja/Makefile
 tools/Makefile
 ])
@@ -367,16 +365,21 @@ dnl Output the configuration summary
 echo ""
 echo "$PACKAGE $VERSION"
 echo ""
-echo "gdk-pixbuf : $ac_cv_enable_gdk_pixbuf"
-echo "gdk_imlib  : $ac_cv_enable_imlib"
-echo "GPGME      : $ac_cv_enable_gpgme"
-echo "JPilot     : $ac_cv_enable_jpilot"
-echo "LDAP       : $ac_cv_enable_ldap"
-echo "OpenSSL    : $ac_cv_enable_ssl"
-echo "compface   : $ac_cv_enable_compface"
-echo "libjconv   : $ac_cv_enable_jconv"
-echo "IPv6       : $ac_cv_enable_ipv6"
-echo "Pspell     : $ac_cv_enable_pspell"
+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 "GPGME         : $ac_cv_enable_gpgme"
+echo "JPilot        : $ac_cv_enable_jpilot"
+echo "LDAP          : $ac_cv_enable_ldap"
+echo "OpenSSL       : $ac_cv_enable_ssl"
+echo "compface      : $ac_cv_enable_compface"
+echo "libjconv      : $ac_cv_enable_jconv"
+echo "IPv6          : $ac_cv_enable_ipv6"
+echo "Pspell        : $ac_cv_enable_pspell"
 echo ""
 echo "The binary will be installed in $prefix/bin"
 echo ""