View | Details | Raw Unified | Return to bug 7361
Collapse All | Expand All

(-)spamassassin-3.4.1/spamc/configure (-11 / +11 lines)
Lines 3666-3674 fi Link Here
3666
SSLLIBS=""
3666
SSLLIBS=""
3667
SSLCFLAGS=""
3667
SSLCFLAGS=""
3668
if test yes = "$sa_ssl_enabled"; then
3668
if test yes = "$sa_ssl_enabled"; then
3669
	echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5
3669
	echo "$as_me:$LINENO: checking for CRYPTO_zalloc in -lcrypto" >&5
3670
echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6
3670
echo $ECHO_N "checking for CRYPTO_zalloc in -lcrypto... $ECHO_C" >&6
3671
if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then
3671
if test "${ac_cv_lib_crypto_CRYPTO_zalloc+set}" = set; then
3672
  echo $ECHO_N "(cached) $ECHO_C" >&6
3672
  echo $ECHO_N "(cached) $ECHO_C" >&6
3673
else
3673
else
3674
  ac_check_lib_save_LIBS=$LIBS
3674
  ac_check_lib_save_LIBS=$LIBS
Lines 3686-3696 extern "C" Link Here
3686
#endif
3686
#endif
3687
/* We use char because int might match the return type of a gcc2
3687
/* We use char because int might match the return type of a gcc2
3688
   builtin and then its argument prototype would still apply.  */
3688
   builtin and then its argument prototype would still apply.  */
3689
char CRYPTO_lock ();
3689
char CRYPTO_zalloc ();
3690
int
3690
int
3691
main ()
3691
main ()
3692
{
3692
{
3693
CRYPTO_lock ();
3693
CRYPTO_zalloc ();
3694
  ;
3694
  ;
3695
  return 0;
3695
  return 0;
3696
}
3696
}
Lines 3716-3735 if { (eval echo "$as_me:$LINENO: \"$ac_l Link Here
3716
  ac_status=$?
3716
  ac_status=$?
3717
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3717
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3718
  (exit $ac_status); }; }; then
3718
  (exit $ac_status); }; }; then
3719
  ac_cv_lib_crypto_CRYPTO_lock=yes
3719
  ac_cv_lib_crypto_CRYPTO_zalloc=yes
3720
else
3720
else
3721
  echo "$as_me: failed program was:" >&5
3721
  echo "$as_me: failed program was:" >&5
3722
sed 's/^/| /' conftest.$ac_ext >&5
3722
sed 's/^/| /' conftest.$ac_ext >&5
3723
3723
3724
ac_cv_lib_crypto_CRYPTO_lock=no
3724
ac_cv_lib_crypto_CRYPTO_zalloc=no
3725
fi
3725
fi
3726
rm -f conftest.err conftest.$ac_objext \
3726
rm -f conftest.err conftest.$ac_objext \
3727
      conftest$ac_exeext conftest.$ac_ext
3727
      conftest$ac_exeext conftest.$ac_ext
3728
LIBS=$ac_check_lib_save_LIBS
3728
LIBS=$ac_check_lib_save_LIBS
3729
fi
3729
fi
3730
echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5
3730
echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_zalloc" >&5
3731
echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6
3731
echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_zalloc" >&6
3732
if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
3732
if test $ac_cv_lib_crypto_CRYPTO_zalloc = yes; then
3733
  SSLLIBS="-lcrypto $SSLLIBS"
3733
  SSLLIBS="-lcrypto $SSLLIBS"
3734
fi
3734
fi
3735
3735
Lines 3804-3810 fi Link Here
3804
	# before defining SPAMC_SSL check that all its requirements are
3804
	# before defining SPAMC_SSL check that all its requirements are
3805
	# actually available
3805
	# actually available
3806
	if test yes = "$ac_cv_header_openssl_crypto_h" && \
3806
	if test yes = "$ac_cv_header_openssl_crypto_h" && \
3807
	   test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
3807
	   test yes = "$ac_cv_lib_crypto_CRYPTO_zalloc" && \
3808
	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
3808
	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
3809
		SSLCFLAGS="-DSPAMC_SSL"
3809
		SSLCFLAGS="-DSPAMC_SSL"
3810
	else
3810
	else
(-)spamassassin-3.4.1/spamc/configure.in (-1 / +1 lines)
Lines 64-70 AC_CHECK_LIB(socket, socket) Link Here
64
SSLLIBS=""
64
SSLLIBS=""
65
SSLCFLAGS=""
65
SSLCFLAGS=""
66
if test yes = "$sa_ssl_enabled"; then
66
if test yes = "$sa_ssl_enabled"; then
67
	AC_CHECK_LIB(crypto, CRYPTO_lock,[SSLLIBS="-lcrypto $SSLLIBS"])
67
	AC_CHECK_LIB(crypto, CRYPTO_zalloc,[SSLLIBS="-lcrypto $SSLLIBS"])
68
	AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto)
68
	AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto)
69
69
70
	# before defining SPAMC_SSL check that all its requirements are
70
	# before defining SPAMC_SSL check that all its requirements are

Return to bug 7361