Testsuite: build a generic tls enabled client: client-anytls

diff --git a/test/Makefile.in b/test/Makefile.in
index 6d3bc55502d1bf660ee209eeee17660ba00e799e..6a9603cf3740111303719e04e6b6028620a12cbd 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -6,8 +6,9 @@
 CC=@CC@
 CFLAGS=@CFLAGS@ @CPPFLAGS@ @BIND_8_COMPAT@ @DEFS@
 LDFLAGS=@LDFLAGS@
 CC=@CC@
 CFLAGS=@CFLAGS@ @CPPFLAGS@ @BIND_8_COMPAT@ @DEFS@
 LDFLAGS=@LDFLAGS@

-CLIENT_SSL=@CLIENT_SSL@
+CLIENT_OPENSSL=@CLIENT_OPENSSL@

 CLIENT_GNUTLS=@CLIENT_GNUTLS@
 CLIENT_GNUTLS=@CLIENT_GNUTLS@

+CLIENT_ANYTLS=@CLIENT_ANYTLS@

 LOADED=@LOADED@
 LOADED_OPT=@LOADED_OPT@
 LIBS=@LIBS@
 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/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
 
 
 # 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)
 
 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
 
 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 36cdd6984eccd70525aafce3bd196492b4b14051..d944b29ac8ec792b96908499f8b84f2275228c66 100644 (file)
--- 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.
 
                    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.
 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 57b714b4c1d99c2a1415e6a8f07561bb29ed743b..bfe6363249b733c0de93c3ed8aa771462fc87f92 100755 (executable)
--- a/test/configure
+++ b/test/configure
@@ -625,8 +625,9 @@ LIBOBJS
 LOADED_OPT
 LOADED
 B64_GNUTLS
 LOADED_OPT
 LOADED
 B64_GNUTLS

+CLIENT_ANYTLS

 CLIENT_GNUTLS
 CLIENT_GNUTLS

-CLIENT_SSL
+CLIENT_OPENSSL

 BIND_8_COMPAT
 EGREP
 GREP
 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
   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
 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
 #define HAVE_GNUTLS_GNUTLS_H 1
 _ACEOF
  CLIENT_GNUTLS=bin/client-gnutls

+ CLIENT_ANYTLS=bin/client-anytls

 fi
 
 done
 fi
 
 done