bug sync with sylpheed

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index 7d4b581a481431a036825a494f6a73dfeb1f64c1..bbbcdecbafe12c7343cba32d1eefdd4648a18c95 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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
@@ -173,21 +173,23 @@ 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_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
-sv_CHECK_TYPE(wint_t, unsigned int,
-[
-#if (HAVE_WCHAR_H && HAVE_WCTYPE_H)
-#include <wchar.h>
-#endif
-])
+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