fi
])dnl
+dnl
+dnl APACHE_MPM_MODULE(name[, shared[, objects[, config[, path]]]])
+dnl
+dnl Provide information for building the MPM. (Enablement is handled using
+dnl --with-mpm/--enable-mpms-shared.)
+dnl
+dnl name -- name of MPM, same as MPM directory name
+dnl shared -- "shared" to indicate shared module build, empty string otherwise
+dnl objects -- one or more .lo files to link into the MPM module (default: mpmname.lo)
+dnl config -- configuration logic to run if the MPM is enabled
+dnl path -- relative path to MPM (default: server/mpm/mpmname)
+dnl
+AC_DEFUN(APACHE_MPM_MODULE,[
+ if ap_mpm_is_enabled $1; then
+ if test -z "$3"; then
+ objects="$1.lo"
+ else
+ objects="$3"
+ fi
+
+ if test -z "$5"; then
+ mpmpath="server/mpm/$1"
+ else
+ mpmpath=$5
+ fi
+
+ dnl VPATH support
+ test -d $mpmpath || $srcdir/build/mkdir.sh $mpmpath
+
+ APACHE_FAST_OUTPUT($mpmpath/Makefile)
+
+ if test -z "$2"; then
+ libname="lib$1.la"
+ cat >$mpmpath/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects
+DISTCLEAN_TARGETS = modules.mk
+static = $libname
+shared =
+EOF
+ else
+ apache_need_shared=yes
+ libname="mod_mpm_$1.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ cat >$mpmpath/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects
+DISTCLEAN_TARGETS = modules.mk
+static =
+shared = $libname
+EOF
+ # add default MPM to LoadModule list
+ if test $1 = $default_mpm; then
+ DSO_MODULES="$DSO_MODULES mpm_$1"
+ fi
+ fi
+ $4
+ fi
+])dnl
+
dnl
dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
dnl
AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[
if test "x$ap_ssltk_configured" = "x"; then
dnl initialise the variables we use
+ ap_ssltk_found=""
ap_ssltk_base=""
ap_ssltk_libs=""
ap_ssltk_type=""
dnl Determine the SSL/TLS toolkit's base directory, if any
- AC_MSG_CHECKING([for SSL/TLS toolkit base])
+ AC_MSG_CHECKING([for user-provided SSL/TLS toolkit base])
AC_ARG_WITH(sslc, APACHE_HELP_STRING(--with-sslc=DIR,RSA SSL-C SSL/TLS toolkit), [
dnl If --with-sslc specifies a directory, we use that directory or fail
if test "x$withval" != "xyes" -a "x$withval" != "x"; then
dnl Run header and version checks
saved_CPPFLAGS="$CPPFLAGS"
saved_LIBS="$LIBS"
- if test "x$ap_ssltk_base" != "x"; then
+ saved_LDFLAGS="$LDFLAGS"
+ SSL_LIBS=""
+
+ dnl Before doing anything else, load in pkg-config variables (if not sslc).
+ if test "x$ap_ssltk_type" = "x" -a -n "$PKGCONFIG"; then
+ saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+ if test "x$ap_ssltk_base" != "x" -a \
+ -f "${ap_ssltk_base}/lib/pkgconfig/openssl.pc"; then
+ dnl Ensure that the given path is used by pkg-config too, otherwise
+ dnl the system openssl.pc might be picked up instead.
+ PKG_CONFIG_PATH="${ap_ssltk_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
+ export PKG_CONFIG_PATH
+ fi
+ ap_ssltk_libs="`$PKGCONFIG --libs-only-l openssl 2>&1`"
+ if test $? -eq 0; then
+ ap_ssltk_found="yes"
+ pkglookup="`$PKGCONFIG --cflags-only-I openssl`"
+ APR_ADDTO(CPPFLAGS, [$pkglookup])
+ APR_ADDTO(INCLUDES, [$pkglookup])
+ pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"
+ APR_ADDTO(LDFLAGS, [$pkglookup])
+ APR_ADDTO(SSL_LIBS, [$pkglookup])
+ fi
+ PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH"
+ fi
+ if test "x$ap_ssltk_base" != "x" -a "x$ap_ssltk_found" = "x"; then
APR_ADDTO(CPPFLAGS, [-I$ap_ssltk_base/include])
APR_ADDTO(INCLUDES, [-I$ap_ssltk_base/include])
APR_ADDTO(LDFLAGS, [-L$ap_ssltk_base/lib])
+ APR_ADDTO(SSL_LIBS, [-L$ap_ssltk_base/lib])
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_ssltk_base/lib])
+ APR_ADDTO(SSL_LIBS, [$ap_platform_runtime_link_flag$ap_ssltk_base/lib])
fi
fi
if test "x$ap_ssltk_type" = "x"; then
- AC_MSG_CHECKING([for OpenSSL version])
dnl First check for manditory headers
AC_CHECK_HEADERS([openssl/opensslv.h openssl/ssl.h], [ap_ssltk_type="openssl"], [])
if test "$ap_ssltk_type" = "openssl"; then
dnl so it's OpenSSL - test for a good version
+ AC_MSG_CHECKING([for OpenSSL version])
AC_TRY_COMPILE([#include <openssl/opensslv.h>],[
#if !defined(OPENSSL_VERSION_NUMBER)
#error "Missing openssl version"
[AC_MSG_RESULT(OK)],
[dnl Replace this with OPENSSL_VERSION_TEXT from opensslv.h?
AC_MSG_RESULT([not encouraging])
- echo "WARNING: OpenSSL version may contain security vulnerabilities!"
- echo " Ensure the latest security patches have been applied!"
+ AC_MSG_WARN([OpenSSL version may contain security vulnerabilities!]
+ [ Ensure the latest security patches have been applied!])
])
else
AC_MSG_RESULT([no OpenSSL headers found])
fi
if test "$ap_ssltk_type" != "openssl"; then
dnl Might be SSL-C - report, then test anything relevant
- AC_MSG_CHECKING([for SSL-C version])
AC_CHECK_HEADERS([sslc.h], [ap_ssltk_type="sslc"], [ap_ssltk_type=""])
if test "$ap_ssltk_type" = "sslc"; then
ap_ssltk_libs="-lsslc"
AC_MSG_ERROR([...No recognized SSL/TLS toolkit detected])
fi
- if test "$ap_ssltk_type" = "openssl"; then
- if test "x$ap_ssltk_base" != "x" -a \
- -f "${ap_ssltk_base}/lib/pkgconfig/openssl.pc"; then
- dnl Ensure that the given path is used by pkg-config too, otherwise
- dnl the system openssl.pc might be picked up instead.
- PKG_CONFIG_PATH="${ap_ssltk_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
- export PKG_CONFIG_PATH
- fi
- if test -n "$PKGCONFIG"; then
- ap_ssltk_libs="`$PKGCONFIG --libs-only-l openssl`"
- if test $? -eq 0; then
- pkglookup="`$PKGCONFIG --cflags-only-I openssl`"
- APR_ADDTO(CPPFLAGS, [$pkglookup])
- APR_ADDTO(INCLUDES, [$pkglookup])
- pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"
- APR_ADDTO(LDFLAGS, [$pkglookup])
- else
- ap_ssltk_libs="-lssl -lcrypto"
- fi
- else
- ap_ssltk_libs="-lssl -lcrypto"
- fi
+ if test "$ap_ssltk_type" = "openssl" -a "x$ap_ssltk_found" = "x"; then
+ ap_ssltk_found="yes"
+ ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
fi
- APR_SETVAR(SSL_LIBS, [$ap_ssltk_libs])
+ APR_ADDTO(SSL_LIBS, [$ap_ssltk_libs])
APR_ADDTO(LIBS, [$ap_ssltk_libs])
APACHE_SUBST(SSL_LIBS)
AC_CHECK_FUNCS([SSLC_library_version SSL_CTX_new], [], [liberrors="yes"])
AC_CHECK_FUNCS(SSL_set_state)
fi
- AC_CHECK_FUNCS(SSL_set_cert_store)
dnl restore
CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_LIBS"
+ LDFLAGS="$saved_LDFLAGS"
if test "x$liberrors" != "x"; then
AC_MSG_ERROR([... Error, SSL/TLS libraries were missing or unusable])
fi
projects / apache / blobdiff