diff options
| -rw-r--r-- | test/Makefile.in | 10 | ||||
| -rw-r--r-- | test/README | 3 | ||||
| -rwxr-xr-x | test/configure | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 6d3bc5550..6a9603cf3 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -6,8 +6,9 @@ CC=@CC@ CFLAGS=@CFLAGS@ @CPPFLAGS@ @BIND_8_COMPAT@ @DEFS@ LDFLAGS=@LDFLAGS@ -CLIENT_SSL=@CLIENT_SSL@ +CLIENT_OPENSSL=@CLIENT_OPENSSL@ CLIENT_GNUTLS=@CLIENT_GNUTLS@ +CLIENT_ANYTLS=@CLIENT_ANYTLS@ LOADED=@LOADED@ LOADED_OPT=@LOADED_OPT@ LIBS=@LIBS@ @@ -16,9 +17,9 @@ SRC = @srcdir@/src ############################################################################## -BINARIES = bin/cf bin/client $(CLIENT_SSL) $(CLIENT_GNUTLS) \ +BINARIES = bin/cf bin/client $(CLIENT_OPENSSL) $(CLIENT_GNUTLS) $(CLIENT_ANYTLS) \ bin/checkaccess bin/fakens bin/fd bin/iefbr14 $(LOADED) \ - bin/mtpscript bin/server bin/showids bin/locate + bin/mtpscript bin/server bin/showids bin/locate \ # List of targets @@ -57,6 +58,9 @@ bin/client-gnutls: $(SRC)/client.c Makefile bin/client-ssl: $(SRC)/client.c Makefile $(CC) $(CFLAGS) -DHAVE_OPENSSL $(LDFLAGS) -o bin/client-ssl $(SRC)/client.c -lssl -lcrypto $(LIBS) +$(CLIENT_ANYTLS): $(CLIENT_GNUTLS) $(CLIENT_OPENSSL) + ln -sf `basename $<` $@ + bin/checkaccess:$(SRC)/checkaccess.c Makefile $(CC) $(CFLAGS) -DNO_TLS $(LDFLAGS) -o bin/checkaccess $(SRC)/checkaccess.c diff --git a/test/README b/test/README index 36cdd6984..d944b29ac 100644 --- a/test/README +++ b/test/README @@ -517,6 +517,9 @@ bin/client-ssl A script-driven SMTP client simulation with OpenSSL support. This is built only if OpenSSL support is detected on the host. +bin/client-anytls A symlink to either client-ssl or client-gnutls, if + any is built. + bin/fakens A fake "nameserver" for DNS tests (see below for details). bin/fd A program that outputs details of open file descriptors. diff --git a/test/configure b/test/configure index 57b714b4c..bfe636324 100755 --- a/test/configure +++ b/test/configure @@ -625,8 +625,9 @@ LIBOBJS LOADED_OPT LOADED B64_GNUTLS +CLIENT_ANYTLS CLIENT_GNUTLS -CLIENT_SSL +CLIENT_OPENSSL BIND_8_COMPAT EGREP GREP @@ -3295,7 +3296,8 @@ if test "x$ac_cv_header_openssl_crypto_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_OPENSSL_CRYPTO_H 1 _ACEOF - CLIENT_SSL=bin/client-ssl + CLIENT_OPENSSL=bin/client-ssl + CLIENT_ANYTLS=bin/client-anytls fi done @@ -3308,6 +3310,7 @@ if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : #define HAVE_GNUTLS_GNUTLS_H 1 _ACEOF CLIENT_GNUTLS=bin/client-gnutls + CLIENT_ANYTLS=bin/client-anytls fi done |