make building threads by subject work when thread view is enabled

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index 9a4c74b40f224524eab6ce0c3a97720226823c99..4789d3b9aa05425b07e0b41244a520128602f4fa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,11 +4,11 @@ PACKAGE=sylpheed
 
 dnl version number
 MAJOR_VERSION=0
-MINOR_VERSION=4
-MICRO_VERSION=65
-INTERFACE_AGE=65
-BINARY_AGE=65
-EXTRA_VERSION=cvs4
+MINOR_VERSION=5
+MICRO_VERSION=0
+INTERFACE_AGE=0
+BINARY_AGE=0
+EXTRA_VERSION=claws1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
@@ -16,6 +16,14 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$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)
+fi
+AM_CONDITIONAL(SYLPHEED_GNOME, test -d "$gnomedir")
+
 dnl libtool versioning
 LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
 LT_CURRENT=`expr $MICRO_VERSION - $INTERFACE_AGE`
@@ -42,6 +50,8 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_CPP
 dnl AC_PROG_RANLIB
+AM_PROG_LEX
+AC_PROG_YACC
 
 SYLPHEED_ACLOCAL_INCLUDE(ac)
 
@@ -87,7 +97,7 @@ AC_ARG_ENABLE(gpgme,
        [  --enable-gpgme          Enable GnuPG support using GPGME [default=no]],
        [ac_cv_enable_gpgme=$enableval], [ac_cv_enable_gpgme=no])
 if test $ac_cv_enable_gpgme = yes; then
-       AM_PATH_GPGME(0.1.4, AC_DEFINE(USE_GPGME), [use_gpgme=no])
+       AM_PATH_GPGME(0.2.1, AC_DEFINE(USE_GPGME), [use_gpgme=no])
 fi
 
 dnl Check for X-Face support
@@ -149,11 +159,34 @@ if test x"$ac_cv_enableipv6" = xyes; then
        fi
 fi
 
+dnl check if gdk / gtk was compiled with USE_XIM
+AC_MSG_CHECKING([whether GTK was compiled with XIM support])
+CFLAGS_SAVE="$CFLAGS"
+LDFLAGS_SAVE="$LDFLAGS"
+CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags` `gtk-config --cflags`"
+LDFLAGS="$LIBS `$GLIB_CONFIG --libs` `gtk-config --libs`"
+AC_CACHE_VAL(ac_cv_use_gtkgdk_xim, [
+       AC_TRY_COMPILE([#include <gtk/gtk.h>
+                       #include <gdk/gdk.h>],
+                       [extern gint gdk_im_open(void); gdk_im_open();],
+                        ac_cv_use_gtkgdk_xim=yes, ac_cv_use_gtkgdk_xim=no)
+       ])
+AC_MSG_RESULT($ac_cv_use_gtkgdk_xim)
+if test $ac_cv_use_gtkgdk_xim = yes; then
+       AC_DEFINE(USE_GTKGDK_XIM)
+fi
+CFLAGS="$CFLAGS_SAVE"
+LDFLAGS="$LDFLAGS_SAVE"
+
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h sys/param.h)
+AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
+                sys/param.h sys/utsname.h \
+                wchar.h wctype.h)
+
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -161,11 +194,24 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
-AC_CHECK_TYPE(wint_t, unsigned int)
+
+dnl AC_CHECK_TYPE(wint_t, unsigned int) does not work because wint_t
+dnl may be defined only in wchar.h (this happens with gcc-2.96).
+dnl So we need to use this extended macro.
+SYLPHEED_CHECK_TYPE(wint_t, unsigned int,
+[
+#if HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+])
+
+GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
+AC_CHECK_SIZEOF(unsigned short, 2)
+AC_CHECK_SIZEOF(unsigned int, 4)
+AC_CHECK_SIZEOF(unsigned long, 4)
 
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
-AC_CHECK_HEADERS(wchar.h wctype.h)
 AC_CHECK_FUNCS(gethostname mkdir mktime socket strstr \
               wcsstr wcswcs iswalnum iswspace towlower \
               wcslen wcscpy wcsncpy \