git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DMARC: add variables for spf/dkim alignment results. Bug 3119
[exim.git]
/
test
/
configure.ac
diff --git
a/test/configure.ac
b/test/configure.ac
index 31a809971b9a6104f829402d4f8067ce1abd603c..84fd07821df6e1ec4479443225a3838e2a0d78bf 100644
(file)
--- a/
test/configure.ac
+++ b/
test/configure.ac
@@
-3,11
+3,12
@@
dnl Process this file with autoconf to produce a configure script.
dnl This is required at the start; the name is the name of a file
dnl it should be seeing, to verify it is in the same directory.
dnl This is required at the start; the name is the name of a file
dnl it should be seeing, to verify it is in the same directory.
-AC_INIT(listtests)
+AC_INIT
+AC_CONFIG_SRCDIR([listtests])
dnl A safety precaution
dnl A safety precaution
-AC_PREREQ(
2.57
)
+AC_PREREQ(
[2.71]
)
dnl Checks for programs.
dnl Checks for programs.
@@
-15,8
+16,12
@@
AC_PROG_CC
dnl Checks for header files.
dnl Checks for header files.
-AC_CHECK_HEADERS(openssl/crypto.h,[CLIENT_SSL=bin/client-ssl])
+AC_CHECK_HEADERS(sys/socket.h)
+AC_CHECK_HEADERS(openssl/crypto.h,[CLIENT_OPENSSL=bin/client-ssl])
+AC_CHECK_HEADERS(openssl/crypto.h,[CLIENT_ANYTLS=bin/client-anytls])
AC_CHECK_HEADERS(gnutls/gnutls.h,[CLIENT_GNUTLS=bin/client-gnutls])
AC_CHECK_HEADERS(gnutls/gnutls.h,[CLIENT_GNUTLS=bin/client-gnutls])
+AC_CHECK_HEADERS(gnutls/gnutls.h,[CLIENT_ANYTLS=bin/client-anytls])
+AC_CHECK_HEADERS(gnutls/gnutls.h,[B64_GNUTLS=bin/ed25519_privkey_pem_to_pubkey_raw_b64])
dnl The check on dynamically loaded modules requires the building of
dnl something to load. This seems to be something that varies between
dnl The check on dynamically loaded modules requires the building of
dnl something to load. This seems to be something that varies between
@@
-29,7
+34,7
@@
dnl "install" script for some weird reason.
host_os=`uname -s`
case $CC-$host_os in
host_os=`uname -s`
case $CC-$host_os in
- gcc-*linux* | gcc-*Linux* | gcc-*LINUX* | gcc-FreeBSD)
+ gcc-*linux* | gcc-*Linux* | gcc-*LINUX* | gcc-FreeBSD
| gcc-*SunOS* | cc-*SunOS*
)
LOADED=bin/loaded
LOADED_OPT="-shared -fPIC"
echo "Using gcc on $host_os: will compile dynamically loaded module"
LOADED=bin/loaded
LOADED_OPT="-shared -fPIC"
echo "Using gcc on $host_os: will compile dynamically loaded module"
@@
-55,15
+60,20
@@
AC_SEARCH_LIBS([connect], [socket])
AC_SEARCH_LIBS([inet_pton], [nsl socket resolv])
AC_SEARCH_LIBS([inet_ntop], [nsl socket resolv])
AC_SEARCH_LIBS([inet_pton], [nsl socket resolv])
AC_SEARCH_LIBS([inet_ntop], [nsl socket resolv])
+AC_CHECK_FUNCS_ONCE(getaddrinfo)
+
dnl "Export" these variables
AC_SUBST(BIND_8_COMPAT)
dnl "Export" these variables
AC_SUBST(BIND_8_COMPAT)
-AC_SUBST(CLIENT_SSL)
+AC_SUBST(CLIENT_
OPEN
SSL)
AC_SUBST(CLIENT_GNUTLS)
AC_SUBST(CLIENT_GNUTLS)
+AC_SUBST(CLIENT_ANYTLS)
+AC_SUBST(B64_GNUTLS)
AC_SUBST(LOADED)
AC_SUBST(LOADED_OPT)
AC_SUBST(LIBS)
dnl This must be last; it determines what files are written
AC_SUBST(LOADED)
AC_SUBST(LOADED_OPT)
AC_SUBST(LIBS)
dnl This must be last; it determines what files are written
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT