bug sync with sylpheed

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index 74790ca5b90760bd0886b54f8aa5f21d6051e306..bbbcdecbafe12c7343cba32d1eefdd4648a18c95 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=4
 MICRO_VERSION=65
 INTERFACE_AGE=65
 BINARY_AGE=65
-EXTRA_VERSION=cvs3
+EXTRA_VERSION=claws6
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
@@ -87,7 +87,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 +149,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
@@ -163,9 +186,13 @@ AC_TYPE_SIZE_T
 AC_STRUCT_TM
 AC_CHECK_TYPE(wint_t, unsigned int)
 
+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 \