add tls

6 files changed, 45 insertions, 8 deletions

diff --git a/macosx/Makefile.in b/macosx/Makefile.in
index f06063a..10a0c61 100644
--- a/macosx/Makefile.in
+++ b/macosx/Makefile.in
@@ -13,6 +13,8 @@ OS		= @OS@
 ARCH		= @ARCH@
 JOBS		= @CORES@
 
+TLSFLAGS	= "--with-ssl-dir=/opt/local"
+
 include ./make.include
 
 WITHTCL		= --with-tcl=$(prefix)/build/tcl/Development
@@ -41,7 +43,7 @@ TKFILES = \
 
 saods9	: dirs tcl tk \
 	tclcheckdns tcliis tclsignal \
-	tclzvfs tclxml xpa \
+	tclzvfs tls tclxml xpa \
 	tkblt tktable tkimg \
 	tkmpeg tkhtml1 tkcon \
 	tkmacosx \
diff --git a/make.include b/make.include
index de009c2..5677b54 100644
--- a/make.include
+++ b/make.include
@@ -6,6 +6,7 @@
 # tclsignal 1.4.1
 # tclxml 3.2
 # tclzvfs 1.0.1
+# tls 1.6.7
 # tkblt 3.2.4
 # tkcon 2.7
 # tkhtml1 1.0.4
@@ -51,7 +52,7 @@ TKIMGTMPFILES = \
 #-------------------------- main
 
 .NOTPARALLEL :
-.PHONY	: all dirs ds9 tclcheckdns tcliis tclsignal tclxml tclzvfs xpa
+.PHONY	: all dirs ds9 tclcheckdns tcliis tclsignal tclxml tclzvfs tls xpa
 .PHONY	: tkblt tkcon tkhtml1 tkimg tkmpeg tksao tktable
 .PHONY	: ast funtools
 
@@ -172,6 +173,24 @@ tclzvfs/Makefile :
 	$(STD) \
 	$(CACHE)
 
+#-------------------------- tls
+
+tls	: tls/Makefile
+	@echo ""
+	@echo "*** $@ ***"
+	$(MAKE) -C tls install
+
+tls/Makefile :
+	@echo ""
+	@echo "*** $@ ***"
+	cd tls; \
+	./configure \
+	$(WITHTCL) \
+	$(TLSFLAGS) \
+	$(PREFIX) \
+	$(STD) \
+	$(CACHE)
+
 #-------------------------- xpa
 
 # no config.cache
@@ -433,13 +452,13 @@ scrub :
 .PHONY	: clean
 .PHONY	: dirsclean ds9clean localclean
 .PHONY	: tclclean tclcheckdnsclean tcliisclean tclsignalclean 
-.PHONY	: tclxmlclean tclzvfsclean
+.PHONY	: tclxmlclean tclzvfsclean tlsclean
 .PHONY	: tkclean tkbltclean tkconclean tkhtml1clean tkimgclean
 .PHONY	: tkmpegclean tksaoclean astclean funtoolsclean tktableclean xpaclean
 
 clean	: tclclean tkclean \
 	tclcheckdnsclean tcliisclean tclsignalclean \
-	tclzvfsclean tclxmlclean xpaclean \
+	tclzvfsclean tlsclean tclxmlclean xpaclean \
 	tkbltclean tkconclean tktableclean tkimgclean \
 	tkmpegclean tkhtml1clean \
 	tksaoclean astclean funtoolsclean ds9clean \
@@ -490,6 +509,11 @@ tclzvfsclean:
 	@echo "*** $@ ***"
 	$(MAKE) -C tclzvfs clean
 
+tlsclean:
+	@echo ""
+	@echo "*** $@ ***"
+	$(MAKE) -C tls clean
+
 tkclean :
 	@echo ""
 	@echo "*** $@ ***"
@@ -549,7 +573,7 @@ xpaclean :
 
 .PHONY	: dirsdistclean ds9distclean localdistclean
 .PHONY	: tcldistclean tclcheckdnsdistclean tcliisdistclean tclsignaldistclean 
-.PHONY	: tclxmldistclean tclzvfsdistclean
+.PHONY	: tclxmldistclean tclzvfsdistclean tlsdistclean
 .PHONY	: tkdistclean tkbltdistclean tkcondistclean tkhtml1distclean 
 .PHONY	: tkimgdistclean tkmpegdistclean 
 .PHONY	: tksaodistclean astdistclean funtoolsdistclean
@@ -557,7 +581,7 @@ xpaclean :
 
 distclean : tcldistclean tkdistclean \
 	tclcheckdnsdistclean tcliisdistclean tclsignaldistclean \
-	tclzvfsdistclean tclxmldistclean xpadistclean \
+	tclzvfsdistclean tlsdistclean tclxmldistclean xpadistclean \
 	tkbltdistclean tktabledistclean tkcondistclean tkimgdistclean \
 	tkmpegdistclean tkhtml1distclean \
 	tksaodistclean astdistclean funtoolsdistclean ds9distclean \
@@ -609,6 +633,11 @@ tclzvfsdistclean:
 	@echo "*** $@ ***"
 	$(MAKE) -C tclzvfs distclean
 
+tlsdistclean:
+	@echo ""
+	@echo "*** $@ ***"
+	$(MAKE) -C tls distclean
+
 tkdistclean :
 	@echo ""
 	@echo "*** $@ ***"
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 1464ef0..749e592 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -12,6 +12,7 @@ mandir		= @mandir@
 OS		= @OS@
 ARCH		= @ARCH@
 TKFLAGS		= @TKFLAGS@
+TLSFLAGS	= @TLSFLAGS@
 JOBS		= @CORES@
 
 include ./make.include
@@ -26,7 +27,7 @@ CACHE		= --config-cache --cache-file=$(prefix)/config.cache
 
 saods9	: dirs tcl tk \
 	tclcheckdns tcliis tclsignal \
-	tclzvfs tclxml xpa \
+	tclzvfs tls tclxml xpa \
 	tkblt tktable tkimg \
 	tkmpeg tkhtml1 tkcon \
 	tksao ds9
diff --git a/unix/configure b/unix/configure
index f341653..1a89e2d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -584,6 +584,7 @@ PACKAGE_URL=''
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 CORES
+TLSFLAGS
 TKFLAGS
 ARCH
 OS
@@ -1895,6 +1896,8 @@ case $system in
     Darwin* )
 	TKFLAGS="--disable-corefoundation"
 
+	TLSFLAGS="--with-ssl-dir=/opt/local"
+
 
 	CORES=`sysctl -n "hw.ncpu"`
 	;;
diff --git a/unix/configure.ac b/unix/configure.ac
index cded3d7..b16de8d 100755
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -50,6 +50,8 @@ case $system in
     Darwin* )
 	TKFLAGS="--disable-corefoundation"
 	AC_SUBST(TKFLAGS)
+	TLSFLAGS="--with-ssl-dir=/opt/local"
+	AC_SUBST(TLSFLAGS)
 
 	CORES=`sysctl -n "hw.ncpu"`
 	;;
diff --git a/win/Makefile.in b/win/Makefile.in
index 61c70e0..e2c9981 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -36,7 +36,7 @@ DS9APP	=SAOImage\ DS9\ $(DS9_VERSION)
 
 saods9	: dirs tcl tk \
 	libxml2 libxslt zlib \
-	tcliis tclxml xpa \
+	tcliis tclxml tls xpa \
 	tkblt tktable tkimg \
 	tkmpeg tkhtml1 tkcon \
 	tkwin \