ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/configure.ac
(Generate patch)

Comparing ircd-hybrid-8/configure.ac (file contents):
Revision 1302 by michael, Wed Mar 21 17:48:54 2012 UTC vs.
Revision 1304 by michael, Fri Mar 23 12:03:56 2012 UTC

# Line 133 | Line 133 | if test "$cf_enable_openssl" != "no"; th
133    dnl If we have a basedir defined, then everything is okay.  Otherwise,
134    dnl we have a problem.
135    if test ! -z "$cf_openssl_basedir"; then
136    LIBS="-lcrypto -lssl $LIBS"
136      AC_MSG_RESULT([$cf_openssl_basedir])
137      cf_enable_openssl="yes"
139    AC_DEFINE(HAVE_LIBCRYPTO, 1, [If we support ssl])
138    else
139      AC_MSG_RESULT([not found. Please check your path.])
140      cf_enable_openssl="no"
# Line 148 | Line 146 | else
146   fi
147  
148   AS_IF([test "$cf_enable_openssl" != "no"],
149 < [AC_MSG_CHECKING(for OpenSSL 0.9.7 or above)
149 > [AC_MSG_CHECKING(for OpenSSL 0.9.8 or above)
150    AC_RUN_IFELSE([
151      AC_LANG_PROGRAM([
152      #include <openssl/opensslv.h>
153      #include <stdlib.h>],
154 <    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00907000)); ]])],
154 >    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000)); ]])],
155    [cf_openssl_version_ok=yes],
156    [cf_openssl_version_ok=no],
157    [cf_openssl_version_ok=no])
# Line 161 | Line 159 | AS_IF([test "$cf_enable_openssl" != "no"
159    AS_IF([test "$cf_openssl_version_ok" = "yes"],
160      [AC_MSG_RESULT(found)
161  
162 <    AC_CHECK_LIB(crypto, RSA_free)
163 <    AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
164 <      [AC_CHECK_FUNCS(EVP_bf_cfb           \
167 <                      EVP_cast5_cfb        \
168 <                      EVP_idea_cfb         \
169 <                      EVP_rc5_32_12_16_cfb \
170 <                      EVP_des_ede3_cfb     \
171 <                      EVP_des_cfb)])
162 >    AC_CHECK_LIB(ssl, SSL_connect)
163 >    AS_IF([test "$ac_cv_lib_ssl_SSL_connect" = "yes"],
164 >      [AC_CHECK_LIB(crypto, RSA_free)])
165      ],[AC_MSG_RESULT(no - OpenSSL support disabled)
166      cf_enable_openssl="no"])])
167  
168 < AM_CONDITIONAL(ENABLE_SSL, [test "$cf_enable_openssl" = yes])
168 > AM_CONDITIONAL(ENABLE_SSL, [test "$ac_cv_lib_crypto_RSA_free" = yes])
169  
170  
171   AC_ARG_ENABLE(assert, AS_HELP_STRING([--enable-assert],

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines