callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undef HAVE_SSL and HAVE_OPENSSL

Browse Source 
2001-05-04  Jeffrey Stedfast  <fejj@ximian.com>

	* acconfig.h: undef HAVE_SSL and HAVE_OPENSSL

	* configure.in: Check for OpenSSL.

svn path=/trunk/; revision=9698
This commit is contained in:
Jeffrey Stedfast
2001-05-07 20:35:07 +00:00
committed by Jeffrey Stedfast
parent 416d8fa6cd
commit d0c769d285
3 changed files with 77 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-05-04 Jeffrey Stedfast <fejj@ximian.com>
* acconfig.h: undef HAVE_SSL and HAVE_OPENSSL
* configure.in: Check for OpenSSL.
2001-05-05 Gediminas Paulauskas <menesis@delfi.lt>
* configure.in: upped required gtkhtml version to 0.9.3, even that is

2
acconfig.h
View File

@ -16,6 +16,8 @@
#undef NEED_KRB_SENDAUTH_PROTO
#undef HAVE_KRB5
#undef HAVE_NSS
#undef HAVE_SSL
#undef HAVE_OPENSSL
#undef MOVEMAIL_PATH
#undef USE_DOT
#undef USE_FCNTL

71
configure.in
View File

@ -597,7 +597,7 @@ else
AC_MSG_RESULT(no)
fi
AC_ARG_WITH(nss-libs, [ --with-nss-libs=PREFIX Location of Mozilla nss3 libs/includes.],
AC_ARG_WITH(nss-libs, [ --with-nss-libs=PREFIX Location of Mozilla nss3 libs.],
with_nss_libs="$withval")
msg_nss="no"
if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then
@ -634,6 +634,72 @@ dnl ====================================
dnl = End mozilla hacks
dnl ====================================
dnl ******************************
dnl OpenSSL
dnl ******************************
AC_ARG_WITH(openssl-includes, [ --with-openssl-includes=PREFIX Location of OpenSSL includes.],
with_openssl_includes="$withval", with_openssl_includes="/usr/include")
have_openssl_includes="no"
if test "x${with_openssl_includes}" != "xno"; then
CPPFLAGS_save="$CPPFLAGS"
AC_MSG_CHECKING(for OpenSSL includes)
AC_MSG_RESULT("")
CPPFLAGS="$CPPFLAGS -I$with_openssl_includes"
AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h, [ openssl_includes="yes" ])
CPPFLAGS="$CPPFLAGS_save"
if test "x{$openssl_includes}" != "xno" -a "x{$openssl_includes}" != "x"; then
have_openssl_includes="yes"
OPENSSL_CFLAGS="-I$with_openssl_includes"
else
OPENSSL_CFLAGS=""
fi
else
AC_MSG_CHECKING(for OpenSSL includes)
AC_MSG_RESULT(no)
fi
AC_ARG_WITH(openssl-libs, [ --with-openssl-libs=PREFIX Location of OpenSSL libs.],
with_openssl_libs="$withval")
msg_openssl="no"
if test "x${with_openssl_libs}" != "xno" -a "x${have_openssl_includes}" != "xno"; then
LDFLAGS_save="$LDFLAGS"
AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,
[
LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")
LDFLAGS="$LDFLAGS_save"
])
if test "x${openssl_libs}" != "xno"; then
AC_DEFINE(HAVE_OPENSSL)
msg_openssl="yes"
OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto"
else
OPENSSL_CFLAGS=""
OPENSSL_LDFLAGS=""
fi
else
AC_MSG_CHECKING(for OpenSSL libraries)
AC_MSG_RESULT(no)
fi
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LDFLAGS)
dnl ******************************
dnl See if we have SSL support
dnl ******************************
if test "x${msg_nss}" != "xno" -o "x${msg_openssl}" != "xno"; then
msg_ssl="yes"
AC_DEFINE(HAVE_SSL)
else
msg_ssl="no"
fi
dnl ******************************
dnl gtk-doc
@ -822,7 +888,8 @@ echo "
NNTP support: $msg_nntp
Pilot conduits: $msg_pilot
Kerberos 4/5: $msg_krb4/$msg_krb5
SSL support: $msg_nss
SSL support: $msg_ssl
S/MIME support: $msg_nss
Use movemail: $with_movemail
Dot Locking: $msg_dot
File Locking: $msg_file