fix ssl deadlock, when peer closes connection
[claws.git] / configure.in
index f47e689402ec3159800f0ae0dbbf56a258ebcd6a..eb49e7e473198aea499546515b5eb443d2ae1e79 100644 (file)
@@ -1,23 +1,22 @@
-dnl check for needed autoconf version
-AC_PREREQ(2.50)
-
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/main.c)
 PACKAGE=sylpheed
 
 dnl version number
 MAJOR_VERSION=0
-MINOR_VERSION=5
-MICRO_VERSION=3
+MINOR_VERSION=6
+MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws6
+EXTRA_VERSION=claws3
 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)
@@ -43,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.
@@ -56,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'
@@ -81,20 +80,21 @@ AM_PATH_GTK(1.2.6,,
 dnl Check for built-in image view support
 AC_ARG_ENABLE(gdk-pixbuf,
        [  --disable-gdk-pixbuf    Do not use gdk-pixbuf],
-       [ac_cv_disable_gdk_pixbuf=disable], [ac_cv_disable_gdk_pixbuf=no])
+       [ac_cv_enable_gdk_pixbuf=$enableval], [ac_cv_enable_gdk_pixbuf=yes])
 AC_ARG_ENABLE(imlib,
        [  --disable-imlib         Do not use imlib],
-       [ac_cv_disable_imlib=disable], [ac_cv_disable_imlib=no])
+       [ac_cv_enable_imlib=$enableval], [ac_cv_enable_imlib=yes])
 
-if test "$ac_cv_disable_gdk_pixbuf" = no; then
+if test "$ac_cv_enable_gdk_pixbuf" = yes; then
        AM_PATH_GDK_PIXBUF(0.8.0,
-               AC_DEFINE(HAVE_GDK_PIXBUF), [ac_cv_disable_gdk_pixbuf=disable])
+               [AC_DEFINE(HAVE_GDK_PIXBUF)
+                ac_cv_enable_imlib=no], [ac_cv_enable_gdk_pixbuf=no])
 fi
-if test "$ac_cv_disable_gdk_pixbuf" = disable -a "$ac_cv_disable_imlib" = no; then
+if test "$ac_cv_enable_imlib" = yes; then
        AM_PATH_GDK_IMLIB(1.9,
-               AC_DEFINE(HAVE_GDK_IMLIB), [ac_cv_disable_imlib=disable])
+               AC_DEFINE(HAVE_GDK_IMLIB), [ac_cv_enable_imlib=no])
 fi
-if test "$ac_cv_disable_gdk_pixbuf" = disable -a "$ac_cv_disable_imlib" = disable; then
+if test "$ac_cv_enable_gdk_pixbuf" = no -a "$ac_cv_enable_imlib" = no; then
        AC_MSG_WARN(*** Built-in image view will not be supported ***)
 fi
 
@@ -105,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)
@@ -126,7 +126,8 @@ if test $ac_cv_enable_ssl = yes; then
        [ AC_MSG_RESULT(yes)
          AC_DEFINE(USE_SSL) ],
        [ AC_MSG_RESULT(no)
-         LIBS="$ac_save_LIBS" ])
+         LIBS="$ac_save_LIBS"
+         ac_cv_enable_ssl=no ])
 else
        AC_MSG_RESULT(no)
 fi
@@ -134,33 +135,31 @@ fi
 dnl Check for X-Face support
 AC_ARG_ENABLE(compface,
        [  --disable-compface      Do not use compface (X-Face)],
-       [ac_cv_disable_compface=disable], [ac_cv_disable_compface=no])
-if test "$ac_cv_disable_compface" = no; then
-       AC_CHECK_LIB(compface, uncompface,,[ac_cv_disable_compface=disable])
+       [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
+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
@@ -168,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
@@ -205,9 +196,9 @@ fi
 dnl Check for libjconv
 AC_ARG_ENABLE(jconv,
        [  --disable-jconv         Do not use libjconv],
-       [ac_cv_disable_jconv=disable], [ac_cv_disable_jconv=no])
-if test "$ac_cv_disable_jconv" = no; then
-       AC_CHECK_LIB(jconv, jconv_alloc_conv,,[ac_cv_disable_jconv=disable])
+       [ac_cv_enable_jconv=$enableval], [ac_cv_enable_jconv=yes])
+if test "$ac_cv_enable_jconv" = yes; then
+       AC_CHECK_LIB(jconv, jconv_alloc_conv,,[ac_cv_enable_jconv=no])
 fi
 
 AC_CHECK_LIB(xpg4, setlocale)
@@ -235,11 +226,11 @@ fi
 dnl check for IPv6 option
 AC_ARG_ENABLE(ipv6,
        [  --enable-ipv6           Enable IPv6 support [default=no]],
-       [ac_cv_enableipv6=$enableval], [ac_cv_enableipv6=no])
+       [ac_cv_enable_ipv6=$enableval], [ac_cv_enable_ipv6=no])
 
 dnl automated checks for IPv6 support.
 AC_MSG_CHECKING([whether to use IPv6])
-if test x"$ac_cv_enableipv6" = xyes; then
+if test x"$ac_cv_enable_ipv6" = xyes; then
        AC_MSG_RESULT(yes)
        AC_MSG_CHECKING([for IPv6 support])
        AC_CACHE_VAL(ac_cv_ipv6,[
@@ -254,12 +245,25 @@ if test x"$ac_cv_enableipv6" = xyes; then
                AC_DEFINE(INET6)
        else
                AC_MSG_WARN(*** IPv6 will not be supported ***)
-               ac_cv_enableipv6=no
+               ac_cv_enable_ipv6=no
        fi
 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"
@@ -325,40 +329,28 @@ intl/Makefile
 ac/Makefile
 po/Makefile.in
 libkcc/Makefile
+src/version.h
 src/Makefile
 manual/Makefile
 manual/en/Makefile
 manual/ja/Makefile
+tools/Makefile
 ])
 
 dnl Output the configuration summary
 echo ""
 echo "$PACKAGE $VERSION"
 echo ""
-if test "$ac_cv_disable_gdk_pixbuf" = no; then
-       echo "gdk-pixbuf : yes"
-       echo "gdk_imlib  : no"
-else
-       echo "gdk-pixbuf : no"
-       if test "$ac_cv_disable_imlib" = no; then
-               echo "gdk_imlib  : yes"
-       else
-               echo "gdk_imlib  : no"
-       fi
-fi
+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"
-if test "$ac_cv_disable_compface" = no; then
-       echo "compface   : yes"
-else
-       echo "compface   : no"
-fi
-if test "$ac_cv_disable_jconv" = no; then
-       echo "libjconv   : yes"
-else
-       echo "libjconv   : no"
-fi
-echo "IPv6       : $ac_cv_enableipv6"
+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 ""