[Commits] [SCM] claws branch, gtk2, updated. 3.19.0-24-g95f66b091
wwp at claws-mail.org
wwp at claws-mail.org
Thu May 19 08:06:30 CEST 2022
The branch, gtk2 has been updated
via 95f66b091c15c75fdbefe65988a0ca932d028f0d (commit)
via eeb1a308e565bb3a7bd26912d588504d26252b99 (commit)
via d1f6124cc8b04890df8db8f818717c0723c3dc88 (commit)
from 257c5215bfeb7f125f12f3eb2009c684356b9803 (commit)
Summary of changes:
configure.ac | 88 +++++++++++++++++++----------------------------
m4/check-type.m4 | 9 +++--
m4/gnupg-check-typedef.m4 | 6 ++--
m4/gnupg.m4 | 5 ++-
m4/gpgme.m4 | 3 +-
m4/intmax.m4 | 4 +--
m4/inttypes-pri.m4 | 4 +--
m4/inttypes.m4 | 6 ++--
m4/inttypes_h.m4 | 8 ++---
m4/longdouble.m4 | 5 ++-
m4/signed.m4 | 2 +-
m4/spamassassin.m4 | 35 ++++++-------------
m4/stdint_h.m4 | 8 ++---
m4/wchar_t.m4 | 5 ++-
14 files changed, 70 insertions(+), 118 deletions(-)
- Log -----------------------------------------------------------------
commit 95f66b091c15c75fdbefe65988a0ca932d028f0d
Author: Paul <paul at claws-mail.org>
Date: Wed May 18 11:55:52 2022 +0100
modernize autotools (forgot this file in last commit)
diff --git a/m4/gpgme.m4 b/m4/gpgme.m4
index 10ee13f94..528cf7e38 100644
--- a/m4/gpgme.m4
+++ b/m4/gpgme.m4
@@ -12,8 +12,7 @@
AC_DEFUN([_AM_PATH_GPGME_CONFIG],
[ AC_ARG_WITH(gpgme-prefix,
- AC_HELP_STRING([--with-gpgme-prefix=PFX],
- [prefix where GPGME is installed (optional)]),
+ AS_HELP_STRING([--with-gpgme-prefix=PFX],[prefix where GPGME is installed (optional)]),
gpgme_config_prefix="$withval", gpgme_config_prefix="")
if test "x$gpgme_config_prefix" != x ; then
GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
commit eeb1a308e565bb3a7bd26912d588504d26252b99
Author: Paul <paul at claws-mail.org>
Date: Wed May 18 11:49:16 2022 +0100
modernise autotools
diff --git a/configure.ac b/configure.ac
index 839db3ba0..c5166a8e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -443,16 +443,6 @@ AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_STRUCT_TM
-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.
-CLAWS_CHECK_TYPE(wint_t, unsigned int,
-[
-#if HAVE_WCHAR_H
-#include <wchar.h>
-#endif
-], Define to `unsigned int' if <stddef.h> or <wchar.h> doesn't define.)
-
GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF, Used to test for a u32 typedef)
AC_CHECK_SIZEOF(unsigned short, 2)
AC_CHECK_SIZEOF(unsigned int, 4)
diff --git a/m4/check-type.m4 b/m4/check-type.m4
index b5ac51d60..7ea7c89e8 100644
--- a/m4/check-type.m4
+++ b/m4/check-type.m4
@@ -10,20 +10,19 @@ dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([CLAWS_CHECK_TYPE],
-[AC_REQUIRE([AC_HEADER_STDC])dnl
-AC_MSG_CHECKING(for $1)
+[AC_MSG_CHECKING(for $1)
AC_CACHE_VAL(claws_cv_type_$1,
-[AC_TRY_COMPILE([
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
$3
-], [
+]], [[
#undef $1
int a = sizeof($1);
-], claws_cv_type_$1=yes, claws_cv_type_$1=no)])dnl
+]])],[claws_cv_type_$1=yes],[claws_cv_type_$1=no])])dnl
AC_MSG_RESULT($claws_cv_type_$1)
if test $claws_cv_type_$1 = no; then
AC_DEFINE($1, $2, $4)
diff --git a/m4/gnupg-check-typedef.m4 b/m4/gnupg-check-typedef.m4
index bd7d6c400..7e41cf05d 100644
--- a/m4/gnupg-check-typedef.m4
+++ b/m4/gnupg-check-typedef.m4
@@ -8,11 +8,11 @@ dnl
AC_DEFUN([GNUPG_CHECK_TYPEDEF],
[ AC_MSG_CHECKING(for $1 typedef)
AC_CACHE_VAL(gnupg_cv_typedef_$1,
- [AC_TRY_COMPILE([#include <stdlib.h>
- #include <sys/types.h>], [
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+ #include <sys/types.h>]], [[
#undef $1
int a = sizeof($1);
- ], gnupg_cv_typedef_$1=yes, gnupg_cv_typedef_$1=no )])
+ ]])],[gnupg_cv_typedef_$1=yes],[gnupg_cv_typedef_$1=no ])])
AC_MSG_RESULT($gnupg_cv_typedef_$1)
if test "$gnupg_cv_typedef_$1" = yes; then
AC_DEFINE($2, 1, $3)
diff --git a/m4/gnupg.m4 b/m4/gnupg.m4
index 5f1cffc24..0b0420277 100644
--- a/m4/gnupg.m4
+++ b/m4/gnupg.m4
@@ -17,7 +17,7 @@ dnl of the usual 2.
AC_DEFUN([GNUPG_FUNC_MKDIR_TAKES_ONE_ARG],
[AC_CHECK_HEADERS(sys/stat.h unistd.h direct.h)
AC_CACHE_CHECK([if mkdir takes one argument], gnupg_cv_mkdir_takes_one_arg,
-[AC_TRY_COMPILE([
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
@@ -27,8 +27,7 @@ AC_CACHE_CHECK([if mkdir takes one argument], gnupg_cv_mkdir_takes_one_arg,
#endif
#ifdef HAVE_DIRECT_H
# include <direct.h>
-#endif], [mkdir ("foo", 0);],
- gnupg_cv_mkdir_takes_one_arg=no, gnupg_cv_mkdir_takes_one_arg=yes)])
+#endif]], [[mkdir ("foo", 0);]])],[gnupg_cv_mkdir_takes_one_arg=no],[gnupg_cv_mkdir_takes_one_arg=yes])])
if test $gnupg_cv_mkdir_takes_one_arg = yes ; then
AC_DEFINE(MKDIR_TAKES_ONE_ARG,1,
[Defined if mkdir() does not take permission flags])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index d99c999fd..5c5c8b555 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -13,7 +13,7 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
AC_REQUIRE([gl_AC_HEADER_STDINT_H])
AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
- [AC_TRY_COMPILE([
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <stddef.h>
#include <stdlib.h>
#if HAVE_STDINT_H_WITH_UINTMAX
@@ -22,7 +22,7 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
#if HAVE_INTTYPES_H_WITH_UINTMAX
#include <inttypes.h>
#endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+]], [[intmax_t x = -1;]])],[gt_cv_c_intmax_t=yes],[gt_cv_c_intmax_t=no])])
if test $gt_cv_c_intmax_t = yes; then
AC_DEFINE(HAVE_INTMAX_T, 1,
[Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
index 4d56a9ad3..268ceb8dd 100644
--- a/m4/inttypes-pri.m4
+++ b/m4/inttypes-pri.m4
@@ -16,11 +16,11 @@ AC_DEFUN([gt_INTTYPES_PRI],
AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
gt_cv_inttypes_pri_broken,
[
- AC_TRY_COMPILE([#include <inttypes.h>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <inttypes.h>
#ifdef PRId32
char *p = PRId32;
#endif
-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+]], [[]])],[gt_cv_inttypes_pri_broken=no],[gt_cv_inttypes_pri_broken=yes])
])
fi
if test "$gt_cv_inttypes_pri_broken" = yes; then
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index 779bcea05..9987a5427 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -13,10 +13,8 @@ AC_DEFUN([gt_HEADER_INTTYPES_H],
[
AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
[
- AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <inttypes.h>],
- [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <inttypes.h>]], [[]])],[gt_cv_header_inttypes_h=yes],[gt_cv_header_inttypes_h=no])
])
if test $gt_cv_header_inttypes_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index a5d075d96..33809d8b1 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -12,12 +12,8 @@ dnl From Paul Eggert.
AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
[
AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
- [AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <inttypes.h>],
- [uintmax_t i = (uintmax_t) -1;],
- gl_cv_header_inttypes_h=yes,
- gl_cv_header_inttypes_h=no)])
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <inttypes.h>]], [[uintmax_t i = (uintmax_t) -1;]])],[gl_cv_header_inttypes_h=yes],[gl_cv_header_inttypes_h=no])])
if test $gl_cv_header_inttypes_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
index 40cd7ce02..bf10d7876 100644
--- a/m4/longdouble.m4
+++ b/m4/longdouble.m4
@@ -14,13 +14,12 @@ AC_DEFUN([gt_TYPE_LONGDOUBLE],
[if test "$GCC" = yes; then
gt_cv_c_long_double=yes
else
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
/* The Stardent Vistra knows sizeof(long double), but does not support it. */
long double foo = 0.0;
/* On Ultrix 4.3 cc, long double is 4 and double is 8. */
int array [2*(sizeof(long double) >= sizeof(double)) - 1];
- ], ,
- gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+ ]], [[]])],[gt_cv_c_long_double=yes],[gt_cv_c_long_double=no])
fi])
if test $gt_cv_c_long_double = yes; then
AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
diff --git a/m4/signed.m4 b/m4/signed.m4
index 048f59369..881247ebf 100644
--- a/m4/signed.m4
+++ b/m4/signed.m4
@@ -9,7 +9,7 @@ dnl From Bruno Haible.
AC_DEFUN([bh_C_SIGNED],
[
AC_CACHE_CHECK([for signed], bh_cv_c_signed,
- [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char x;]])],[bh_cv_c_signed=yes],[bh_cv_c_signed=no])])
if test $bh_cv_c_signed = no; then
AC_DEFINE(signed, ,
[Define to empty if the C compiler doesn't support this keyword.])
diff --git a/m4/spamassassin.m4 b/m4/spamassassin.m4
index c70228ca6..ea4bacf70 100644
--- a/m4/spamassassin.m4
+++ b/m4/spamassassin.m4
@@ -12,12 +12,9 @@ AC_CHECK_HEADERS(time.h sysexits.h sys/socket.h netdb.h netinet/in.h)
AC_CACHE_CHECK([for SHUT_RD],
spamassassin_cv_has_shutrd, [
- AC_TRY_COMPILE([#include <sys/types.h>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <stdio.h>
-#include <sys/socket.h>],
- [printf ("%d", SHUT_RD); return 0;],
- [spamassassin_cv_has_shutrd=yes],
- [spamassassin_cv_has_shutrd=no]),
+#include <sys/socket.h>]], [[printf ("%d", SHUT_RD); return 0;]])],[spamassassin_cv_has_shutrd=yes],[spamassassin_cv_has_shutrd=no]),
])
if test $spamassassin_cv_has_shutrd = yes ; then
AC_DEFINE(HAVE_SHUT_RD, 1, HAVE_SHUT_RD)
@@ -31,12 +28,9 @@ dnl ----------------------------------------------------------------------
AC_CACHE_CHECK([for h_errno],
spamassassin_cv_has_herrno, [
- AC_TRY_COMPILE([#include <netdb.h>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>
#include <stdio.h>
-],
- [printf ("%d", h_errno); return 0;],
- [spamassassin_cv_has_herrno=yes],
- [spamassassin_cv_has_herrno=no]),
+]], [[printf ("%d", h_errno); return 0;]])],[spamassassin_cv_has_herrno=yes],[spamassassin_cv_has_herrno=no]),
])
if test $spamassassin_cv_has_herrno = yes ; then
AC_DEFINE(HAVE_H_ERRNO, 1, HAVE_H_ERRNO)
@@ -48,11 +42,8 @@ dnl ----------------------------------------------------------------------
AC_CACHE_CHECK([for in_addr_t],
spamassassin_cv_has_inaddrt, [
- AC_TRY_COMPILE([#include <sys/types.h>
-#include <netinet/in.h>],
- [in_addr_t foo; return 0;],
- [spamassassin_cv_has_inaddrt=yes],
- [spamassassin_cv_has_inaddrt=no]),
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <netinet/in.h>]], [[in_addr_t foo; return 0;]])],[spamassassin_cv_has_inaddrt=yes],[spamassassin_cv_has_inaddrt=no]),
])
if test $spamassassin_cv_has_inaddrt = no ; then
AC_CHECK_TYPE(in_addr_t, unsigned long)
@@ -62,11 +53,8 @@ dnl ----------------------------------------------------------------------
AC_CACHE_CHECK([for INADDR_NONE],
spamassassin_cv_has_haveinaddrnone, [
- AC_TRY_COMPILE([#include <sys/types.h>
-#include <netinet/in.h>],
- [in_addr_t foo = INADDR_NONE; return 0;],
- [spamassassin_cv_has_haveinaddrnone=yes],
- [spamassassin_cv_has_haveinaddrnone=no]),
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <netinet/in.h>]], [[in_addr_t foo = INADDR_NONE; return 0;]])],[spamassassin_cv_has_haveinaddrnone=yes],[spamassassin_cv_has_haveinaddrnone=no]),
])
if test $spamassassin_cv_has_haveinaddrnone = yes ; then
AC_DEFINE(HAVE_INADDR_NONE, 1, HAVE_INADDR_NONE)
@@ -76,13 +64,10 @@ dnl ----------------------------------------------------------------------
AC_CACHE_CHECK([for EX__MAX],
spamassassin_cv_has_haveexmax, [
- AC_TRY_COMPILE([#ifdef HAVE_SYSEXITS_H
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYSEXITS_H
#include <sysexits.h>
#endif
-#include <errno.h>],
- [int foo = EX__MAX; return 0;],
- [spamassassin_cv_has_haveexmax=yes],
- [spamassassin_cv_has_haveexmax=no]),
+#include <errno.h>]], [[int foo = EX__MAX; return 0;]])],[spamassassin_cv_has_haveexmax=yes],[spamassassin_cv_has_haveexmax=no]),
])
if test $spamassassin_cv_has_haveexmax = yes ; then
AC_DEFINE(HAVE_EX__MAX, 1, HAVE_EX__MAX)
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 3355f35aa..6e224c5a8 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -12,12 +12,8 @@ dnl From Paul Eggert.
AC_DEFUN([gl_AC_HEADER_STDINT_H],
[
AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
- [AC_TRY_COMPILE(
- [#include <sys/types.h>
-#include <stdint.h>],
- [uintmax_t i = (uintmax_t) -1;],
- gl_cv_header_stdint_h=yes,
- gl_cv_header_stdint_h=no)])
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <stdint.h>]], [[uintmax_t i = (uintmax_t) -1;]])],[gl_cv_header_stdint_h=yes],[gl_cv_header_stdint_h=no])])
if test $gl_cv_header_stdint_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4
index cde2129a9..b023c3e17 100644
--- a/m4/wchar_t.m4
+++ b/m4/wchar_t.m4
@@ -11,9 +11,8 @@ dnl Prerequisite: AC_PROG_CC
AC_DEFUN([gt_TYPE_WCHAR_T],
[
AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
- [AC_TRY_COMPILE([#include <stddef.h>
- wchar_t foo = (wchar_t)'\0';], ,
- gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
+ wchar_t foo = (wchar_t)'\0';]], [[]])],[gt_cv_c_wchar_t=yes],[gt_cv_c_wchar_t=no])])
if test $gt_cv_c_wchar_t = yes; then
AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
fi
commit d1f6124cc8b04890df8db8f818717c0723c3dc88
Author: Paul <paul at claws-mail.org>
Date: Tue May 17 12:00:42 2022 +0100
modernize configure.ac and require autoconf 2.69 or greater
diff --git a/configure.ac b/configure.ac
index f3afd27e0..839db3ba0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
-AC_PREREQ(2.59)
-AC_INIT(src/main.c)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
@@ -48,7 +49,7 @@ if test \( "x$EXTRA_RELEASE" != "x" \); then
fi
dnl set $target
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
dnl
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
@@ -90,25 +91,30 @@ AC_CONFIG_HEADERS(config.h)
AC_CONFIG_HEADERS(claws-features.h)
AM_MAINTAINER_MODE
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
dnl Checks for programs.
dnl AC_ARG_PROGRAM
AC_PROG_CC
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_CPP
dnl AC_PROG_RANLIB
-AM_PROG_LEX
+AC_PROG_LEX(noyywrap)
AC_PROG_YACC
AC_LIB_PREFIX
-AC_LIBTOOL_WIN32_DLL
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE(AC_CANONICAL_HOST)_LT_SET_OPTION([LT_INIT],[win32-dll])
+m4_warn([obsolete],[AC_LIBTOOL_WIN32_DLL: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+
+LT_INIT
+LT_PROG_RC
+LT_LANG([Windows Resource])
LT_INIT
-LT_AC_PROG_RC
-AC_LIBTOOL_RC
-AC_PROG_LIBTOOL
AC_PROG_AWK
dnl AC_PROG_CXX will set CXX=g++ even if it finds no useable C++
@@ -126,7 +132,7 @@ AC_SYS_LARGEFILE
dnl ******************************
dnl Checks for host
dnl Not needed anymore because we
-dnl do AC_CANONICAL_SYSTEM above
+dnl do AC_CANONICAL_TARGET above
dnl ******************************
dnl AC_CANONICAL_HOST
@@ -399,11 +405,8 @@ AC_SUBST(SM_LIBS)
dnl Check for __VA_OPT__ macro
AC_CACHE_CHECK([for __VA_OPT__],
[ac_cv_va_opt],
- [AC_TRY_COMPILE([#include <stdio.h>],
- [#define va_opt_printf(format, ...) fprintf(stderr, format __VA_OPT__(,) __VA_ARGS__)
- va_opt_printf("success\n");],
- [ac_cv_va_opt=yes],
- [ac_cv_va_opt=no])]
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[#define va_opt_printf(format, ...) fprintf(stderr, format __VA_OPT__(,) __VA_ARGS__)
+ va_opt_printf("success\n");]])],[ac_cv_va_opt=yes],[ac_cv_va_opt=no])]
)
if test "$ac_cv_va_opt" = yes; then
AC_DEFINE([HAVE_VA_OPT], [1], [Define if __VA_OPT__ macro works])
@@ -412,9 +415,7 @@ fi
dnl Check for d_type member in struct dirent
AC_MSG_CHECKING([whether struct dirent has d_type member])
AC_CACHE_VAL(ac_cv_dirent_d_type,[
- AC_TRY_COMPILE([#include <dirent.h>],
- [struct dirent d; d.d_type = DT_REG;],
- ac_cv_dirent_d_type=yes, ac_cv_dirent_d_type=no)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dirent.h>]], [[struct dirent d; d.d_type = DT_REG;]])],[ac_cv_dirent_d_type=yes],[ac_cv_dirent_d_type=no])
])
AC_MSG_RESULT($ac_cv_dirent_d_type)
if test $ac_cv_dirent_d_type = yes; then
@@ -427,7 +428,7 @@ GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
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 sys/utsname.h sys/select.h \
@@ -494,19 +495,17 @@ if test x"$enable_ipv6" = xyes; then
AC_MSG_CHECKING([for IPv6 support])
if test x"$platform_win32" = xyes; then
AC_CACHE_VAL(ac_cv_ipv6,[
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <ws2tcpip.h>
- ], [struct in6_addr a;],
- ac_cv_ipv6=yes, ac_cv_ipv6=no)
+ ]], [[struct in6_addr a;]])],[ac_cv_ipv6=yes],[ac_cv_ipv6=no])
])
else
AC_CACHE_VAL(ac_cv_ipv6,[
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#define INET6
#include <sys/types.h>
#include <netinet/in.h>
- ], [int x = IPPROTO_IPV6; struct in6_addr a;],
- ac_cv_ipv6=yes, ac_cv_ipv6=no)
+ ]], [[int x = IPPROTO_IPV6; struct in6_addr a;]])],[ac_cv_ipv6=yes],[ac_cv_ipv6=no])
])
fi
AC_MSG_RESULT($ac_cv_ipv6)
@@ -721,13 +720,11 @@ if test x$os_win32 = xno; then
t_oldLibs="$LIBS"
LIBS="$LIBS"
ac_cv_var__res_options=no
- AC_TRY_LINK([#include <sys/types.h>
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
- #include <resolv.h>],
- [_res.options = RES_INIT;],
- ac_cv_var__res_options=yes);
+ #include <resolv.h>]], [[_res.options = RES_INIT;]])],[ac_cv_var__res_options=yes],[]);
if test "$ac_cv_var__res_options" != "yes"; then
LIBRESOLV="-lresolv"
fi
@@ -979,7 +976,7 @@ if test x"$enable_libetpan" = xyes; then
if test "x$libetpan_result" = "xyes"; then
AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
LIBS="$LIBS $LIBETPAN_LIBS"
- AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <libetpan/dbstorage.h>]], [[db_mailstorage_init(NULL, NULL);]])],[libetpan_result=yes],[libetpan_result=no])
AC_MSG_RESULT([$libetpan_result])
fi
fi
@@ -1435,18 +1432,12 @@ if test $have_ytnef -eq 1; then
else
ytnef_include="#include <libytnef/ytnef.h>"
fi
- AC_TRY_COMPILE([#include <stdio.h>
- ${ytnef_include}],
- [SwapDDWord(0, 0);],
- [have_ytnef=1],
- [have_ytnef=0])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+ ${ytnef_include}]], [[SwapDDWord(0, 0);]])],[have_ytnef=1],[have_ytnef=0])
if test $have_ytnef -eq 0; then
- AC_TRY_COMPILE([#include <stdio.h>
- ${ytnef_include}],
- [SwapDDWord(0);],
- [have_ytnef=1;
- YTNEF_CFLAGS="${YTNEF_CFLAGS} -DYTNEF_OLD_SWAPDDWORD"],
- [have_ytnef=0])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+ ${ytnef_include}]], [[SwapDDWord(0);]])],[have_ytnef=1;
+ YTNEF_CFLAGS="${YTNEF_CFLAGS} -DYTNEF_OLD_SWAPDDWORD"],[have_ytnef=0])
fi
if test $have_ytnef -eq 1; then
YTNEF_LIBS="-lytnef"
@@ -2142,7 +2133,7 @@ dnl ****************************
dnl ** Final configure output **
dnl ****************************
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
m4/Makefile
po/Makefile.in
@@ -2225,6 +2216,7 @@ config/Makefile
manual/Makefile
claws-mail.pc
])
+AC_OUTPUT
dnl Output the configuration summary
echo ""
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list