dnl version number
MAJOR_VERSION=0
MINOR_VERSION=4
-MICRO_VERSION=65
-INTERFACE_AGE=65
-BINARY_AGE=65
-EXTRA_VERSION=claws4
+MICRO_VERSION=99
+INTERFACE_AGE=99
+BINARY_AGE=99
+EXTRA_VERSION=claws2
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl
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`
[ --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
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
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 \