LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index dbf6d809c3519ab079b4bd7a5c242d370a6b84ca..f7a2a4695b68df277dd446a5c9badba5ba5a2a22 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -4,10 +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@
+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/mtpscript bin/server bin/showids bin/locate \
 
 # List of targets
 
@@ -26,8 +27,9 @@ all:            binaries sysbinaries
 
 binaries:      $(BINARIES)
 
-sysbinaries:   FRC
-               bin/locate.sh initdb postgres pg_ctl mysqld
+sysbinaries:   FORCE binaries
+               rm -f bin.sys/*
+               bin/locate initdb postgres pg_ctl psql mysqld mysql
                ls -la bin.sys
 
 # Compile and link the programs:
@@ -57,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
 
@@ -81,8 +86,12 @@ bin/server:     $(SRC)/server.c Makefile
 bin/showids:    $(SRC)/showids.c Makefile
                $(CC) $(CFLAGS) $(LDFLAGS) -o bin/showids $(SRC)/showids.c
 
+bin/locate:     $(SRC)/locate.sh Makefile
+               cp $(SRC)/locate.pl bin/locate
+               chmod 0755 bin/locate
+
 clean:;         rm -rf $(BINARIES) bin.sys
 
-FRC:
+FORCE:
 
 # End