changed sock_read() in some files to sock_gets().

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index d94615bebaa183a6e762be0838f9dcde5930e457..64818a4507d681e4dec665c977c91cc7218dffb1 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=claws5
+EXTRA_VERSION=claws7
 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
@@ -173,7 +173,10 @@ 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
@@ -181,11 +184,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.
+sv_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 \