dnl AC_HELP_STRING, so let's try to call it if we can.
dnl Note: this define must be on one line so that it can be properly returned
dnl as the help string.
-AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl
+AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl
dnl APACHE_SUBST(VARIABLE)
dnl Makes VARIABLE available in generated files
dnl (do not use @variable@ in Makefiles, but $(variable))
-AC_DEFUN(APACHE_SUBST,[
+AC_DEFUN([APACHE_SUBST],[
APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1"
AC_SUBST($1)
])
dnl APACHE_FAST_OUTPUT(FILENAME)
dnl Perform substitutions on FILENAME (Makefiles only)
-AC_DEFUN(APACHE_FAST_OUTPUT,[
+AC_DEFUN([APACHE_FAST_OUTPUT],[
APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1"
])
dnl APACHE_GEN_CONFIG_VARS
dnl Creates config_vars.mk
-AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
+AC_DEFUN([APACHE_GEN_CONFIG_VARS],[
+ APACHE_SUBST(HTTPD_VERSION)
+ APACHE_SUBST(HTTPD_MMN)
APACHE_SUBST(abs_srcdir)
APACHE_SUBST(bindir)
APACHE_SUBST(sbindir)
APACHE_SUBST(MKDEP)
APACHE_SUBST(INSTALL_PROG_FLAGS)
APACHE_SUBST(DSO_MODULES)
+ APACHE_SUBST(ENABLED_DSO_MODULES)
+ APACHE_SUBST(LOAD_ALL_MODULES)
APACHE_SUBST(APR_BINDIR)
APACHE_SUBST(APR_INCLUDEDIR)
APACHE_SUBST(APR_VERSION)
abs_srcdir="`(cd $srcdir && pwd)`"
- echo creating config_vars.mk
+ AC_MSG_NOTICE([creating config_vars.mk])
test -d build || $mkdir_p build
> build/config_vars.mk
for i in $APACHE_VAR_SUBST; do
dnl APACHE_GEN_MAKEFILES
dnl Creates Makefiles
-AC_DEFUN(APACHE_GEN_MAKEFILES,[
+AC_DEFUN([APACHE_GEN_MAKEFILES],[
$SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES
])
-dnl ## APACHE_OUTPUT(file)
-dnl ## adds "file" to the list of files generated by AC_OUTPUT
-dnl ## This macro can be used several times.
-AC_DEFUN(APACHE_OUTPUT, [
- APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
-])
-
dnl
dnl APACHE_TYPE_RLIM_T
dnl
dnl If rlim_t is not defined, define it to int
dnl
-AC_DEFUN(APACHE_TYPE_RLIM_T, [
+AC_DEFUN([APACHE_TYPE_RLIM_T], [
AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
AC_TRY_COMPILE([
#include <sys/types.h>
fi
])
+dnl the list of build variables which are available for customization on a
+dnl per module subdir basis (to be inserted into modules.mk with a "MOD_"
+dnl prefix, i.e. MOD_CFLAGS etc.). Used in APACHE_MODPATH_{INIT,FINISH}.
+define(mod_buildvars, [CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES])
+dnl
dnl APACHE_MODPATH_INIT(modpath)
-AC_DEFUN(APACHE_MODPATH_INIT,[
+AC_DEFUN([APACHE_MODPATH_INIT],[
current_dir=$1
modpath_current=modules/$1
modpath_static=
modpath_shared=
+ for var in mod_buildvars; do
+ eval MOD_$var=
+ done
test -d $1 || $srcdir/build/mkdir.sh $modpath_current
> $modpath_current/modules.mk
])dnl
dnl
-AC_DEFUN(APACHE_MODPATH_FINISH,[
+AC_DEFUN([APACHE_MODPATH_FINISH],[
echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
echo "static = $modpath_static" >> $modpath_current/modules.mk
echo "shared = $modpath_shared" >> $modpath_current/modules.mk
+ for var in mod_buildvars; do
+ if eval val=\"\$MOD_$var\"; test -n "$val"; then
+ echo "MOD_$var = $val" >> $modpath_current/modules.mk
+ fi
+ done
if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
MODULE_DIRS="$MODULE_DIRS $current_dir"
else
])dnl
dnl
dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]])
-AC_DEFUN(APACHE_MODPATH_ADD,[
+AC_DEFUN([APACHE_MODPATH_ADD],[
if test -z "$3"; then
objects="mod_$1.lo"
else
dnl path -- relative path to MPM (default: server/mpm/mpmname)
dnl libs -- libs needed by this MPM
dnl
-AC_DEFUN(APACHE_MPM_MODULE,[
+AC_DEFUN([APACHE_MPM_MODULE],[
if ap_mpm_is_enabled $1; then
if test -z "$3"; then
objects="$1.lo"
static =
shared = $libname
EOF
+ DSO_MODULES="$DSO_MODULES mpm_$1"
# add default MPM to LoadModule list
if test $1 = $default_mpm; then
- DSO_MODULES="$DSO_MODULES mpm_$1"
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_$1"
fi
fi
$4
])dnl
dnl
-dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config[, prereq_module]]]]])
dnl
dnl default is one of:
dnl yes -- enabled by default. user must explicitly disable.
dnl most -- disabled by default. enabled explicitly or with most or all.
dnl static -- enabled as static by default, must be explicitly changed.
dnl "" -- disabled under default, most. enabled explicitly or with all.
+dnl XXX: The arg must really be empty here. Passing an empty shell
+dnl XXX: variable doesn't work for some reason. This should be
+dnl XXX: fixed.
dnl
dnl basically: yes/no is a hard setting. "most" means follow the "most"
dnl setting. otherwise, fall under the "all" setting.
dnl explicit yes/no always overrides, except if the user selects
dnl "reallyall".
dnl
-AC_DEFUN(APACHE_MODULE,[
+dnl prereq_module is a module (without the "mod_" prefix) that must be enabled
+dnl if the current module is enabled. If the current module is built
+dnl statically, prereq_module must be built statically, too. If these
+dnl conditions are not fulfilled, configure will abort if the current module
+dnl has been enabled explicitly. Otherwise, configure will disable the
+dnl current module.
+dnl prereq_module's APACHE_MODULE() statement must have been processed
+dnl before the current APACHE_MODULE() statement.
+dnl
+AC_DEFUN([APACHE_MODULE],[
AC_MSG_CHECKING(whether to enable mod_$1)
define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
- AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5))
+ AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),force_$1=$enableval,enable_$1=ifelse($5,,maybe-all,$5))
undefine([optname])dnl
_apmod_extra_msg=""
- dnl When --enable-modules=most or --enable-modules=(really)all is set and the
- dnl module was not explicitly requested, allow a module to disable itself if
+ dnl If the module was not explicitly requested, allow it to disable itself if
dnl its pre-reqs fail.
- dnl XXX: Todo: Allow to disable specific modules even with "reallyall".
case "$enable_$1" in
yes|static|shared)
- _apmod_error_fatal="yes"
+ _apmod_required="yes"
;;
*)
- case "$module_selection" in
- reallyall|all|most)
- _apmod_error_fatal="no"
- ;;
- *)
- _apmod_error_fatal="yes"
- ;;
- esac
+ _apmod_required="no"
+ ;;
esac
- if test "$enable_$1" = "static"; then
- enable_$1=static
+ if test "$enable_$1" = "static" -o "$enable_$1" = "shared"; then
+ :
elif test "$enable_$1" = "yes"; then
enable_$1=$module_default
+ elif test "$enable_$1" = "few"; then
+ if test "$module_selection" = "few" -o "$module_selection" = "most" -o \
+ "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_$1=$module_default
+ else
+ enable_$1=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_$1" = "most"; then
if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
"$module_selection" = "reallyall"
then
enable_$1=$module_default
- elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ else
enable_$1=no
fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_$1" = "maybe-all"; then
+ elif test "$enable_$1" = "all" -o "$enable_$1" = "maybe-all"; then
if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
then
enable_$1=$module_default
else
enable_$1=no
fi
- elif test "$enable_$1" = "no" -a "$module_selection" = "reallyall"; then
+ elif test "$enable_$1" = "reallyall" -o "$enable_$1" = "no" ; then
+ if test "$module_selection" = "reallyall" -a "$force_$1" != "no" ; then
enable_$1=$module_default
_apmod_extra_msg=" ($module_selection)"
+ else
+ enable_$1=no
+ fi
+ else
+ enable_$1=no
fi
if test "$enable_$1" != "no"; then
dnl If we plan to enable it, allow the module to run some autoconf magic
dnl that may disable it because of missing dependencies.
- ifelse([$6],,:,[AC_MSG_RESULT([checking dependencies])
- $6
- AC_MSG_CHECKING(whether to enable mod_$1)
- if test "$enable_$1" = "no"; then
- if test "$_apmod_error_fatal" = "no"; then
- _apmod_extra_msg=" (disabled)"
- else
- AC_MSG_ERROR([mod_$1 has been requested but can not be built due to prerequisite failures])
- fi
- fi])
+ ifelse([$6$7],,:,
+ [AC_MSG_RESULT([checking dependencies])
+ ifelse([$7],,:,[m4_foreach([prereq],[$7],
+ [if test "$enable_[]prereq" = "no" ; then
+ enable_$1=no
+ AC_MSG_WARN("mod_[]prereq is disabled but required for mod_$1")
+ elif test "$enable_$1" = "static" && test "$enable_[]prereq" != "static" ; then
+ enable_$1=$enable_[]prereq
+ AC_MSG_WARN("building mod_$1 shared because mod_[]prereq is built shared")
+ el])se])
+ ifelse([$6],,:,[ $6])
+ ifelse([$7],,:,[fi])
+ AC_MSG_CHECKING(whether to enable mod_$1)
+ if test "$enable_$1" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ AC_MSG_ERROR([mod_$1 has been requested but can not be built due to prerequisite failures])
+ fi
+ fi])
fi
AC_MSG_RESULT($enable_$1$_apmod_extra_msg)
if test "$enable_$1" != "no"; then
fi
shared="";;
*)
- enable_$1=`echo $enable_$1|sed 's/shared,*//'`
sharedobjs=yes
shared=yes
DSO_MODULES="$DSO_MODULES $1"
+ if test "$5" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},$1"
+ fi
;;
esac
define([modprefix], [MOD_]translit($1, [a-z-], [A-Z_]))
dnl
dnl APACHE_ENABLE_MODULES
dnl
-AC_DEFUN(APACHE_ENABLE_MODULES,[
+AC_DEFUN([APACHE_ENABLE_MODULES],[
module_selection=most
module_default=shared
])
])
-AC_DEFUN(APACHE_REQUIRE_CXX,[
+AC_DEFUN([APACHE_REQUIRE_CXX],[
if test -z "$apache_cxx_done"; then
AC_PROG_CXX
AC_PROG_CXXCPP
])
dnl
-dnl APACHE_CHECK_SSL_TOOLKIT
+dnl APACHE_CHECK_OPENSSL
dnl
-dnl Configure for the detected openssl/ssl-c toolkit installation, giving
-dnl
preference to "--with-ssl=<path>" if it was specified.
+dnl Configure for OpenSSL, giving preference to
+dnl "--with-ssl=<path>" if it was specified.
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 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 This ensures $withval is actually a directory and that it is absolute
- ap_ssltk_base="`cd $withval ; pwd`"
- fi
- ap_ssltk_type="sslc"
- ])
- AC_ARG_WITH(ssl, APACHE_HELP_STRING(--with-ssl=DIR,OpenSSL SSL/TLS toolkit), [
- dnl If --with-ssl specifies a directory, we use that directory or fail
- if test "x$withval" != "xyes" -a "x$withval" != "x"; then
- dnl This ensures $withval is actually a directory and that it is absolute
- ap_ssltk_base="`cd $withval ; pwd`"
+AC_DEFUN([APACHE_CHECK_OPENSSL],[
+ AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [
+ dnl initialise the variables we use
+ ac_cv_openssl=no
+ ap_openssl_found=""
+ ap_openssl_base=""
+ ap_openssl_libs=""
+ ap_openssl_mod_cflags=""
+ ap_openssl_mod_ldflags=""
+
+ dnl Determine the OpenSSL base directory, if any
+ AC_MSG_CHECKING([for user-provided OpenSSL base directory])
+ AC_ARG_WITH(ssl, APACHE_HELP_STRING(--with-ssl=PATH,OpenSSL installation directory), [
+ dnl If --with-ssl specifies a directory, we use that directory
+ if test "x$withval" != "xyes" -a "x$withval" != "x"; then
+ dnl This ensures $withval is actually a directory and that it is absolute
+ ap_openssl_base="`cd $withval ; pwd`"
+ fi
+ ])
+ if test "x$ap_openssl_base" = "x"; then
+ AC_MSG_RESULT(none)
+ else
+ AC_MSG_RESULT($ap_openssl_base)
fi
- ])
- if test "x$ap_ssltk_base" = "x"; then
- AC_MSG_RESULT(none)
- else
- AC_MSG_RESULT($ap_ssltk_base)
- fi
- dnl Run header and version checks
- saved_CPPFLAGS="$CPPFLAGS"
- saved_LIBS="$LIBS"
- 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])
+ dnl Run header and version checks
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LIBS="$LIBS"
+ saved_LDFLAGS="$LDFLAGS"
+
+ dnl Before doing anything else, load in pkg-config variables
+ if test -n "$PKGCONFIG"; then
+ saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+ if test "x$ap_openssl_base" != "x" -a \
+ -f "${ap_openssl_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_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
+ export PKG_CONFIG_PATH
+ fi
+ AC_ARG_ENABLE(ssl-staticlib-deps,APACHE_HELP_STRING(--enable-ssl-staticlib-deps,[link mod_ssl with dependencies of OpenSSL's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-ssl.]), [
+ if test "$enableval" = "yes"; then
+ PKGCONFIG_LIBOPTS="--static"
+ fi
+ ])
+ ap_openssl_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors openssl`"
+ if test $? -eq 0; then
+ ap_openssl_found="yes"
+ pkglookup="`$PKGCONFIG --cflags-only-I openssl`"
+ APR_ADDTO(CPPFLAGS, [$pkglookup])
+ APR_ADDTO(MOD_CFLAGS, [$pkglookup])
+ APR_ADDTO(ab_CFLAGS, [$pkglookup])
+ pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L openssl`"
+ APR_ADDTO(LDFLAGS, [$pkglookup])
+ APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
+ pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other openssl`"
+ APR_ADDTO(LDFLAGS, [$pkglookup])
+ APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
+ fi
+ PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH"
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])
+
+ dnl fall back to the user-supplied directory if not found via pkg-config
+ if test "x$ap_openssl_base" != "x" -a "x$ap_openssl_found" = "x"; then
+ APR_ADDTO(CPPFLAGS, [-I$ap_openssl_base/include])
+ APR_ADDTO(MOD_CFLAGS, [-I$ap_openssl_base/include])
+ APR_ADDTO(ab_CFLAGS, [-I$ap_openssl_base/include])
+ APR_ADDTO(LDFLAGS, [-L$ap_openssl_base/lib])
+ APR_ADDTO(MOD_LDFLAGS, [-L$ap_openssl_base/lib])
+ if test "x$ap_platform_runtime_link_flag" != "x"; then
+ APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_openssl_base/lib])
+ APR_ADDTO(MOD_LDFLAGS, [$ap_platform_runtime_link_flag$ap_openssl_base/lib])
+ fi
fi
- fi
- if test "x$ap_ssltk_type" = "x"; then
- 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>],[
+
+ AC_MSG_CHECKING([for OpenSSL version >= 0.9.8a])
+ AC_TRY_COMPILE([#include <openssl/opensslv.h>],[
#if !defined(OPENSSL_VERSION_NUMBER)
-#error "Missing openssl version"
+#error "Missing OpenSSL version"
#endif
-#if (OPENSSL_VERSION_NUMBER < 0x009060af) \
- || ((OPENSSL_VERSION_NUMBER > 0x00907000) && (OPENSSL_VERSION_NUMBER < 0x0090702f))
-#error "Insecure openssl version " OPENSSL_VERSION_TEXT
+#if OPENSSL_VERSION_NUMBER < 0x0090801f
+#error "Unsupported OpenSSL version " OPENSSL_VERSION_TEXT
#endif],
- [AC_MSG_RESULT(OK)],
- [dnl Replace this with OPENSSL_VERSION_TEXT from opensslv.h?
- AC_MSG_RESULT([not encouraging])
- 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
- fi
- if test "$ap_ssltk_type" != "openssl"; then
- dnl Might be SSL-C - report, then test anything relevant
- 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_CHECKING([for SSL-C version])
- AC_TRY_COMPILE([#include <sslc.h>],[
-#if !defined(SSLC_VERSION_NUMBER)
-#error "Missing SSL-C version"
-#endif
-#if SSLC_VERSION_NUMBER < 0x2310
-#define stringize_ver(x) #x
-#error "Insecure SSL-C version " stringize_ver(SSLC_VERSION_NUMBER)
-#endif],
- [AC_MSG_RESULT(OK)],
- [dnl Replace this with SSLC_VERSION_NUMBER?
- AC_MSG_RESULT([not encouraging])
- echo "WARNING: SSL-C version may contain security vulnerabilities!"
- echo " Ensure the latest security patches have been applied!"
- ])
+ [AC_MSG_RESULT(OK)
+ ac_cv_openssl=yes],
+ [AC_MSG_RESULT(FAILED)])
+
+ if test "x$ac_cv_openssl" = "xyes"; then
+ ap_openssl_libs="${ap_openssl_libs:--lssl -lcrypto} `$apr_config --libs`"
+ APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_libs])
+ APR_ADDTO(LIBS, [$ap_openssl_libs])
+ APR_SETVAR(ab_LDFLAGS, [$MOD_LDFLAGS])
+ APACHE_SUBST(ab_CFLAGS)
+ APACHE_SUBST(ab_LDFLAGS)
+
+ dnl Run library and function checks
+ liberrors=""
+ AC_CHECK_HEADERS([openssl/engine.h])
+ AC_CHECK_FUNCS([SSLeay_version SSL_CTX_new], [], [liberrors="yes"])
+ AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines RAND_egd])
+ if test "x$liberrors" != "x"; then
+ AC_MSG_WARN([OpenSSL libraries are unusable])
+ fi
else
- AC_MSG_RESULT([no SSL-C headers found])
+ AC_MSG_WARN([OpenSSL version is too old])
fi
- fi
- if test "x$ap_ssltk_type" = "x"; then
- AC_MSG_ERROR([...No recognized SSL/TLS toolkit detected])
- 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_ADDTO(SSL_LIBS, [$ap_ssltk_libs])
- APR_ADDTO(LIBS, [$ap_ssltk_libs])
- APACHE_SUBST(SSL_LIBS)
-
- dnl Run library and function checks
- liberrors=""
- if test "$ap_ssltk_type" = "openssl"; then
- AC_CHECK_HEADERS([openssl/engine.h])
- AC_CHECK_FUNCS([SSLeay_version SSL_CTX_new], [], [liberrors="yes"])
- AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines])
- else
- AC_CHECK_FUNCS([SSLC_library_version SSL_CTX_new], [], [liberrors="yes"])
- AC_CHECK_FUNCS(SSL_set_state)
- fi
- 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
+ dnl restore
+ CPPFLAGS="$saved_CPPFLAGS"
+ LIBS="$saved_LIBS"
+ LDFLAGS="$saved_LDFLAGS"
- dnl Adjust apache's configuration based on what we found above.
- dnl (a) define preprocessor symbols
- if test "$ap_ssltk_type" = "openssl"; then
- AC_DEFINE(HAVE_OPENSSL, 1, [Define if SSL is supported using OpenSSL])
- else
- AC_DEFINE(HAVE_SSLC, 1, [Define if SSL is supported using SSL-C])
- fi
-fi
-])
-
-dnl
-dnl APACHE_CHECK_SERF
-dnl
-dnl Configure for the detected libserf, giving preference to
-dnl "--with-serf=<path>" if it was specified.
-dnl
-AC_DEFUN([APACHE_CHECK_SERF], [
- AC_CACHE_CHECK([for libserf], [ac_cv_serf], [
- ac_cv_serf=no
- serf_prefix=/usr
- SERF_LIBS=""
- AC_ARG_WITH(serf, APACHE_HELP_STRING([--with-serf=PREFIX],
- [Serf client library]),
- [
- if test "$withval" = "yes" ; then
- serf_prefix=/usr
- else
- serf_prefix=$withval
- fi
- ])
-
- if test "$serf_prefix" != "no" ; then
- save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES -I$serf_prefix/include/serf-0"
- AC_CHECK_HEADERS(serf.h,[
- save_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
- AC_CHECK_LIB(serf-0, serf_context_create,[ac_cv_serf="yes"])
- LDFLAGS="$save_ldflags"])
- CPPFLAGS="$save_cppflags"
- fi
+ dnl cache MOD_LDFLAGS, MOD_CFLAGS
+ ap_openssl_mod_cflags=$MOD_CFLAGS
+ ap_openssl_mod_ldflags=$MOD_LDFLAGS
])
-
- APACHE_SUBST(SERF_LIBS)
- if test "$ac_cv_serf" = "yes"; then
- AC_DEFINE(HAVE_SERF, 1, [Define if libserf is available])
- APR_SETVAR(SERF_LIBS, [-L$serf_prefix/lib -lserf-0])
- APR_ADDTO(INCLUDES, [-I$serf_prefix/include/serf-0])
+ if test "x$ac_cv_openssl" = "xyes"; then
+ AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL is available])
+ APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_mod_ldflags])
+ APR_ADDTO(MOD_CFLAGS, [$ap_openssl_mod_cflags])
fi
])
-
dnl
dnl APACHE_EXPORT_ARGUMENTS
dnl Export (via APACHE_SUBST) the various path-related variables that
dnl apache will use while generating scripts like autoconf and apxs and
dnl the default config file.
-AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[
+AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[
APR_EXPAND_VAR(exp_$1, [$]$1)
APACHE_SUBST(exp_$1)
APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix})
APACHE_SUBST(rel_$1)
])
-AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[
+AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[
APACHE_SUBST_EXPANDED_ARG(exec_prefix)
APACHE_SUBST_EXPANDED_ARG(bindir)
APACHE_SUBST_EXPANDED_ARG(sbindir)
AC_MSG_ERROR([Size of "void *" is less than size of "long"])
fi
])
+
+dnl
+dnl APACHE_CHECK_APR_HAS_LDAP
+dnl
+dnl Check if APR_HAS_LDAP is 1
+dnl Unfortunately, we can't use APR_CHECK_APR_DEFINE (because it only includes apr.h)
+dnl or APR_CHECK_DEFINE (because it only checks for defined'ness and not for 0/1).
+dnl
+AC_DEFUN([APACHE_CHECK_APR_HAS_LDAP], [
+ AC_CACHE_CHECK([for ldap support in apr/apr-util],ac_cv_APR_HAS_LDAP,[
+ apache_old_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCLUDES"
+ AC_EGREP_CPP(YES_IS_DEFINED, [
+#include <apr_ldap.h>
+#if APR_HAS_LDAP
+YES_IS_DEFINED
+#endif
+ ], ac_cv_APR_HAS_LDAP=yes, ac_cv_APR_HAS_LDAP=no)
+ CPPFLAGS="$apache_old_cppflags"
+ ])
+])
+
+dnl
+dnl APACHE_ADD_GCC_CFLAGS
+dnl
+dnl Check if compiler is gcc and supports flag. If yes, add to CFLAGS.
+dnl
+AC_DEFUN([APACHE_ADD_GCC_CFLAG], [
+ define([ap_gcc_ckvar], [ac_cv_gcc_]translit($1, [-:.=], [____]))
+ if test "$GCC" = "yes"; then
+ AC_CACHE_CHECK([whether gcc accepts $1], ap_gcc_ckvar, [
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([int foo() { return 0; }])],
+ [ap_gcc_ckvar=yes], [ap_gcc_ckvar=no])
+ CFLAGS="$save_CFLAGS"
+ ])
+ if test "$]ap_gcc_ckvar[" = "yes" ; then
+ APR_ADDTO(CFLAGS,[$1])
+ fi
+ fi
+ undefine([ap_gcc_ckvar])
+])
projects / apache / blobdiff