build openssl

3 files changed, 1 insertions, 107 deletions

diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
index e18130c..7209e14 100644
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
@@ -52,7 +52,7 @@ PKG_CFLAGS	= @PKG_CFLAGS@
 DEFS		= @DEFS@ $(PKG_CFLAGS)
 
 CPPFLAGS	= @CPPFLAGS@
-LIBS		= @PKG_LIBS@ @LIBS@ @SSLLIBS@
+LIBS		= @PKG_LIBS@ @LIBS@
 CFLAGS		= @CFLAGS@
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
diff --git a/ds9/unix/configure b/ds9/unix/configure
index 2e058d1..99b2cd0 100755
--- a/ds9/unix/configure
+++ b/ds9/unix/configure
@@ -649,7 +649,6 @@ XMKMF
 TK_INCLUDES
 TCL_INCLUDES
 system
-SSLLIBS
 EGREP
 GREP
 RANLIB
@@ -8331,13 +8330,6 @@ fi
 fi
 
 
-#TEA_PATH_CONFIG(pngtcl)
-#TEA_LOAD_CONFIG(pngtcl)
-#TEA_PATH_CONFIG(tkimgpng)
-#TEA_LOAD_CONFIG(tkimgpng)
-#TEA_PATH_CONFIG(tkimggif)
-#TEA_LOAD_CONFIG(tkimggif)
-
 #-----------------------------------------------------------------------
 # Handle the --prefix=... option by defaulting to what Tcl gave.
 # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
@@ -9791,101 +9783,8 @@ case $system in
     Darwin*)
 	$as_echo "#define ZIPFILE 1" >>confdefs.h
 
-
-	SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a"
-
 	;;
     *)
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto" >&5
-$as_echo_n "checking for CRYPTO_new_ex_data in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char CRYPTO_new_ex_data ();
-int
-main ()
-{
-return CRYPTO_new_ex_data ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_crypto_CRYPTO_new_ex_data=yes
-else
-  ac_cv_lib_crypto_CRYPTO_new_ex_data=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_new_ex_data" >&5
-$as_echo "$ac_cv_lib_crypto_CRYPTO_new_ex_data" >&6; }
-if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPTO 1
-_ACEOF
-
-  LIBS="-lcrypto $LIBS"
-
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLSv1_1_method in -lssl" >&5
-$as_echo_n "checking for TLSv1_1_method in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_TLSv1_1_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char TLSv1_1_method ();
-int
-main ()
-{
-return TLSv1_1_method ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_TLSv1_1_method=yes
-else
-  ac_cv_lib_ssl_TLSv1_1_method=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_TLSv1_1_method" >&5
-$as_echo "$ac_cv_lib_ssl_TLSv1_1_method" >&6; }
-if test "x$ac_cv_lib_ssl_TLSv1_1_method" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSSL 1
-_ACEOF
-
-  LIBS="-lssl $LIBS"
-
-fi
-
 	;;
 esac
 
diff --git a/ds9/unix/configure.ac b/ds9/unix/configure.ac
index 5b7fb0a..01b25ac 100644
--- a/ds9/unix/configure.ac
+++ b/ds9/unix/configure.ac
@@ -141,13 +141,8 @@ TEA_CONFIG_SYSTEM
 case $system in
     Darwin*)
 	AC_DEFINE([ZIPFILE])
-
-	SSLLIBS="/opt/local/lib/libssl.a /opt/local/lib/libcrypto.a"
-	AC_SUBST(SSLLIBS)
 	;;
     *)
-	AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data])
-	AC_CHECK_LIB([ssl],[TLSv1_1_method])
 	;;
 esac