From 1b0bc5b6e2e3c27511683b3814c55752fa61e2ca Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 Mar 2020 20:31:36 +0000 Subject: [PATCH] Config.mak for BSD make FossilOrigin-Name: e33ac54dbbef3a73e80a81880751ad093270f70f2bd20239e17a151e07dd7a0b --- src/Config.mak | 10 +++++++++- src/ac/Makefile | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Config.mak b/src/Config.mak index 4378ba2a..c00f2fc5 100644 --- a/src/Config.mak +++ b/src/Config.mak @@ -1,8 +1,16 @@ # # OpenSSL definitions # + + OPENSSL_VERSION=openssl-1.0.1i -USE_CONTRIB_OPENSSL=1 +OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl +OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/ + +#OPENSSL_CFLAGS= +#OPENSSL_LIBS=-lssl -lcrypto #-ldl + + # GnuTLS definitions # GNUTLS_VERSION=3.3.9 diff --git a/src/ac/Makefile b/src/ac/Makefile index f0197545..e7991c4e 100644 --- a/src/ac/Makefile +++ b/src/ac/Makefile @@ -1,3 +1,4 @@ +include ../Config.mak OBJS = \ wtplist.o wtpman.o conf.o ac_main.o \ @@ -20,6 +21,8 @@ LIBS+=-lpthread LIBS+=-lconfuse LIBS+=-lsqlite3 LIBS+=-lc +LIBS+=$(OPENSSL_LIBS) + INCL_DIRS=-I../ -I/usr/local/include -I./ #FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"