summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2019-05-14 20:21:56 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2019-05-14 20:21:56 (GMT)
commit5deb902f86ab0302ddbb47b66b24b588ce5d8f11 (patch)
tree5581bd7d1140d08047c184145d12994747327eda
parent3bcf2e088e8cf8a908662af8e3f2611b259517d2 (diff)
downloadblt-5deb902f86ab0302ddbb47b66b24b588ce5d8f11.zip
blt-5deb902f86ab0302ddbb47b66b24b588ce5d8f11.tar.gz
blt-5deb902f86ab0302ddbb47b66b24b588ce5d8f11.tar.bz2
build openssl
-rw-r--r--unix/Makefile.in5
-rwxr-xr-xunix/configure.ac2
2 files changed, 4 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 94b68b1..5e1232b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -12,11 +12,10 @@ mandir = @mandir@
OS = @OS@
ARCH = @ARCH@
TKFLAGS = @TKFLAGS@
+SSLTARGET = @SSLTARGET@
TLSFLAGS = @TLSFLAGS@
JOBS = @CORES@
-TLSFLAGS ="CFLAGS=-DNO_IDEA=1 -DNO_RC5=1" --with-ssl-dir=$(prefix)/openssl
-
include ./make.include
WITHTCL = --with-tcl=$(prefix)/tcl$(TCL_VERSION)/unix
@@ -109,7 +108,7 @@ openssl/Makefile:
@echo ""
@echo "*** $@ ***"
cd openssl; \
- ./config --prefix=$(prefix)
+ ./config $(SSLTARGET) --prefix=$(prefix)
#--------------------------clean
diff --git a/unix/configure.ac b/unix/configure.ac
index 0f205bc..9cccd5a 100755
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -52,6 +52,8 @@ case $system in
AC_SUBST(TKFLAGS)
TLSFLAGS="--with-ssl-dir=/opt/local"
AC_SUBST(TLSFLAGS)
+ SSLTARGET=darwin64-x86_64-cc
+ AC_SUBST(SSLTARGET)
CORES=`sysctl -n "hw.ncpu"`
;;