cherokee at cherokee-project
Jul 3, 2009, 1:05 AM
Post #1 of 1
(82 views)
Permalink
|
|
[3418] cherokee/trunk: Adds a new --with-libssl parameter so the server can be compiled with
|
|
Revision: 3418
http://svn.cherokee-project.com/changeset/3418
Author: alo
Date: 2009-07-03 10:06:15 +0200 (Fri, 03 Jul 2009)
Log Message:
-----------
Adds a new --with-libssl parameter so the server can be compiled with
a custom libssl/OpenSSL library located in a non-standard directory.
The most common case would be: --with-libssl=/usr/local/ssl
Modified Paths:
--------------
cherokee/trunk/cherokee/Makefile.am
cherokee/trunk/configure.in
Modified: cherokee/trunk/cherokee/Makefile.am
===================================================================
--- cherokee/trunk/cherokee/Makefile.am 2009-07-02 14:54:50 UTC (rev 3417)
+++ cherokee/trunk/cherokee/Makefile.am 2009-07-03 08:06:15 UTC (rev 3418)
@@ -1065,15 +1065,15 @@
cryptor_libssl_dh_2048.c \
cryptor_libssl_dh_4096.c
-libplugin_libssl_la_LDFLAGS = $(module_ldflags) $(TLS_LIBS)
+libplugin_libssl_la_LDFLAGS = $(module_ldflags) $(LIBSSL_LIBS)
libplugin_libssl_la_SOURCES = $(cryptor_libssl)
-libplugin_libssl_la_CFLAGS = $(TLS_CFLAGS)
+libplugin_libssl_la_CFLAGS = $(LIBSSL_CFLAGS)
if USE_OPENSSL
if STATIC_CRYPTOR_LIBSSL
static_cryptor_libssl_src = $(cryptor_libssl)
-static_cryptor_libssl_lib = $(TLS_LIBS)
-static_cryptor_libssl_flags = $(TLS_CFLAGS)
+static_cryptor_libssl_lib = $(LIBSSL_LIBS)
+static_cryptor_libssl_flags = $(LIBSSL_CFLAGS)
else
dynamic_cryptor_libssl_lib = libplugin_libssl.la
endif
Modified: cherokee/trunk/configure.in
===================================================================
--- cherokee/trunk/configure.in 2009-07-02 14:54:50 UTC (rev 3417)
+++ cherokee/trunk/configure.in 2009-07-03 08:06:15 UTC (rev 3418)
@@ -1050,16 +1050,33 @@
dnl
dnl OpenSSL
dnl
-AC_CHECK_LIB(crypto, BN_init)
+AC_ARG_WITH(libssl,
+ AC_HELP_STRING([--with-libssl@<:@=DIR@:>@],[Include libssl/OpenSSL support (default yes)]),
+ [WITH_OPENSSL=$withval],[WITH_OPENSSL=yes])
-AC_CHECK_HEADERS([openssl/engine.h])
-AC_CHECK_LIB(ssl, SSL_accept, [have_openssl=yes], [have_openssl=no])
-if test "$have_openssl" = "yes"
-then
- TLS_LIBS="-lssl"
- AC_SUBST(TLS_LIBS)
+have_openssl=no
+
+if test "$WITH_OPENSSL" != "no"; then
+ if test "$WITH_OPENSSL" != "yes"; then
+ LIBSSL_CFLAGS="-I$WITH_OPENSSL/include"
+ LIBSSL_LIBS="-L$WITH_OPENSSL/lib"
+ fi
+
+ AC_CHECK_LIB(crypto, BN_init)
+ AC_CHECK_HEADERS([openssl/engine.h])
+ AC_CHECK_LIB(ssl, SSL_accept, [have_openssl=yes], [have_openssl=no], $LIBSSL_LIBS)
+
+ if test "$have_openssl" = "yes"; then
+ LIBSSL_LIBS="$LIBSSL_LIBS -lssl"
+
+ AC_SUBST(LIBSSL_LIBS)
+ AC_SUBST(LIBSSL_CFLAGS)
+
AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL library])
+ fi
fi
+AC_MSG_CHECKING(for libssl)
+AC_MSG_RESULT([$have_openssl])
AM_CONDITIONAL(USE_OPENSSL, test "x$have_openssl" = "xyes")
@@ -1452,7 +1469,7 @@
echo
echo ============================
echo "Install prefix $prefix"
-echo "cflags $CFLAGS"
+echo "CFLAGS $CFLAGS"
echo "trace $enable_trace"
echo "sendfile() $with_sendfile_support"
echo "IPv6 support $have_ipv6"
|
