[SVN] r461 - in /branches/cvsmerge/cyrus-cvs/cmulocal: CVS/Entries
openssl.m4
debian at incase.de
debian at incase.de
Wed May 17 19:04:36 UTC 2006
Author: sven
Date: Wed May 17 21:04:35 2006
New Revision: 461
URL: https://mail.incase.de/viewcvs?rev=461&root=cyrus22&view=rev
Log:
check if we need libRSAglue before linking it
Modified:
branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries
branches/cvsmerge/cyrus-cvs/cmulocal/openssl.m4
Modified: branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries?rev=461&root=cyrus22&r1=460&r2=461&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries Wed May 17 21:04:35 2006
@@ -33,7 +33,6 @@
/libpcap.m4/1.9/Thu Feb 9 23:49:52 2006//
/libssl.m4/1.10/Thu Feb 9 23:49:52 2006//
/libwrap.m4/1.10/Thu Feb 9 23:49:52 2006//
-/openssl.m4/1.10/Thu Feb 9 23:49:52 2006//
/sasl.m4/1.23/Thu Feb 9 23:49:52 2006//
/sasl2.m4/1.51/Thu Feb 9 23:49:53 2006//
/ucdsnmp.m4/1.11/Thu Feb 9 23:49:53 2006//
@@ -45,4 +44,5 @@
/librestrict.m4/1.6/Tue May 2 20:02:31 2006//
/openldap.m4/1.2/Tue May 2 20:02:31 2006//
/telnet.m4/1.13/Tue May 2 20:02:31 2006//
+/openssl.m4/1.11/Wed May 17 19:02:55 2006//
D
Modified: branches/cvsmerge/cyrus-cvs/cmulocal/openssl.m4
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/cmulocal/openssl.m4?rev=461&root=cyrus22&r1=460&r2=461&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/cmulocal/openssl.m4 (original)
+++ branches/cvsmerge/cyrus-cvs/cmulocal/openssl.m4 Wed May 17 21:04:35 2006
@@ -1,6 +1,6 @@
dnl
dnl macros for configure.in to detect openssl
-dnl $Id: openssl.m4,v 1.10 2005/04/26 19:14:08 shadow Exp $
+dnl $Id: openssl.m4,v 1.11 2006/05/17 18:30:19 murch Exp $
dnl
AC_DEFUN([CMU_HAVE_OPENSSL], [
@@ -24,8 +24,11 @@
dnl we need to include the rsaref libraries in the crypto check
LIB_RSAREF=""
AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
- LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes,
- cmu_have_rsaref=no)
+ cmu_have_rsaref=yes;
+ [AC_CHECK_LIB(RSAglue, RSAPublicEncrypt,
+ LIB_RSAREF="-lRSAglue -lrsaref",
+ LIB_RSAREF="-lrsaref")],
+ cmu_have_rsaref=no)
AC_CHECK_HEADER(openssl/evp.h, [
AC_CHECK_LIB(crypto, EVP_DigestInit,
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list