diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-05-15 15:36:23 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-05-15 15:36:23 (GMT) |
| commit | e1c7c90d500b4bf0dc3cc0194f8b399615e45d24 (patch) | |
| tree | 7b974c01bdbf188f16da655acf65fb2ddd3f5a5f /unix | |
| parent | 8ed880a6449c857e80f68894f4d71068acea1048 (diff) | |
| download | blt-e1c7c90d500b4bf0dc3cc0194f8b399615e45d24.zip blt-e1c7c90d500b4bf0dc3cc0194f8b399615e45d24.tar.gz blt-e1c7c90d500b4bf0dc3cc0194f8b399615e45d24.tar.bz2 | |
use private openssl
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 3 | ||||
| -rwxr-xr-x | unix/configure | 17 | ||||
| -rwxr-xr-x | unix/configure.ac | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index b8e234f..ae5d66d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -13,9 +13,10 @@ OS = @OS@ ARCH = @ARCH@ TKFLAGS = @TKFLAGS@ SSLCONFIG = @SSLCONFIG@ -TLSFLAGS = @TLSFLAGS@ JOBS = @CORES@ +TLSFLAGS = --with-ssl-dir=$(prefix)/openssl + include ./make.include WITHTCL = --with-tcl=$(prefix)/tcl$(TCL_VERSION)/unix diff --git a/unix/configure b/unix/configure index 83ca5e6..2067ebf 100755 --- a/unix/configure +++ b/unix/configure @@ -585,7 +585,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS CORES SSLCONFIG -TLSFLAGS TKFLAGS ARCH OS @@ -625,6 +624,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -690,6 +690,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -942,6 +943,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1079,7 +1089,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1232,6 +1242,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1941,8 +1952,6 @@ case $system in Darwin* ) TKFLAGS="--disable-corefoundation" - TLSFLAGS="--with-ssl-dir=../openssl" - SSLCONFIG="./Configure darwin64-x86_64-cc" CORES=`sysctl -n "hw.ncpu"` diff --git a/unix/configure.ac b/unix/configure.ac index 9e89527..d7f00b2 100755 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -50,8 +50,6 @@ case $system in Darwin* ) TKFLAGS="--disable-corefoundation" AC_SUBST(TKFLAGS) - TLSFLAGS="--with-ssl-dir=../openssl" - AC_SUBST(TLSFLAGS) SSLCONFIG="./Configure darwin64-x86_64-cc" CORES=`sysctl -n "hw.ncpu"` |