X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/286b9d5fa4344de72fe6575fa089237fd7dbb56f..7b162fc84e202a16b89fa11224737ffbdd240bc8:/test/Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index 26631f398..f7a2a4695 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -4,11 +4,11 @@
 # These variables are set by the configure script.
 
 CC=@CC@
-CFLAGS=@CFLAGS@ @BIND_8_COMPAT@ @DEFS@
+CFLAGS=@CFLAGS@ @CPPFLAGS@ @BIND_8_COMPAT@ @DEFS@
 LDFLAGS=@LDFLAGS@
-CLIENT_SSL=@CLIENT_SSL@
+CLIENT_OPENSSL=@CLIENT_OPENSSL@
 CLIENT_GNUTLS=@CLIENT_GNUTLS@
-B64_GNUTLS=@B64_GNUTLS@
+CLIENT_ANYTLS=@CLIENT_ANYTLS@
 LOADED=@LOADED@
 LOADED_OPT=@LOADED_OPT@
 LIBS=@LIBS@
@@ -17,10 +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 \
-		$(B64_GNUTLS)
 
 # List of targets
 
@@ -29,7 +28,8 @@ all:            binaries sysbinaries
 binaries:	$(BINARIES)
 
 sysbinaries:	FORCE binaries
-		bin/locate initdb postgres pg_ctl mysqld
+		rm -f bin.sys/*
+		bin/locate initdb postgres pg_ctl psql mysqld mysql
 		ls -la bin.sys
 
 # Compile and link the programs:
@@ -59,6 +59,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)
+		[ -n "$(CLIENT_GNUTLS)" ] && ln -sf `basename $(CLIENT_GNUTLS)` $@ || ln -sf `basename $(CLIENT_OPENSSL)` $@
+
 bin/checkaccess:$(SRC)/checkaccess.c Makefile
 		$(CC) $(CFLAGS) -DNO_TLS $(LDFLAGS) -o bin/checkaccess $(SRC)/checkaccess.c
 
@@ -87,10 +90,6 @@ bin/locate:     $(SRC)/locate.sh Makefile
 		cp $(SRC)/locate.pl bin/locate
 		chmod 0755 bin/locate
 
-bin/ed25519_privkey_pem_to_pubkey_raw_b64:     $(SRC)/ed25519_privkey_pem_to_pubkey_raw_b64.c Makefile
-		$(CC) $(CFLAGS) -DHAVE_GNUTLS $(LDFLAGS) -o bin/ed25519_privkey_pem_to_pubkey_raw_b64 \
-			$(SRC)/ed25519_privkey_pem_to_pubkey_raw_b64.c  -lgnutls -lgcrypt $(LIBS)
-
 clean:;         rm -rf $(BINARIES) bin.sys
 
 FORCE: