new newsgroups dialog box

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index b9c8ee156858f0e7875c2612760a78a3b177eddd..26d60fc272f3ccbc155621f6d6eaaa64f5c75e64 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,16 +5,18 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=6
-MICRO_VERSION=0
+MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+dnl AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
 
 dnl GNOME installed?
 AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
@@ -40,7 +42,6 @@ AC_SUBST(LT_AGE)
 dnl Specify a header configuration file
 AM_CONFIG_HEADER(config.h)
 
-AM_PROG_LIBTOOL
 AM_MAINTAINER_MODE
 
 dnl Checks for programs.
@@ -53,13 +54,14 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_CPP
 dnl AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
 
 SYLPHEED_ACLOCAL_INCLUDE(ac)
 
 dnl for gettext
-ALL_LINGUAS="cs de el es fr it ja ko nl pl pt_BR ru zh_CN.GB2312 zh_TW.Big5"
+ALL_LINGUAS="cs de el es fr hr it ja ko nl pl pt_BR ru sv"
 AM_GNU_GETTEXT
 dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
 localedir='${prefix}/${DATADIRNAME}/locale'
@@ -103,7 +105,7 @@ AC_ARG_ENABLE(gpgme,
 AC_MSG_CHECKING([whether to use GPGME])
 if test $ac_cv_enable_gpgme = yes; then
        AC_MSG_RESULT(yes)
-       AM_PATH_GPGME(0.2.1, AC_DEFINE(USE_GPGME), [use_gpgme=no
+       AM_PATH_GPGME(0.2.3, AC_DEFINE(USE_GPGME), [use_gpgme=no
                                                    ac_cv_enable_gpgme=no])
 else
        AC_MSG_RESULT(no)
@@ -139,27 +141,25 @@ if test "$ac_cv_enable_compface" = yes; then
 fi
 
 dnl for JPilot support in addressbook
-dnl no check for libraries: these are dynamically loaded
+dnl no check for libraries; these are dynamically loaded
 AC_ARG_ENABLE(jpilot,
        [  --enable-jpilot         Enable JPilot support [default=no]],
        [ac_cv_enable_jpilot=$enableval], [ac_cv_enable_jpilot=no])
-
-AC_MSG_CHECKING([whether to use jpilot])
+AC_MSG_CHECKING([whether to use JPilot])
 if test "$ac_cv_enable_jpilot" = yes; then
        AC_MSG_RESULT(yes)
-       if test "$ac_cv_enable_jpilot" = yes; then
-               AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h, , [ac_cv_enable_jpilot=no])
-               if test "$ac_cv_enable_jpilot" = yes; then              
-                       LIBS="$LIBS -lpisock"
-                       AC_DEFINE(USE_JPILOT)
-               fi
-       fi
-       AC_MSG_CHECKING(whether jpilot is available)
-       if test "$ac_cv_enable_jpilot" = yes; then
-               AC_MSG_RESULT(yes)
-       else
-               AC_MSG_RESULT(no)
+       AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h,
+                        [ LIBS="$LIBS -lpisock"
+                          AC_DEFINE(USE_JPILOT) ],
+                        [ ac_cv_enable_jpilot=no ])
+       if test "$ac_cv_enable_jpilot" = no; then
+               AC_CHECK_HEADERS(libpisock/pi-args.h libpisock/pi-appinfo.h libpisock/pi-address.h,
+                                [ LIBS="$LIBS -lpisock"
+                                  ac_cv_enable_jpilot=yes
+                                  AC_DEFINE(USE_JPILOT) ])
        fi
+       AC_MSG_CHECKING([whether jpilot is available])
+       AC_MSG_RESULT($ac_cv_enable_jpilot)
 else
        AC_MSG_RESULT(no)
 fi
@@ -167,25 +167,17 @@ fi
 dnl for LDAP support in addressbook
 dnl no check for libraries; dynamically loaded
 AC_ARG_ENABLE(ldap,
-       [  --enable-ldap         Enable LDAP support [default=no]],
+       [  --enable-ldap           Enable LDAP support [default=no]],
        [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no])
-
-AC_MSG_CHECKING([whether to use ldap])
+AC_MSG_CHECKING([whether to use LDAP])
 if test "$ac_cv_enable_ldap" = yes; then
        AC_MSG_RESULT(yes)
-       if test "$ac_cv_enable_ldap" = yes; then
-               AC_CHECK_HEADERS(ldap.h lber.h pthread.h, , [ac_cv_enable_ldap=no])
-               if test "$ac_cv_enable_ldap" = yes; then
-                       LIBS="$LIBS -lldap -llber -lpthread -lresolv"
-                       AC_DEFINE(USE_LDAP)
-               fi      
-       fi
-       AC_MSG_CHECKING(whether ldap is available)
-       if test "$ac_cv_enable_ldap" = yes; then
-               AC_MSG_RESULT(yes)
-       else
-               AC_MSG_RESULT(no)
-       fi
+       AC_CHECK_HEADERS(ldap.h lber.h pthread.h,
+                        [ LIBS="$LIBS -lldap -llber -lpthread -lresolv `glib-config --libs gthread`"
+                          AC_DEFINE(USE_LDAP) ],
+                        [ ac_cv_enable_ldap=no ])
+       AC_MSG_CHECKING([whether ldap is available])
+       AC_MSG_RESULT($ac_cv_enable_ldap)
 else
        AC_MSG_RESULT(no)
 fi
@@ -259,6 +251,19 @@ else
        AC_MSG_RESULT(no)
 fi
 
+dnl PSPELL is user for spell checking
+AC_ARG_ENABLE(pspell,
+       [  --enable-pspell           Enable pspell support [default=no]],
+       [ac_cv_enable_pspell=$enableval], [ac_cv_enable_pspell=no])
+AC_MSG_CHECKING([whether to use pspell])
+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])
+else
+       AC_MSG_RESULT(no)
+fi
+
 dnl check if gdk / gtk was compiled with USE_XIM
 AC_MSG_CHECKING([whether GTK was compiled with XIM support])
 CFLAGS_SAVE="$CFLAGS"
@@ -345,6 +350,7 @@ 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 ""