diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-10-15 17:55:37 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-10-15 17:55:37 (GMT) |
| commit | 8224eb8e3ac055a37678ac8b5e2163bfaacbaca1 (patch) | |
| tree | 15595c8181c35f09be7b436b452af7d9dcb31ba4 /ds9 | |
| parent | 987984e766b6eed5af735813466ac24627aafc4c (diff) | |
| download | blt-8224eb8e3ac055a37678ac8b5e2163bfaacbaca1.zip blt-8224eb8e3ac055a37678ac8b5e2163bfaacbaca1.tar.gz blt-8224eb8e3ac055a37678ac8b5e2163bfaacbaca1.tar.bz2 | |
fix macos openssl build
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/macos/Makefile.in | 3 | ||||
| -rwxr-xr-x | ds9/macos/configure | 5 | ||||
| -rw-r--r-- | ds9/macos/configure.ac | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ds9/macos/Makefile.in b/ds9/macos/Makefile.in index 518db12..082eed9 100644 --- a/ds9/macos/Makefile.in +++ b/ds9/macos/Makefile.in @@ -52,7 +52,8 @@ PKG_CFLAGS = @PKG_CFLAGS@ DEFS = @DEFS@ $(PKG_CFLAGS) CPPFLAGS = @CPPFLAGS@ -LIBS = @PKG_LIBS@ @LIBS@ @SSLLIBS@ +#LIBS = @PKG_LIBS@ @LIBS@ @SSLLIBS@ +LIBS = @PKG_LIBS@ @LIBS@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) diff --git a/ds9/macos/configure b/ds9/macos/configure index 2e0c7a3..22abb73 100755 --- a/ds9/macos/configure +++ b/ds9/macos/configure @@ -648,7 +648,6 @@ TCL_THREADS XMKMF TK_INCLUDES TCL_INCLUDES -SSLLIBS EGREP GREP RANLIB @@ -9751,8 +9750,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h #TEA_ADD_STUB_SOURCES([]) #TEA_ADD_TCL_SOURCES([]) -SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a" - +#SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a" +#AC_SUBST(SSLLIBS) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlInitParser in -lxml2" >&5 $as_echo_n "checking for xmlInitParser in -lxml2... " >&6; } if ${ac_cv_lib_xml2_xmlInitParser+:} false; then : diff --git a/ds9/macos/configure.ac b/ds9/macos/configure.ac index f011c18..fe156bd 100644 --- a/ds9/macos/configure.ac +++ b/ds9/macos/configure.ac @@ -137,8 +137,8 @@ TEA_ADD_LIBS([-lstdc++]) #TEA_ADD_STUB_SOURCES([]) #TEA_ADD_TCL_SOURCES([]) -SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a" -AC_SUBST(SSLLIBS) +#SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a" +#AC_SUBST(SSLLIBS) AC_CHECK_LIB([xml2],[xmlInitParser]) #-------------------------------------------------------------------- |