summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorArno Töll <debian@toell.net>2012-01-08 22:53:17 +0100
committerArno Töll <debian@toell.net>2012-01-08 22:53:17 +0100
commite072a2dd866b7cb9f14319b80326a4e7fd16fcdf (patch)
treea49dfc56d94a26011fe157835ff6cbe14edbd8a9 /configure
parent0890390c00801651d08d3794e13b31a5dabbf5ef (diff)
downloadapache2-e072a2dd866b7cb9f14319b80326a4e7fd16fcdf.tar.gz
Imported Upstream version 2.3.16-beta
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure19572
1 files changed, 15937 insertions, 3635 deletions
diff --git a/configure b/configure
index 91a7f3b1..da1d3dee 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64.
+# Generated by GNU Autoconf 2.68.
+#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
# Foundation, Inc.
#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## -------------------- ##
@@ -87,6 +89,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -212,11 +215,18 @@ IFS=$as_save_IFS
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
+ # Preserve -v and -x to the replacement shell.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+ esac
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -314,7 +324,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -354,19 +364,19 @@ else
fi # as_fn_arith
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -524,10 +534,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -604,6 +615,8 @@ APR_CONFIG
APR_VERSION
APR_INCLUDEDIR
APR_BINDIR
+LOAD_ALL_MODULES
+ENABLED_DSO_MODULES
DSO_MODULES
INSTALL_PROG_FLAGS
MK_IMPLIB
@@ -611,13 +624,12 @@ SH_LIBTOOL
SH_LIBS
CORE_IMPLIB
CORE_IMPLIB_FILE
-nonssl_listen_stmt_2
-nonssl_listen_stmt_1
SSLPORT
PORT
MODULE_CLEANDIRS
MODULE_DIRS
LIBTOOL
+INTERNAL_CPPFLAGS
NOTEST_LIBS
NOTEST_LDFLAGS
NOTEST_CXXFLAGS
@@ -654,15 +666,13 @@ AP_LIBS
shared_build
POST_SHARED_CMDS
PRE_SHARED_CMDS
+MOD_SO_ENABLED
OS_SPECIFIC_VARS
SHLIBPATH_VAR
BUILTIN_LIBS
OS_DIR
OS
-MPM_LIB
progname
-MOD_SO_LDADD
-INSTALL_DSO
MOD_REWRITE_LDADD
MOD_ALIAS_LDADD
MOD_USERDIR_LDADD
@@ -682,10 +692,20 @@ MOD_ASIS_LDADD
MOD_AUTOINDEX_LDADD
MOD_STATUS_LDADD
MOD_DAV_LDADD
-MOD_MIME_LDADD
-MOD_HTTP_LDADD
+MOD_HEARTMONITOR_LDADD
+MOD_HEARTBEAT_LDADD
+MOD_PRIVILEGES_LDADD
+MOD_UNIXD_LDADD
+MOD_MPM_EVENT_LDADD
+MPM_LIB
+MPM_SUBDIRS
+MOD_LBMETHOD_HEARTBEAT_LDADD
+MOD_LBMETHOD_BYBUSYNESS_LDADD
+MOD_LBMETHOD_BYTRAFFIC_LDADD
+MOD_LBMETHOD_BYREQUESTS_LDADD
APACHECTL_ULIMIT
NONPORTABLE_SUPPORT
+fcgistarter_LTFLAGS
httxt2dbm_LTFLAGS
htcacheclean_LTFLAGS
checkgid_LTFLAGS
@@ -695,21 +715,30 @@ logresolve_LTFLAGS
rotatelogs_LTFLAGS
htdigest_LTFLAGS
htpasswd_LTFLAGS
-MPM_SUBDIR_NAME
-MPM_NAME
+MOD_DIALUP_LDADD
MOD_OPTIONAL_FN_EXPORT_LDADD
MOD_OPTIONAL_FN_IMPORT_LDADD
MOD_OPTIONAL_HOOK_IMPORT_LDADD
MOD_OPTIONAL_HOOK_EXPORT_LDADD
MOD_SSL_LDADD
SSL_LIBS
+MOD_SLOTMEM_PLAIN_LDADD
+MOD_SLOTMEM_SHM_LDADD
+MOD_SESSION_DBD_LDADD
+MOD_SESSION_CRYPTO_LDADD
+MOD_SESSION_COOKIE_LDADD
+MOD_SESSION_LDADD
+MOD_PROXY_EXPRESS_LDADD
MOD_PROXY_BALANCER_LDADD
MOD_PROXY_AJP_LDADD
+MOD_PROXY_FDPASS_LDADD
MOD_PROXY_SCGI_LDADD
+MOD_PROXY_FCGI_LDADD
MOD_PROXY_HTTP_LDADD
MOD_PROXY_FTP_LDADD
MOD_PROXY_CONNECT_LDADD
MOD_PROXY_LDADD
+MOD_REMOTEIP_LDADD
MOD_VERSION_LDADD
MOD_SETENVIF_LDADD
MOD_UNIQUE_ID_LDADD
@@ -720,50 +749,75 @@ MOD_EXPIRES_LDADD
MOD_CERN_META_LDADD
MOD_MIME_MAGIC_LDADD
MOD_ENV_LDADD
+MOD_LUA_LDADD
+LUA_CFLAGS
+LUA_LIBS
MOD_LOGIO_LDADD
MOD_LOG_FORENSIC_LDADD
+MOD_LOG_DEBUG_LDADD
MOD_LOG_CONFIG_LDADD
MOD_LDAP_LDADD
+MOD_MIME_LDADD
+MOD_HTTP_LDADD
+MOD_PROXY_HTML_LDADD
+MOD_XML2ENC_LDADD
MOD_DEFLATE_LDADD
MOD_CHARSET_LITE_LDADD
+MOD_SED_LDADD
MOD_SUBSTITUTE_LDADD
+MOD_REFLECTOR_LDADD
MOD_FILTER_LDADD
MOD_INCLUDE_LDADD
+MOD_REQUEST_LDADD
MOD_EXT_FILTER_LDADD
MOD_REQTIMEOUT_LDADD
+MOD_RATELIMIT_LDADD
+MOD_DATA_LDADD
+MOD_BUFFER_LDADD
+MOD_EXAMPLE_IPC_LDADD
MOD_CASE_FILTER_IN_LDADD
MOD_CASE_FILTER_LDADD
-MOD_EXAMPLE_LDADD
+MOD_EXAMPLE_HOOKS_LDADD
MOD_ECHO_LDADD
MOD_DUMPIO_LDADD
MOD_BUCKETEER_LDADD
MOD_DBD_LDADD
-MOD_MEM_CACHE_LDADD
-MOD_DISK_CACHE_LDADD
+MOD_WATCHDOG_LDADD
+MOD_SO_LDADD
+INSTALL_DSO
+MOD_SOCACHE_DC_LDADD
+MOD_SOCACHE_MEMCACHE_LDADD
+MOD_SOCACHE_DBM_LDADD
+MOD_SOCACHE_SHMCB_LDADD
+MOD_CACHE_DISK_LDADD
MOD_CACHE_LDADD
MOD_FILE_CACHE_LDADD
MOD_ISAPI_LDADD
+MOD_ALLOWMETHODS_LDADD
MOD_AUTH_DIGEST_LDADD
+MOD_AUTH_FORM_LDADD
MOD_AUTH_BASIC_LDADD
-MOD_AUTHZ_DEFAULT_LDADD
+MOD_ACCESS_COMPAT_LDADD
MOD_AUTHNZ_LDAP_LDADD
+MOD_AUTHZ_CORE_LDADD
+MOD_AUTHZ_DBD_LDADD
MOD_AUTHZ_OWNER_LDADD
MOD_AUTHZ_DBM_LDADD
MOD_AUTHZ_USER_LDADD
MOD_AUTHZ_GROUPFILE_LDADD
MOD_AUTHZ_HOST_LDADD
-MOD_AUTHN_ALIAS_LDADD
-MOD_AUTHN_DEFAULT_LDADD
+MOD_AUTHN_CORE_LDADD
+MOD_AUTHN_SOCACHE_LDADD
MOD_AUTHN_DBD_LDADD
MOD_AUTHN_ANON_LDADD
MOD_AUTHN_DBM_LDADD
MOD_AUTHN_FILE_LDADD
PILDFLAGS
PICFLAGS
+DTRACE
CRYPT_LIBS
+MATH_LIBS
MKDEP
-EGREP
-GREP
INSTALL
MKINSTALLDIRS
LYNX_PATH
@@ -775,6 +829,7 @@ PKGCONFIG
RM
LTCFLAGS
SHLTCFLAGS
+PCRE_LIBS
PCRE_CONFIG
CPP
OBJEXT
@@ -796,6 +851,8 @@ build_os
build_vendor
build_cpu
build
+EGREP
+GREP
rel_proxycachedir
exp_proxycachedir
rel_logfiledir
@@ -882,51 +939,81 @@ with_apr_util
with_pcre
with_port
with_sslport
-enable_v4_mapped
+enable_dtrace
+enable_hook_probes
enable_exception_hook
+enable_load_all_modules
enable_maintainer_mode
+enable_debugger_mode
enable_pie
enable_modules
enable_mods_shared
+enable_mods_static
enable_authn_file
enable_authn_dbm
enable_authn_anon
enable_authn_dbd
-enable_authn_default
-enable_authn_alias
+enable_authn_socache
+enable_authn_core
enable_authz_host
enable_authz_groupfile
enable_authz_user
enable_authz_dbm
enable_authz_owner
+enable_authz_dbd
+enable_authz_core
enable_authnz_ldap
-enable_authz_default
+enable_access_compat
enable_auth_basic
+enable_auth_form
enable_auth_digest
+enable_allowmethods
enable_isapi
enable_file_cache
enable_cache
-enable_disk_cache
-enable_mem_cache
+enable_cache_disk
+enable_socache_shmcb
+enable_socache_dbm
+enable_socache_memcache
+enable_socache_dc
+with_distcache
+enable_so
+enable_watchdog
enable_dbd
enable_bucketeer
enable_dumpio
enable_echo
-enable_example
+enable_example_hooks
enable_case_filter
enable_case_filter_in
+enable_example_ipc
+enable_buffer
+enable_data
+enable_ratelimit
enable_reqtimeout
enable_ext_filter
+enable_request
enable_include
enable_filter
+enable_reflector
enable_substitute
+enable_sed
enable_charset_lite
enable_deflate
with_z
+enable_xml2enc
+with_libxml2
+enable_proxy_html
+enable_http
+enable_mime
enable_ldap
enable_log_config
+enable_log_debug
enable_log_forensic
enable_logio
+enable_lua
+with_lua
+enable_luajit
enable_env
enable_mime_magic
enable_cern_meta
@@ -937,22 +1024,30 @@ enable_usertrack
enable_unique_id
enable_setenvif
enable_version
+enable_remoteip
enable_proxy
enable_proxy_connect
enable_proxy_ftp
enable_proxy_http
+enable_proxy_fcgi
enable_proxy_scgi
+enable_proxy_fdpass
enable_proxy_ajp
enable_proxy_balancer
+enable_proxy_express
+enable_session
+enable_session_cookie
+enable_session_crypto
+enable_session_dbd
+enable_slotmem_shm
+enable_slotmem_plain
enable_ssl
-with_sslc
with_ssl
-enable_distcache
enable_optional_hook_export
enable_optional_hook_import
enable_optional_fn_import
enable_optional_fn_export
-with_mpm
+enable_dialup
enable_static_support
enable_static_htpasswd
enable_static_htdigest
@@ -963,8 +1058,17 @@ enable_static_ab
enable_static_checkgid
enable_static_htcacheclean
enable_static_httxt2dbm
-enable_http
-enable_mime
+enable_static_fcgistarter
+enable_lbmethod_byrequests
+enable_lbmethod_bytraffic
+enable_lbmethod_bybusyness
+enable_lbmethod_heartbeat
+with_mpm
+enable_mpms_shared
+enable_unixd
+enable_privileges
+enable_heartbeat
+enable_heartmonitor
with_module
enable_dav
enable_status
@@ -985,7 +1089,6 @@ enable_speling
enable_userdir
enable_alias
enable_rewrite
-enable_so
with_program_name
with_suexec_bin
with_suexec_caller
@@ -996,6 +1099,7 @@ with_suexec_gidmin
with_suexec_logfile
with_suexec_safepath
with_suexec_umask
+enable_v4_mapped
'
ac_precious_vars='build_alias
host_alias
@@ -1068,8 +1172,9 @@ do
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1114,7 +1219,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1140,7 +1245,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1344,7 +1449,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1360,7 +1465,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1390,8 +1495,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
@@ -1399,7 +1504,7 @@ Try \`$0 --help' for more information."
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1409,7 +1514,7 @@ Try \`$0 --help' for more information."
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
@@ -1417,13 +1522,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error "missing argument to $ac_option"
+ as_fn_error $? "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1446,7 +1551,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1460,8 +1565,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1476,9 +1581,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error "working directory cannot be determined"
+ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error "pwd does not report name of working directory"
+ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1517,11 +1622,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1561,7 +1666,7 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1620,76 +1725,141 @@ Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-layout=LAYOUT
- --enable-v4-mapped Allow IPv6 sockets to handle IPv4 connections
+ --enable-dtrace Enable DTrace probes
+ --enable-hook-probes Enable APR hook probes
--enable-exception-hook Enable fatal exception hook
+ --enable-load-all-modules
+ Load all modules
--enable-maintainer-mode
- Turn on debugging and compile time warnings
+ Turn on debugging and compile time warnings and load
+ all compiled modules
+ --enable-debugger-mode Turn on debugging and compile time warnings and turn
+ off optimization
--enable-pie Build httpd as a Position Independent Executable
--enable-modules=MODULE-LIST
Space-separated list of modules to enable | "all" |
- "most"
+ "most" | "few" | "none" | "reallyall"
--enable-mods-shared=MODULE-LIST
Space-separated list of shared modules to enable |
- "all" | "most"
+ "all" | "most" | "few" | "reallyall"
+ --enable-mods-static=MODULE-LIST
+ Space-separated list of static modules to enable |
+ "all" | "most" | "few" | "reallyall"
--disable-authn-file file-based authentication control
--enable-authn-dbm DBM-based authentication control
--enable-authn-anon anonymous user authentication control
--enable-authn-dbd SQL-based authentication control
- --disable-authn-default authentication backstopper
- --enable-authn-alias auth provider alias
+ --enable-authn-socache Cached authentication control
+ --disable-authn-core core authentication module
--disable-authz-host host-based authorization control
--disable-authz-groupfile
'require group' authorization control
--disable-authz-user 'require user' authorization control
--enable-authz-dbm DBM-based authorization control
--enable-authz-owner 'require file-owner' authorization control
+ --enable-authz-dbd SQL based authorization and Login/Session support
+ --disable-authz-core core authorization provider vector module
--enable-authnz-ldap LDAP based authentication
- --disable-authz-default authorization control backstopper
+ --disable-access-compat mod_access compatibility
--disable-auth-basic basic authentication
+ --enable-auth-form form authentication
--enable-auth-digest RFC2617 Digest authentication
+ --enable-allowmethods restrict allowed HTTP methods
--enable-isapi isapi extension support
--enable-file-cache File cache
- --enable-cache dynamic file caching
- --enable-disk-cache disk caching module
- --enable-mem-cache memory caching module
+ --enable-cache dynamic file caching. At least one storage
+ management module (e.g. mod_cache_disk) is also
+ necessary.
+ --enable-cache-disk disk caching module
+ --enable-socache-shmcb shmcb small object cache provider
+ --enable-socache-dbm dbm small object cache provider
+ --enable-socache-memcache
+ memcache small object cache provider
+ --enable-socache-dc distcache small object cache provider
+ --enable-so DSO capability. This module will be automatically
+ enabled unless you build all modules statically.
+ --enable-watchdog Watchdog module
--enable-dbd Apache DBD Framework
- --enable-bucketeer buckets manipulation filter
+ --enable-bucketeer buckets manipulation filter. Useful only for
+ developers and testing purposes.
--enable-dumpio I/O dump filter
--enable-echo ECHO server
- --enable-example example and demo module
- --enable-case-filter example uppercase conversion filter
- --enable-case-filter-in example uppercase conversion input filter
- --enable-reqtimeout Limit time waiting for request from client
+ --enable-example-hooks Example hook callback handler module
+ --enable-case-filter Example uppercase conversion filter
+ --enable-case-filter-in Example uppercase conversion input filter
+ --enable-example-ipc Example of shared memory and mutex usage
+ --enable-buffer Filter Buffering
+ --enable-data RFC2397 data encoder
+ --enable-ratelimit Output Bandwidth Limiting
+ --disable-reqtimeout Limit time waiting for request from client
--enable-ext-filter external filter module
- --disable-include Server Side Includes
+ --enable-request Request Body Filtering
+ --enable-include Server Side Includes
--disable-filter Smart Filtering
+ --enable-reflector Reflect request through the output filter stack
--enable-substitute response content rewrite-like filtering
- --disable-charset-lite character set translation
- --enable-charset-lite character set translation
+ --enable-sed filter request and/or response bodies through sed
+ --disable-charset-lite character set translation. Enabled by default only
+ on EBCDIC systems.
+ --enable-charset-lite character set translation. Enabled by default only
+ on EBCDIC systems.
--enable-deflate Deflate transfer encoding support
+ --enable-xml2enc i18n support for markup filters
+ --enable-proxy-html Fix HTML Links in a Reverse Proxy
+ --enable-http HTTP protocol handling. The http module is a basic
+ one that enables the server to function as an HTTP
+ server. It is only useful to disable it if you want
+ to use another protocol module instead. Don't
+ disable this module unless you are really sure what
+ you are doing. Note: This module will always be
+ linked statically.
+ --disable-mime mapping of file-extension to MIME. Disabling this
+ module is normally not recommended.
--enable-ldap LDAP caching and connection pooling services
- --disable-log-config logging configuration
+ --disable-log-config logging configuration. You won't be able to log
+ requests to the server without this module.
+ --enable-log-debug configurable debug logging
--enable-log-forensic forensic logging
--enable-logio input and output logging
+ --enable-lua Apache Lua Framework
+ --enable-luajit Enable LuaJit Support
--disable-env clearing/setting of ENV vars
--enable-mime-magic automagically determining MIME type
--enable-cern-meta CERN-type meta files
--enable-expires Expires header control
- --enable-headers HTTP header control
+ --disable-headers HTTP header control
--enable-ident RFC 1413 identity check
--enable-usertrack user-session tracking
--enable-unique-id per-request unique ids
--disable-setenvif basing ENV vars on headers
--disable-version determining httpd version in config files
+ --enable-remoteip translate header contents to an apparent client
+ remote_ip
--enable-proxy Apache proxy module
- --enable-proxy-connect Apache proxy CONNECT module
- --enable-proxy-ftp Apache proxy FTP module
- --enable-proxy-http Apache proxy HTTP module
- --enable-proxy-scgi Apache proxy SCGI module
- --enable-proxy-ajp Apache proxy AJP module
- --enable-proxy-balancer Apache proxy BALANCER module
+ --enable-proxy-connect Apache proxy CONNECT module. Requires and is enabled
+ by --enable-proxy.
+ --enable-proxy-ftp Apache proxy FTP module. Requires and is enabled by
+ --enable-proxy.
+ --enable-proxy-http Apache proxy HTTP module. Requires and is enabled by
+ --enable-proxy.
+ --enable-proxy-fcgi Apache proxy FastCGI module. Requires and is enabled
+ by --enable-proxy.
+ --enable-proxy-scgi Apache proxy SCGI module. Requires and is enabled by
+ --enable-proxy.
+ --enable-proxy-fdpass Apache proxy to Unix Daemon Socket module. Requires
+ --enable-proxy.
+ --enable-proxy-ajp Apache proxy AJP module. Requires and is enabled by
+ --enable-proxy.
+ --enable-proxy-balancer Apache proxy BALANCER module. Requires and is
+ enabled by --enable-proxy.
+ --enable-proxy-express mass reverse-proxy module. Requires --enable-proxy.
+ --enable-session session module
+ --enable-session-cookie session cookie module
+ --enable-session-crypto session crypto module
+ --enable-session-dbd session dbd module
+ --enable-slotmem-shm slotmem provider that uses shared memory
+ --enable-slotmem-plain slotmem provider that uses plain memory
--enable-ssl SSL/TLS support (mod_ssl)
- --enable-distcache Select distcache support in mod_ssl
--enable-optional-hook-export
example optional hook exporter
--enable-optional-hook-import
@@ -1698,6 +1868,7 @@ Optional Features:
example optional function importer
--enable-optional-fn-export
example optional function exporter
+ --enable-dialup rate limits static files to dialup modem speeds
--enable-static-support Build a statically linked version of the support
binaries
--enable-static-htpasswd
@@ -1716,30 +1887,48 @@ Optional Features:
Build a statically linked version of htcacheclean
--enable-static-httxt2dbm
Build a statically linked version of httxt2dbm
- --enable-http HTTP protocol handling
- --disable-mime mapping of file-extension to MIME
- --enable-dav WebDAV protocol handling
+ --enable-static-fcgistarter
+ Build a statically linked version of fcgistarter
+ --enable-lbmethod-byrequests
+ Apache proxy Load balancing by request counting
+ --enable-lbmethod-bytraffic
+ Apache proxy Load balancing by traffic counting
+ --enable-lbmethod-bybusyness
+ Apache proxy Load balancing by busyness
+ --enable-lbmethod-heartbeat
+ Apache proxy Load balancing from Heartbeats
+ --enable-mpms-shared=MPM-LIST
+ Space-separated list of MPM modules to enable for
+ dynamic loading. MPM-LIST=list | "all"
+ --enable-unixd unix specific support
+ --enable-privileges Per-virtualhost Unix UserIDs and enhanced security
+ for Solaris
+ --enable-heartbeat Generates Heartbeats
+ --enable-heartmonitor Collects Heartbeats
+ --enable-dav WebDAV protocol handling. --enable-dav also enables
+ mod_dav_fs
--disable-status process/thread monitoring
--disable-autoindex directory listing
- --disable-asis as-is filetypes
+ --enable-asis as-is filetypes
--enable-info server information
--enable-suexec set uid and gid for spawned processes
- --disable-cgid CGI scripts
- --enable-cgi CGI scripts
- --disable-cgi CGI scripts
- --enable-cgid CGI scripts
- --enable-dav-fs DAV provider for the filesystem
- --enable-dav-lock DAV provider for generic locking
+ --enable-cgid CGI scripts. Enabled by default with threaded MPMs
+ --enable-cgi CGI scripts. Enabled by default with non-threaded
+ MPMs
+ --enable-dav-fs DAV provider for the filesystem. --enable-dav also
+ enables mod_dav_fs.
+ --enable-dav-lock DAV provider for generic locking - requires
+ --enable-dav
--enable-vhost-alias mass virtual hosting module
- --disable-negotiation content negotiation
+ --enable-negotiation content negotiation
--disable-dir directory request handling
--enable-imagemap server-side imagemaps
- --disable-actions Action triggering on requests
+ --enable-actions Action triggering on requests
--enable-speling correct common URL misspellings
- --disable-userdir mapping of requests to user-specific directories
+ --enable-userdir mapping of requests to user-specific directories
--disable-alias mapping of requests to different filesystem parts
--enable-rewrite rule based URL manipulation
- --enable-so DSO capability
+ --enable-v4-mapped Allow IPv6 sockets to handle IPv4 connections
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1752,11 +1941,15 @@ Optional Packages:
--with-pcre=PATH Use external PCRE library
--with-port=PORT Port on which to listen (default is 80)
--with-sslport=SSLPORT Port on which to securelisten (default is 443)
+ --with-distcache=DIR Distcache installation directory
--with-z=DIR use a specific zlib library
- --with-sslc=DIR RSA SSL-C SSL/TLS toolkit
- --with-ssl=DIR OpenSSL SSL/TLS toolkit
- --with-mpm=MPM Choose the process model for Apache to use.
- MPM={beos|event|worker|prefork|mpmt_os2|winnt}
+ --with-libxml2 location for libxml2
+ --with-lua=PATH Path to the Lua 5.1 prefix
+ --with-ssl=DIR OpenSSL base directory
+ --with-mpm=MPM Choose the process model for Apache to use by
+ default. MPM={event|worker|prefork|winnt} This will
+ be statically linked as the only available MPM
+ unless --enable-mpms-shared is also specified.
--with-module=module-type:module-file
Enable module-file in the modules/<module-type>
directory.
@@ -1777,7 +1970,7 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
@@ -1848,9 +2041,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.68
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1894,8 +2087,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1920,7 +2113,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
+ test $ac_status = 0; } > conftest.i && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1931,8 +2124,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -1944,10 +2137,10 @@ fi
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval \${$3+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -1983,7 +2176,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -2010,7 +2203,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2019,7 +2212,7 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_mongrel
@@ -2060,8 +2253,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -2074,7 +2267,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2092,7 +2285,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
@@ -2137,8 +2330,8 @@ fi
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -2150,7 +2343,7 @@ ac_fn_c_check_func ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2205,15 +2398,61 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+ (void) $as_decl_use;
+#else
+ (void) $as_decl_name;
+#endif
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2323,11 +2562,9 @@ trap 'exit_status=$?
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2361,11 +2598,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@ -2378,11 +2613,9 @@ _ASBOX
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
+ $as_echo "## ------------------- ##
## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
@@ -2396,11 +2629,9 @@ _ASBOX
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
cat confdefs.h
echo
@@ -2455,7 +2686,12 @@ _ACEOF
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2466,18 +2702,22 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -2546,7 +2786,7 @@ if $ac_cache_corrupted; then
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2564,16 +2804,22 @@ ac_config_headers="$ac_config_headers include/ap_config_auto.h"
ac_aux_dir=
for ac_dir in build "$srcdir"/build; do
- for ac_t in install-sh install.sh shtool; do
- if test -f "$ac_dir/$ac_t"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/$ac_t -c"
- break 2
- fi
- done
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2708,6 +2954,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+
+
+
+
+
# Check whether --enable-layout was given.
if test "${enable_layout+set}" = set; then :
enableval=$enable_layout;
@@ -2900,7 +3151,7 @@ do
eval ac_val=$`echo $ac_var`
case $ac_val in
[\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) as_fn_error "expected an absolute path for --$ac_var: $ac_val" "$LINENO" 5;;
+ *) as_fn_error $? "expected an absolute path for --$ac_var: $ac_val" "$LINENO" 5;;
esac
done
@@ -3586,7 +3837,7 @@ nl='
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mkdir -p" >&5
$as_echo_n "checking for working mkdir -p... " >&6; }
-if test "${ac_cv_mkdir_p+set}" = set; then :
+if ${ac_cv_mkdir_p+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -3609,31 +3860,166 @@ $as_echo "$ac_cv_mkdir_p" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST EGREP"
+
+
+
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -3651,14 +4037,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -3666,7 +4052,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -3684,14 +4070,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
+if ${ac_cv_target+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$target_alias" = x; then
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
@@ -3699,7 +4085,7 @@ fi
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -3734,12 +4120,8 @@ if test "${with_included_apr+set}" = set; then :
fi
-# Only APR 1.x is supported.
-apr_version=1
-
if test "x$with_included_apr" = "xyes"; then
apr_found=reconfig
- apr_config="$srcdir/srclib/apr/apr-${apr_version}-config"
else
apr_found="no"
@@ -3751,7 +4133,7 @@ else
TEST_X="test -x"
fi
- acceptable_majors="${apr_version}"
+ acceptable_majors="1 2"
apr_temp_acceptable_apr_config=""
for apr_temp_major in $acceptable_majors
@@ -3773,7 +4155,7 @@ $as_echo_n "checking for APR... " >&6; }
if test "${with_apr+set}" = set; then :
withval=$with_apr;
if test "$withval" = "no" || test "$withval" = "yes"; then
- as_fn_error "--with-apr requires a directory or file to be provided" "$LINENO" 5
+ as_fn_error $? "--with-apr requires a directory or file to be provided" "$LINENO" 5
fi
for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
@@ -3795,7 +4177,7 @@ if test "${with_apr+set}" = set; then :
fi
if test "$apr_found" != "yes"; then
- as_fn_error "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5
+ as_fn_error $? "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5
fi
else
@@ -3826,7 +4208,7 @@ else
apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \""$srcdir/srclib/apr"/include/apr_version.h\"`"
case $apr_bundled_major in
"")
- as_fn_error "failed to find major version of bundled APR" "$LINENO" 5
+ as_fn_error $? "failed to find major version of bundled APR" "$LINENO" 5
;;
0)
apr_temp_apr_config_file="apr-config"
@@ -3851,7 +4233,7 @@ $as_echo "$apr_found" >&6; }
fi
if test "$apr_found" = "no"; then
- as_fn_error "APR not found. Please read the documentation." "$LINENO" 5
+ as_fn_error $? "APR not found. Please read the documentation." "$LINENO" 5
fi
if test "$apr_found" = "reconfig"; then
@@ -3921,10 +4303,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -3982,9 +4375,9 @@ rm -f confcache
# grab any updates from the sub-package
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -4001,6 +4394,13 @@ fi
AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS apr"
+
+ for majorver in 1 2; do
+ test_apr_config="./srclib/apr/apr-${majorver}-config"
+ if test -f "$test_apr_config"; then
+ apr_config="$test_apr_config"
+ fi
+ done
fi
@@ -4057,6 +4457,7 @@ fi
done
fi
+INTERNAL_CPPFLAGS=""
if test "x$LDFLAGS" = "x"; then
test "x$silent" != "xyes" && echo " setting LDFLAGS to \"`$apr_config --ldflags`\""
@@ -4081,19 +4482,20 @@ fi
SHLIBPATH_VAR=`$apr_config --shlib-path-var`
APR_BINDIR=`$apr_config --bindir`
APR_INCLUDEDIR=`$apr_config --includedir`
+APR_INCLUDES=`$apr_config --includes`
APR_VERSION=`$apr_config --version`
-APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
+apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`
+APR_CONFIG="$APR_BINDIR/apr-${apr_major_version}-config"
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
-# Only APR-util 1.x is supported.
-apu_version=1
-
-if test "x$with_included_apr" = "xyes"; then
+if test "x${apr_major_version}" = "x2"; then
+ apu_found=obsolete
+elif test "x$with_included_apr" = "xyes"; then
apu_found=reconfig
- apu_config="${srcdir}/srclib/apr-util/apu-${apu_version}-config"
else
+
apu_found="no"
if test "$target_os" = "os2-emx"; then
@@ -4103,7 +4505,7 @@ else
TEST_X="test -x"
fi
- acceptable_majors="${apu_version}"
+ acceptable_majors="${apr_major_version}"
apu_temp_acceptable_apu_config=""
for apu_temp_major in $acceptable_majors
@@ -4125,7 +4527,7 @@ $as_echo_n "checking for APR-util... " >&6; }
if test "${with_apr_util+set}" = set; then :
withval=$with_apr_util;
if test "$withval" = "no" || test "$withval" = "yes"; then
- as_fn_error "--with-apr-util requires a directory or file to be provided" "$LINENO" 5
+ as_fn_error $? "--with-apr-util requires a directory or file to be provided" "$LINENO" 5
fi
for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
@@ -4147,7 +4549,7 @@ if test "${with_apr_util+set}" = set; then :
fi
if test "$apu_found" != "yes"; then
- as_fn_error "the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." "$LINENO" 5
+ as_fn_error $? "the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." "$LINENO" 5
fi
else
@@ -4178,7 +4580,7 @@ else
apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \""$srcdir/srclib/apr-util"/include/apu_version.h\"`"
case $apu_bundled_major in
"")
- as_fn_error "failed to find major version of bundled APU" "$LINENO" 5
+ as_fn_error $? "failed to find major version of bundled APU" "$LINENO" 5
;;
0)
apu_temp_apu_config_file="apu-config"
@@ -4200,19 +4602,20 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $apu_found" >&5
$as_echo "$apu_found" >&6; }
+
fi
if test "$apu_found" = "no"; then
- as_fn_error "APR-util not found. Please read the documentation." "$LINENO" 5
+ as_fn_error $? "APR-util not found. Please read the documentation." "$LINENO" 5
fi
# Catch some misconfigurations:
case ${apr_found}.${apu_found} in
reconfig.yes)
- as_fn_error "Cannot use an external APR-util with the bundled APR" "$LINENO" 5
+ as_fn_error $? "Cannot use an external APR-util with the bundled APR" "$LINENO" 5
;;
yes.reconfig)
- as_fn_error "Cannot use an external APR with the bundled APR-util" "$LINENO" 5
+ as_fn_error $? "Cannot use an external APR with the bundled APR-util" "$LINENO" 5
;;
esac
@@ -4283,10 +4686,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -4344,9 +4758,9 @@ rm -f confcache
# grab any updates from the sub-package
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -4363,8 +4777,13 @@ fi
AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
AP_CLEAN_SRCLIB_DIRS="apr-util $AP_CLEAN_SRCLIB_DIRS"
+ apu_config="./srclib/apr-util/apu-${apr_major_version}-config"
fi
+if test "$apu_found" = "obsolete"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: APR-util obsoleted, woohoo" >&5
+$as_echo "$as_me: APR-util obsoleted, woohoo" >&6;}
+else
if test "x$LDFLAGS" = "x"; then
test "x$silent" != "xyes" && echo " setting LDFLAGS to \"`$apu_config --ldflags`\""
@@ -4386,10 +4805,12 @@ fi
done
fi
-APU_BINDIR=`$apu_config --bindir`
-APU_INCLUDEDIR=`$apu_config --includedir`
-APU_VERSION=`$apu_config --version`
-APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
+ APU_BINDIR=`$apu_config --bindir`
+ APU_INCLUDEDIR=`$apu_config --includedir`
+ APU_INCLUDES=`$apu_config --includes`
+ APU_VERSION=`$apu_config --version`
+ APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -4401,7 +4822,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4441,7 +4862,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4494,7 +4915,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4534,7 +4955,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4593,7 +5014,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4637,7 +5058,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4691,8 +5112,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4713,32 +5134,30 @@ $as_echo "$ac_try_echo"; } >&5
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdio.h>
+
int
main ()
{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -4800,62 +5219,28 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
else
ac_file=''
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
if { { ac_try="$ac_link"
@@ -4885,19 +5270,78 @@ done
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4937,8 +5381,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -4948,7 +5392,7 @@ OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4985,7 +5429,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -5063,7 +5507,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -5170,7 +5614,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if ${ac_cv_prog_CPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -5200,7 +5644,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -5216,11 +5660,11 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -5259,7 +5703,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -5275,18 +5719,18 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -5296,6 +5740,184 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros. These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+ int x = 1234;
+ int y = 5678;
+ debug ("Flag");
+ debug ("X = %d\n", x);
+ showlist (The first, second, and third items.);
+ report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+ your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+ your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+ int datasize;
+ double data[];
+};
+
+struct named_init {
+ int number;
+ const wchar_t *name;
+ double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+ // See if C++-style comments work.
+ // Iterate through items via the restricted pointer.
+ // Also check for declarations in for loops.
+ for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+ continue;
+ return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+ va_list args;
+ va_start (args, format);
+ va_list args_copy;
+ va_copy (args_copy, args);
+
+ const char *str;
+ int number;
+ float fnumber;
+
+ while (*format)
+ {
+ switch (*format++)
+ {
+ case 's': // string
+ str = va_arg (args_copy, const char *);
+ break;
+ case 'd': // int
+ number = va_arg (args_copy, int);
+ break;
+ case 'f': // float
+ fnumber = va_arg (args_copy, double);
+ break;
+ default:
+ break;
+ }
+ }
+ va_end (args_copy);
+ va_end (args);
+}
+
+int
+main ()
+{
+
+ // Check bool.
+ _Bool success = false;
+
+ // Check restrict.
+ if (test_restrict ("String literal") == 0)
+ success = true;
+ char *restrict newvar = "Another string";
+
+ // Check varargs.
+ test_varargs ("s, d' f .", "string", 65, 34.234);
+ test_varargs_macros ();
+
+ // Check flexible array members.
+ struct incomplete_array *ia =
+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+ ia->datasize = 10;
+ for (int i = 0; i < ia->datasize; ++i)
+ ia->data[i] = i * 1.234;
+
+ // Check named initializers.
+ struct named_init ni = {
+ .number = 34,
+ .name = L"Test wide string",
+ .average = 543.34343,
+ };
+
+ ni.number = 58;
+
+ int dynamic_array[ni.number];
+ dynamic_array[ni.number - 1] = 543;
+
+ // work around unused variable warnings
+ return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+ || dynamic_array[ni.number - 1] != 543);
+
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c99"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+
+fi
+
+
+
if test "x${cache_file}" = "x/dev/null"; then
# Likewise, ensure that CC and CPP are passed through to the pcre
# configure script iff caching is disabled (the autoconf 2.5x default).
@@ -5312,12 +5934,11 @@ if test "${with_pcre+set}" = set; then :
fi
-case $with_pcre in
-yes) # Extract the first word of "pcre-config", so it can be a program name with args.
+# Extract the first word of "pcre-config", so it can be a program name with args.
set dummy pcre-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PCRE_CONFIG+set}" = set; then :
+if ${ac_cv_path_PCRE_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PCRE_CONFIG in
@@ -5353,230 +5974,78 @@ else
$as_echo "no" >&6; }
fi
- ;;
- /*) if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then
- PCRE_CONFIG=$with_pcre/bin/pcre-config
- elif test -x "$with_pcre"; then
- PCRE_CONFIG=$with_pcre
- fi
- if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
- as_fn_error "Did not find pcre-config script at $PCRE_CONFIG" "$LINENO" 5
- fi
- ;;
-*) PCRE_CONFIG=false ;;
-esac
+if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then
+ PCRE_CONFIG=$with_pcre/bin/pcre-config
+elif test -x "$with_pcre"; then
+ PCRE_CONFIG=$with_pcre
+fi
if test "$PCRE_CONFIG" != "false"; then
+ if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
+ as_fn_error $? "Did not find pcre-config script at $PCRE_CONFIG" "$LINENO" 5
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Using external PCRE library from $PCRE_CONFIG" >&5
$as_echo "$as_me: Using external PCRE library from $PCRE_CONFIG" >&6;}
- if test "x$CFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting CFLAGS to \"`$PCRE_CONFIG --cflags`\""
- CFLAGS="`$PCRE_CONFIG --cflags`"
+ if test "x$PCRE_INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting PCRE_INCLUDES to \"`$PCRE_CONFIG --cflags`\""
+ PCRE_INCLUDES="`$PCRE_CONFIG --cflags`"
else
apr_addto_bugger="`$PCRE_CONFIG --cflags`"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
- for j in $CFLAGS; do
+ for j in $PCRE_INCLUDES; do
if test "x$i" = "x$j"; then
apr_addto_duplicate="1"
break
fi
done
if test $apr_addto_duplicate = "0"; then
- test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
- CFLAGS="$CFLAGS $i"
+ test "x$silent" != "xyes" && echo " adding \"$i\" to PCRE_INCLUDES"
+ PCRE_INCLUDES="$PCRE_INCLUDES $i"
fi
done
fi
- if test "x$LIBS" = "x"; then
- test "x$silent" != "xyes" && echo " setting LIBS to \"`$PCRE_CONFIG --libs`\""
- LIBS="`$PCRE_CONFIG --libs`"
+ if test "x$PCRE_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting PCRE_LIBS to \"`$PCRE_CONFIG --libs`\""
+ PCRE_LIBS="`$PCRE_CONFIG --libs`"
else
apr_addto_bugger="`$PCRE_CONFIG --libs`"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
- for j in $LIBS; do
+ for j in $PCRE_LIBS; do
if test "x$i" = "x$j"; then
apr_addto_duplicate="1"
break
fi
done
if test $apr_addto_duplicate = "0"; then
- test "x$silent" != "xyes" && echo " adding \"$i\" to LIBS"
- LIBS="$LIBS $i"
+ test "x$silent" != "xyes" && echo " adding \"$i\" to PCRE_LIBS"
+ PCRE_LIBS="$PCRE_LIBS $i"
fi
done
fi
else
- # Build the bundled PCRE
- { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring PCRE regular expression library" >&5
-$as_echo "$as_me: Configuring PCRE regular expression library" >&6;}
-
-
- # save our work to this point; this allows the sub-package to use it
- cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
-
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
+ as_fn_error $? "pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/" "$LINENO" 5
fi
-rm -f confcache
-
- echo "configuring package in srclib/pcre now"
- ac_popdir=`pwd`
- apr_config_subdirs="srclib/pcre"
- test -d srclib/pcre || $mkdir_p srclib/pcre
- ac_abs_srcdir=`(cd $srcdir/srclib/pcre && pwd)`
- cd srclib/pcre
-
- # A "../" for each directory in /$config_subdirs.
- ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
- # Make the cache file pathname absolute for the subdirs
- # required to correctly handle subdirs that might actually
- # be symlinks
- case "$cache_file" in
- /*) # already absolute
- ac_sub_cache_file=$cache_file ;;
- *) # Was relative path.
- ac_sub_cache_file="$ac_popdir/$cache_file" ;;
- esac
-
- apr_configure_args=$ac_configure_args
-
- test "x$silent" = "xyes" && apr_configure_args="$apr_configure_args --silent"
-
- apr_configure_args="--disable-option-checking $apr_configure_args"
-
- if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir
- then :
- echo "srclib/pcre configured properly"
- else
- echo "configure failed for srclib/pcre"
- exit 1
- fi
- cd $ac_popdir
-
- # grab any updates from the sub-package
- if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST PCRE_LIBS"
+echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
- if test "x$AP_LIBS" = "x"; then
- test "x$silent" != "xyes" && echo " setting AP_LIBS to \"$abs_builddir/srclib/pcre/libpcre.la\""
- AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la"
- else
- apr_addto_bugger="$abs_builddir/srclib/pcre/libpcre.la"
- for i in $apr_addto_bugger; do
- apr_addto_duplicate="0"
- for j in $AP_LIBS; do
- if test "x$i" = "x$j"; then
- apr_addto_duplicate="1"
- break
- fi
- done
- if test $apr_addto_duplicate = "0"; then
- test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
- AP_LIBS="$AP_LIBS $i"
- fi
- done
- fi
if test "x$INCLUDES" = "x"; then
- test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_builddir)/srclib/pcre\""
- INCLUDES="-I\$(top_builddir)/srclib/pcre"
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I.\""
+ INCLUDES="-I."
else
- apr_addto_bugger="-I\$(top_builddir)/srclib/pcre"
+ apr_addto_bugger="-I."
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $INCLUDES; do
@@ -5593,19 +6062,13 @@ fi
fi
- AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS pcre"
- AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS pcre"
-fi
-
-echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
-
-
+if test "$abs_builddir" != "$abs_srcdir"; then
if test "x$INCLUDES" = "x"; then
- test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I.\""
- INCLUDES="-I."
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_builddir)/include\""
+ INCLUDES="-I\$(top_builddir)/include"
else
- apr_addto_bugger="-I."
+ apr_addto_bugger="-I\$(top_builddir)/include"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $INCLUDES; do
@@ -5621,14 +6084,14 @@ echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
done
fi
+fi
-if test "$abs_builddir" != "$abs_srcdir"; then
if test "x$INCLUDES" = "x"; then
- test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_builddir)/include\""
- INCLUDES="-I\$(top_builddir)/include"
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/include\""
+ INCLUDES="-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/include"
else
- apr_addto_bugger="-I\$(top_builddir)/include"
+ apr_addto_bugger="-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/include"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $INCLUDES; do
@@ -5644,14 +6107,16 @@ if test "$abs_builddir" != "$abs_srcdir"; then
done
fi
-fi
+# apr/apr-util --includes may pick up system paths for dependent
+# libraries, so ensure these are later in INCLUDES than local source
+# directories.
if test "x$INCLUDES" = "x"; then
- test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/generators -I\$(top_srcdir)/modules/mappers -I\$(top_srcdir)/modules/database\""
- INCLUDES="-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/generators -I\$(top_srcdir)/modules/mappers -I\$(top_srcdir)/modules/database"
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"$APR_INCLUDES\""
+ INCLUDES="$APR_INCLUDES"
else
- apr_addto_bugger="-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/generators -I\$(top_srcdir)/modules/mappers -I\$(top_srcdir)/modules/database"
+ apr_addto_bugger="$APR_INCLUDES"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $INCLUDES; do
@@ -5668,15 +6133,11 @@ fi
fi
-# apr/apr-util --includes may pick up system paths for dependent
-# libraries, so ensure these are later in INCLUDES than local source
-# directories.
-
if test "x$INCLUDES" = "x"; then
- test "x$silent" != "xyes" && echo " setting INCLUDES to \"`$apr_config --includes`\""
- INCLUDES="`$apr_config --includes`"
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"$APU_INCLUDES\""
+ INCLUDES="$APU_INCLUDES"
else
- apr_addto_bugger="`$apr_config --includes`"
+ apr_addto_bugger="$APU_INCLUDES"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $INCLUDES; do
@@ -5693,11 +6154,12 @@ fi
fi
+
if test "x$INCLUDES" = "x"; then
- test "x$silent" != "xyes" && echo " setting INCLUDES to \"`$apu_config --includes`\""
- INCLUDES="`$apu_config --includes`"
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"$PCRE_INCLUDES\""
+ INCLUDES="$PCRE_INCLUDES"
else
- apr_addto_bugger="`$apu_config --includes`"
+ apr_addto_bugger="$PCRE_INCLUDES"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $INCLUDES; do
@@ -5764,30 +6226,12 @@ esac
case $host in
*-apple-aux3*)
- test "x$silent" != "xyes" && echo " forcing APACHE_MPM to \"prefork\""
- APACHE_MPM="prefork"
-
-
- test "x$silent" != "xyes" && echo " forcing SINGLE_LISTEN_UNSERIALIZED_ACCEPT to \"1\""
- SINGLE_LISTEN_UNSERIALIZED_ACCEPT="1"
-
- ;;
- *-beos*)
-
- test "x$silent" != "xyes" && echo " forcing APACHE_MPM to \"beos\""
- APACHE_MPM="beos"
-
-
test "x$silent" != "xyes" && echo " forcing SINGLE_LISTEN_UNSERIALIZED_ACCEPT to \"1\""
SINGLE_LISTEN_UNSERIALIZED_ACCEPT="1"
;;
*os2-emx*)
- test "x$silent" != "xyes" && echo " forcing APACHE_MPM to \"mpmt_os2\""
- APACHE_MPM="mpmt_os2"
-
-
test "x$silent" != "xyes" && echo " forcing SINGLE_LISTEN_UNSERIALIZED_ACCEPT to \"1\""
SINGLE_LISTEN_UNSERIALIZED_ACCEPT="1"
@@ -5825,40 +6269,50 @@ case $host in
;;
*cygwin*)
- test "x$silent" != "xyes" && echo " forcing APACHE_MPM to \"prefork\""
- APACHE_MPM="prefork"
-
-
test "x$silent" != "xyes" && echo " forcing SINGLE_LISTEN_UNSERIALIZED_ACCEPT to \"1\""
SINGLE_LISTEN_UNSERIALIZED_ACCEPT="1"
;;
*mingw32*)
- test "x$silent" != "xyes" && echo " forcing APACHE_MPM to \"winnt\""
- APACHE_MPM="winnt"
-
-
- if test "x$CPPFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DAP_DECLARE_EXPORT\""
- CPPFLAGS="-DAP_DECLARE_EXPORT"
+ if test "x$INTERNAL_CPPFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INTERNAL_CPPFLAGS to \"-DAP_DECLARE_EXPORT\""
+ INTERNAL_CPPFLAGS="-DAP_DECLARE_EXPORT"
else
apr_addto_bugger="-DAP_DECLARE_EXPORT"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
- for j in $CPPFLAGS; do
+ for j in $INTERNAL_CPPFLAGS; do
if test "x$i" = "x$j"; then
apr_addto_duplicate="1"
break
fi
done
if test $apr_addto_duplicate = "0"; then
- test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $i"
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INTERNAL_CPPFLAGS"
+ INTERNAL_CPPFLAGS="$INTERNAL_CPPFLAGS $i"
fi
done
fi
+
+ if test -z "$ac_cv_func_times"; then
+ test "x$silent" != "xyes" && echo " setting ac_cv_func_times to \"no\""
+ ac_cv_func_times="no"
+ fi
+
+
+ if test -z "$ac_cv_func_getpwnam"; then
+ test "x$silent" != "xyes" && echo " setting ac_cv_func_getpwnam to \"no\""
+ ac_cv_func_getpwnam="no"
+ fi
+
+
+ if test -z "$ac_cv_func_getgrnam"; then
+ test "x$silent" != "xyes" && echo " setting ac_cv_func_getgrnam to \"no\""
+ ac_cv_func_getgrnam="no"
+ fi
+
;;
*aix*)
aixver=`echo $host | sed 's/^[^0-9]*//' | sed 's/\.//g'`
@@ -5888,7 +6342,7 @@ esac
set dummy rm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RM+set}" = set; then :
+if ${ac_cv_path_RM+:} false; then :
$as_echo_n "(cached) " >&6
else
case $RM in
@@ -5928,7 +6382,7 @@ fi
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKGCONFIG+set}" = set; then :
+if ${ac_cv_path_PKGCONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKGCONFIG in
@@ -5968,7 +6422,7 @@ fi
set dummy rsync; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RSYNC+set}" = set; then :
+if ${ac_cv_path_RSYNC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $RSYNC in
@@ -6010,7 +6464,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -6062,7 +6516,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -6102,7 +6556,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -6155,7 +6609,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LYNX_PATH+set}" = set; then :
+if ${ac_cv_prog_LYNX_PATH+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LYNX_PATH"; then
@@ -6208,139 +6662,9 @@ INSTALL="\$(LIBTOOL) --mode=install \$(abs_srcdir)/build/install.sh -c"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6457,8 +6781,7 @@ do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -6470,7 +6793,7 @@ done
ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
MINIX=yes
else
MINIX=
@@ -6492,7 +6815,7 @@ $as_echo "#define _MINIX 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6533,7 +6856,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
$as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -6567,11 +6890,11 @@ for ac_lib in '' cposix; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_strerror+set}" = set; then :
+ if ${ac_cv_search_strerror+:} false; then :
break
fi
done
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
else
ac_cv_search_strerror=no
@@ -6591,7 +6914,7 @@ fi
# Ensure that satisfactory versions of apr and apr-util are
# found if external copies are configured.
if test "${apr_found}" = "yes"; then
- # Require APR 1.2.x otherwise fail
+ # Require at least APR 1.3.x otherwise fail
@@ -6601,9 +6924,9 @@ if test "${apr_found}" = "yes"; then
ap_ckver_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR version 1.2.0 or later" >&5
-$as_echo_n "checking for APR version 1.2.0 or later... " >&6; }
-if test "${ap_cv_aprver12+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR version 1.3.0 or later" >&5
+$as_echo_n "checking for APR version 1.3.0 or later... " >&6; }
+if ${ap_cv_aprver13+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -6611,27 +6934,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <apr_version.h>
-#if APR_MAJOR_VERSION > 1 || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 2)
+#if APR_MAJOR_VERSION > 1 || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 3)
good
#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "good" >/dev/null 2>&1; then :
- ap_cv_aprver12=yes
+ ap_cv_aprver13=yes
else
- ap_cv_aprver12=no
+ ap_cv_aprver13=no
fi
rm -f conftest*
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_aprver12" >&5
-$as_echo "$ap_cv_aprver12" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_aprver13" >&5
+$as_echo "$ap_cv_aprver13" >&6; }
-if test "$ap_cv_aprver12" = "yes"; then
+if test "$ap_cv_aprver13" = "yes"; then
:
else
- as_fn_error "APR version 1.2.0 or later is required" "$LINENO" 5
+ as_fn_error $? "APR version 1.3.0 or later is required" "$LINENO" 5
fi
CPPFLAGS="$ap_ckver_CPPFLAGS"
@@ -6644,7 +6967,11 @@ CPPFLAGS="$ap_ckver_CPPFLAGS"
fi
if test "${apu_found}" = "yes"; then
- # Require APR-util 1.2.x otherwise fail
+ # Require at least APR-util 1.3.x otherwise fail
+ if test "${apr_found}" = "yes"; then
+ # we need to add the APR includes to CPPFLAGS
+ apu_ckver_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
@@ -6654,9 +6981,9 @@ if test "${apu_found}" = "yes"; then
ap_ckver_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS `$apu_config --includes`"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR-util version 1.2.0 or later" >&5
-$as_echo_n "checking for APR-util version 1.2.0 or later... " >&6; }
-if test "${ap_cv_apuver12+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR-util version 1.3.0 or later" >&5
+$as_echo_n "checking for APR-util version 1.3.0 or later... " >&6; }
+if ${ap_cv_apuver13+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -6664,27 +6991,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <apu_version.h>
-#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 2)
+#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
good
#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "good" >/dev/null 2>&1; then :
- ap_cv_apuver12=yes
+ ap_cv_apuver13=yes
else
- ap_cv_apuver12=no
+ ap_cv_apuver13=no
fi
rm -f conftest*
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_apuver12" >&5
-$as_echo "$ap_cv_apuver12" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_apuver13" >&5
+$as_echo "$ap_cv_apuver13" >&6; }
-if test "$ap_cv_apuver12" = "yes"; then
+if test "$ap_cv_apuver13" = "yes"; then
:
else
- as_fn_error "APR-util version 1.2.0 or later is required" "$LINENO" 5
+ as_fn_error $? "APR-util version 1.3.0 or later is required" "$LINENO" 5
fi
CPPFLAGS="$ap_ckver_CPPFLAGS"
@@ -6694,6 +7021,58 @@ CPPFLAGS="$ap_ckver_CPPFLAGS"
+ CPPFLAGS="$apu_ckver_CPPFLAGS"
+ else
+
+
+
+
+
+
+ap_ckver_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS `$apu_config --includes`"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR-util version 1.3.0 or later" >&5
+$as_echo_n "checking for APR-util version 1.3.0 or later... " >&6; }
+if ${ap_cv_apuver13+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <apu_version.h>
+#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
+good
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "good" >/dev/null 2>&1; then :
+ ap_cv_apuver13=yes
+else
+ ap_cv_apuver13=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_apuver13" >&5
+$as_echo "$ap_cv_apuver13" >&6; }
+
+if test "$ap_cv_apuver13" = "yes"; then
+ :
+else
+ as_fn_error $? "APR-util version 1.3.0 or later is required" "$LINENO" 5
+fi
+
+CPPFLAGS="$ap_ckver_CPPFLAGS"
+
+
+
+
+
+
+ fi
fi
@@ -6730,7 +7109,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6850,13 +7229,13 @@ grp.h \
strings.h \
sys/prctl.h \
sys/processor.h \
-sys/sem.h
+sys/sem.h \
+sys/sdt.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -6867,7 +7246,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+if ${ac_cv_header_sys_wait_h+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6910,7 +7289,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6989,9 +7368,11 @@ $as_echo "#define const /**/" >>confdefs.h
fi
+saved_LIBS="$LIBS"
+LIBS=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5
$as_echo_n "checking for library containing sqrt... " >&6; }
-if test "${ac_cv_search_sqrt+set}" = set; then :
+if ${ac_cv_search_sqrt+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -7025,11 +7406,11 @@ for ac_lib in '' m; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_sqrt+set}" = set; then :
+ if ${ac_cv_search_sqrt+:} false; then :
break
fi
done
-if test "${ac_cv_search_sqrt+set}" = set; then :
+if ${ac_cv_search_sqrt+:} false; then :
else
ac_cv_search_sqrt=no
@@ -7045,12 +7426,18 @@ if test "$ac_res" != no; then :
fi
+MATH_LIBS="$LIBS"
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MATH_LIBS"
+
+
+LIBS="$saved_LIBS"
saved_LIBS="$LIBS"
LIBS=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
$as_echo_n "checking for library containing crypt... " >&6; }
-if test "${ac_cv_search_crypt+set}" = set; then :
+if ${ac_cv_search_crypt+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -7084,11 +7471,11 @@ for ac_lib in '' crypt; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_crypt+set}" = set; then :
+ if ${ac_cv_search_crypt+:} false; then :
break
fi
done
-if test "${ac_cv_search_crypt+set}" = set; then :
+if ${ac_cv_search_crypt+:} false; then :
else
ac_cv_search_crypt=no
@@ -7119,13 +7506,13 @@ initgroups \
bindprocessor \
prctl \
timegm \
-getpgid
+getpgid \
+fopen64
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -7138,7 +7525,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for void pointer length" >&5
$as_echo_n "checking for void pointer length... " >&6; }
-if test "${ap_cv_void_ptr_lt_long+set}" = set; then :
+if ${ap_cv_void_ptr_lt_long+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -7166,13 +7553,48 @@ fi
$as_echo "$ap_cv_void_ptr_lt_long" >&6; }
if test "$ap_cv_void_ptr_lt_long" = "yes"; then
- as_fn_error "Size of \"void *\" is less than size of \"long\"" "$LINENO" 5
+ as_fn_error $? "Size of \"void *\" is less than size of \"long\"" "$LINENO" 5
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettid()" >&5
+$as_echo_n "checking for gettid()... " >&6; }
+if ${ac_cv_gettid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ ac_cv_gettid=no
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+int main(int argc, char **argv) {
+pid_t t = syscall(SYS_gettid); return t == -1 ? 1 : 0; }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_gettid=yes
+else
+ ac_cv_gettid=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gettid" >&5
+$as_echo "$ac_cv_gettid" >&6; }
+if test "$ac_cv_gettid" = "yes"; then
+
+$as_echo "#define HAVE_GETTID 1" >>confdefs.h
+
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5
$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
-if test "${ac_cv_struct_tm_gmtoff+set}" = set; then :
+if ${ac_cv_struct_tm_gmtoff+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7227,7 +7649,7 @@ esac
# Check whether --with-port was given.
if test "${with_port+set}" = set; then :
- withval=$with_port; if test "$withval" = "yes"; then as_fn_error "'option --with-port requires a value (the TCP port number)'" "$LINENO" 5; else PORT="$withval"; fi
+ withval=$with_port; if test "$withval" = "yes"; then as_fn_error $? "'option --with-port requires a value (the TCP port number)'" "$LINENO" 5; else PORT="$withval"; fi
else
PORT=80
fi
@@ -7236,60 +7658,93 @@ fi
# Check whether --with-sslport was given.
if test "${with_sslport+set}" = set; then :
- withval=$with_sslport; if test "$withval" = "yes"; then as_fn_error "'option --with-sslport requires a value (the SSL TCP port number)'" "$LINENO" 5; else SSLPORT="$withval"; fi
+ withval=$with_sslport; if test "$withval" = "yes"; then as_fn_error $? "'option --with-sslport requires a value (the SSL TCP port number)'" "$LINENO" 5; else SSLPORT="$withval"; fi
else
SSLPORT=443
fi
+DTRACE=true
+# Check whether --enable-dtrace was given.
+if test "${enable_dtrace+set}" = set; then :
+ enableval=$enable_dtrace;
+ enable_dtrace=$enableval
-apr_old_cppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $INCLUDES"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ if test "x$CPPFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DAPR_DTRACE_PROVIDER\""
+ CPPFLAGS="-DAPR_DTRACE_PROVIDER"
+ else
+ apr_addto_bugger="-DAPR_DTRACE_PROVIDER"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CPPFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $i"
+ fi
+ done
+ fi
-#include <apr.h>
-#if APR_HAVE_IPV6
-YES_IS_DEFINED
-#endif
+ as_fn_error $? "'DTrace Support in the build system is not complete. Patches Welcome!'" "$LINENO" 5
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
- ac_cv_define_APR_HAVE_IPV6=yes
else
- ac_cv_define_APR_HAVE_IPV6=no
+
+ enable_dtrace=no
+
fi
-rm -f conftest*
-CPPFLAGS=$apr_old_cppflags
+enable_dtrace=no
-# Check whether --enable-v4-mapped was given.
-if test "${enable_v4_mapped+set}" = set; then :
- enableval=$enable_v4_mapped;
- v4mapped=$enableval
+case $host in
+ *-solaris2*)
+ if test $enable_dtrace = "yes" -a "$ac_cv_header_sys_sdt_h" = "yes"; then
-else
+$as_echo "#define AP_ENABLE_DTRACE 1" >>confdefs.h
- case $host in
- *freebsd5*|*netbsd*|*openbsd*)
- v4mapped=no
- ;;
- *mingw*)
- v4mapped=no
- ;;
- *)
- v4mapped=yes
- ;;
+ DTRACE="/usr/sbin/dtrace $DTRACEFLAGS"
+ test -f include/apache_probes.h || $DTRACE -h -s apache_probes.d -o include/apache_probes.h
+ fi
+ ;;
esac
-fi
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST DTRACE"
-if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
-$as_echo "#define AP_ENABLE_V4_MAPPED 1" >>confdefs.h
+
+# Check whether --enable-hook-probes was given.
+if test "${enable_hook_probes+set}" = set; then :
+ enableval=$enable_hook_probes;
+
+$as_echo "#define AP_HOOK_PROBES_ENABLED 1" >>confdefs.h
+
+
+ if test "x$INTERNAL_CPPFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INTERNAL_CPPFLAGS to \"-DAP_HOOK_PROBES_ENABLED\""
+ INTERNAL_CPPFLAGS="-DAP_HOOK_PROBES_ENABLED"
+ else
+ apr_addto_bugger="-DAP_HOOK_PROBES_ENABLED"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INTERNAL_CPPFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INTERNAL_CPPFLAGS"
+ INTERNAL_CPPFLAGS="$INTERNAL_CPPFLAGS $i"
+ fi
+ done
+ fi
+
fi
@@ -7302,6 +7757,20 @@ $as_echo "#define AP_ENABLE_EXCEPTION_HOOK 1" >>confdefs.h
fi
+# Check whether --enable-load-all-modules was given.
+if test "${enable_load_all_modules+set}" = set; then :
+ enableval=$enable_load_all_modules;
+ LOAD_ALL_MODULES=$enableval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Setting \"LOAD_ALL_MODULES\" to $LOAD_ALL_MODULES" >&5
+$as_echo "$as_me: Setting \"LOAD_ALL_MODULES\" to $LOAD_ALL_MODULES" >&6;}
+
+else
+
+ LOAD_ALL_MODULES="no"
+
+fi
+
+
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode;
@@ -7326,6 +7795,648 @@ if test "${enable_maintainer_mode+set}" = set; then :
done
fi
+ if test "$GCC" = "yes"; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith\""
+ CFLAGS="-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith"
+ else
+ apr_addto_bugger="-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wdeclaration-after-statement" >&5
+$as_echo_n "checking whether gcc accepts -Wdeclaration-after-statement... " >&6; }
+if ${ac_cv_gcc__Wdeclaration_after_statement+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Wdeclaration_after_statement=yes
+else
+ ac_cv_gcc__Wdeclaration_after_statement=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Wdeclaration_after_statement" >&5
+$as_echo "$ac_cv_gcc__Wdeclaration_after_statement" >&6; }
+ if test "$ac_cv_gcc__Wdeclaration_after_statement" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Wdeclaration-after-statement\""
+ CFLAGS="-Wdeclaration-after-statement"
+ else
+ apr_addto_bugger="-Wdeclaration-after-statement"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Werror=declaration-after-statement" >&5
+$as_echo_n "checking whether gcc accepts -Werror=declaration-after-statement... " >&6; }
+if ${ac_cv_gcc__Werror_declaration_after_statement+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror=declaration-after-statement"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Werror_declaration_after_statement=yes
+else
+ ac_cv_gcc__Werror_declaration_after_statement=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Werror_declaration_after_statement" >&5
+$as_echo "$ac_cv_gcc__Werror_declaration_after_statement" >&6; }
+ if test "$ac_cv_gcc__Werror_declaration_after_statement" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Werror=declaration-after-statement\""
+ CFLAGS="-Werror=declaration-after-statement"
+ else
+ apr_addto_bugger="-Werror=declaration-after-statement"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wformat" >&5
+$as_echo_n "checking whether gcc accepts -Wformat... " >&6; }
+if ${ac_cv_gcc__Wformat+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wformat"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Wformat=yes
+else
+ ac_cv_gcc__Wformat=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Wformat" >&5
+$as_echo "$ac_cv_gcc__Wformat" >&6; }
+ if test "$ac_cv_gcc__Wformat" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Wformat\""
+ CFLAGS="-Wformat"
+ else
+ apr_addto_bugger="-Wformat"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wformat-security" >&5
+$as_echo_n "checking whether gcc accepts -Wformat-security... " >&6; }
+if ${ac_cv_gcc__Wformat_security+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wformat-security"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Wformat_security=yes
+else
+ ac_cv_gcc__Wformat_security=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Wformat_security" >&5
+$as_echo "$ac_cv_gcc__Wformat_security" >&6; }
+ if test "$ac_cv_gcc__Wformat_security" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Wformat-security\""
+ CFLAGS="-Wformat-security"
+ else
+ apr_addto_bugger="-Wformat-security"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Werror=format-security" >&5
+$as_echo_n "checking whether gcc accepts -Werror=format-security... " >&6; }
+if ${ac_cv_gcc__Werror_format_security+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror=format-security"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Werror_format_security=yes
+else
+ ac_cv_gcc__Werror_format_security=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Werror_format_security" >&5
+$as_echo "$ac_cv_gcc__Werror_format_security" >&6; }
+ if test "$ac_cv_gcc__Werror_format_security" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Werror=format-security\""
+ CFLAGS="-Werror=format-security"
+ else
+ apr_addto_bugger="-Werror=format-security"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+ elif test "$AIX_XLC" = "yes"; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro\""
+ CFLAGS="-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro"
+ else
+ apr_addto_bugger="-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ if test "x$enable_load_all_modules" = "x"; then
+ LOAD_ALL_MODULES=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Maintainer mode setting \"LOAD_ALL_MODULES\" to $LOAD_ALL_MODULES" >&5
+$as_echo "$as_me: Maintainer mode setting \"LOAD_ALL_MODULES\" to $LOAD_ALL_MODULES" >&6;}
+ fi
+
+fi
+
+# Check whether --enable-debugger-mode was given.
+if test "${enable_debugger_mode+set}" = set; then :
+ enableval=$enable_debugger_mode;
+
+ if test "x$CPPFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DAP_DEBUG\""
+ CPPFLAGS="-DAP_DEBUG"
+ else
+ apr_addto_bugger="-DAP_DEBUG"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CPPFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $i"
+ fi
+ done
+ fi
+
+ if test "$GCC" = "yes"; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith -O0\""
+ CFLAGS="-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith -O0"
+ else
+ apr_addto_bugger="-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith -O0"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wdeclaration-after-statement" >&5
+$as_echo_n "checking whether gcc accepts -Wdeclaration-after-statement... " >&6; }
+if ${ac_cv_gcc__Wdeclaration_after_statement+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Wdeclaration_after_statement=yes
+else
+ ac_cv_gcc__Wdeclaration_after_statement=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Wdeclaration_after_statement" >&5
+$as_echo "$ac_cv_gcc__Wdeclaration_after_statement" >&6; }
+ if test "$ac_cv_gcc__Wdeclaration_after_statement" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Wdeclaration-after-statement\""
+ CFLAGS="-Wdeclaration-after-statement"
+ else
+ apr_addto_bugger="-Wdeclaration-after-statement"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Werror=declaration-after-statement" >&5
+$as_echo_n "checking whether gcc accepts -Werror=declaration-after-statement... " >&6; }
+if ${ac_cv_gcc__Werror_declaration_after_statement+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror=declaration-after-statement"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Werror_declaration_after_statement=yes
+else
+ ac_cv_gcc__Werror_declaration_after_statement=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Werror_declaration_after_statement" >&5
+$as_echo "$ac_cv_gcc__Werror_declaration_after_statement" >&6; }
+ if test "$ac_cv_gcc__Werror_declaration_after_statement" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Werror=declaration-after-statement\""
+ CFLAGS="-Werror=declaration-after-statement"
+ else
+ apr_addto_bugger="-Werror=declaration-after-statement"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wformat" >&5
+$as_echo_n "checking whether gcc accepts -Wformat... " >&6; }
+if ${ac_cv_gcc__Wformat+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wformat"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Wformat=yes
+else
+ ac_cv_gcc__Wformat=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Wformat" >&5
+$as_echo "$ac_cv_gcc__Wformat" >&6; }
+ if test "$ac_cv_gcc__Wformat" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Wformat\""
+ CFLAGS="-Wformat"
+ else
+ apr_addto_bugger="-Wformat"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wformat-security" >&5
+$as_echo_n "checking whether gcc accepts -Wformat-security... " >&6; }
+if ${ac_cv_gcc__Wformat_security+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wformat-security"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Wformat_security=yes
+else
+ ac_cv_gcc__Wformat_security=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Wformat_security" >&5
+$as_echo "$ac_cv_gcc__Wformat_security" >&6; }
+ if test "$ac_cv_gcc__Wformat_security" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Wformat-security\""
+ CFLAGS="-Wformat-security"
+ else
+ apr_addto_bugger="-Wformat-security"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+
+
+ if test "$GCC" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Werror=format-security" >&5
+$as_echo_n "checking whether gcc accepts -Werror=format-security... " >&6; }
+if ${ac_cv_gcc__Werror_format_security+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror=format-security"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo() { return 0; }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_gcc__Werror_format_security=yes
+else
+ ac_cv_gcc__Werror_format_security=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc__Werror_format_security" >&5
+$as_echo "$ac_cv_gcc__Werror_format_security" >&6; }
+ if test "$ac_cv_gcc__Werror_format_security" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-Werror=format-security\""
+ CFLAGS="-Werror=format-security"
+ else
+ apr_addto_bugger="-Werror=format-security"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+
+
+ elif test "$AIX_XLC" = "yes"; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro\""
+ CFLAGS="-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro"
+ else
+ apr_addto_bugger="-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+ fi
fi
@@ -7337,7 +8448,7 @@ fi
if test "$enable_pie" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts PIE flags" >&5
$as_echo_n "checking whether $CC accepts PIE flags... " >&6; }
-if test "${ap_cv_cc_pie+set}" = set; then :
+if ${ap_cv_cc_pie+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -7371,7 +8482,7 @@ $as_echo "$ap_cv_cc_pie" >&6; }
PICFLAGS="-fPIE"
PILDFLAGS="-pie"
else
- as_fn_error "--enable-pie requested but $CC failed using PIE flags" "$LINENO" 5
+ as_fn_error $? "--enable-pie requested but $CC failed using PIE flags" "$LINENO" 5
fi
fi
@@ -7379,34 +8490,87 @@ fi
prefix="$orig_prefix"
- module_selection=default
- module_default=yes
+ module_selection=most
+ module_default=shared
+
+
+apr_old_cppflags=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $INCLUDES"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <apr.h>
+#if APR_HAS_DSO
+YES_IS_DEFINED
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
+ ac_cv_define_APR_HAS_DSO=yes
+else
+ ac_cv_define_APR_HAS_DSO=no
+fi
+rm -f conftest*
+
+CPPFLAGS=$apr_old_cppflags
+
+
+ if test $ac_cv_define_APR_HAS_DSO = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing DSO support - building static modules by default." >&5
+$as_echo "$as_me: WARNING: Missing DSO support - building static modules by default." >&2;}
+ module_default=static
+ fi
+
# Check whether --enable-modules was given.
if test "${enable_modules+set}" = set; then :
enableval=$enable_modules;
+ if test "$enableval" = "none"; then
+ module_default=no
+ module_selection=none
+ else
+ for i in $enableval; do
+ if test "$i" = "all" -o "$i" = "most" -o "$i" = "few" -o "$i" = "reallyall"
+ then
+ module_selection=$i
+ else
+ i=`echo $i | sed 's/-/_/g'`
+ eval "enable_$i=shared"
+ fi
+ done
+ fi
+
+fi
+
+
+ # Check whether --enable-mods-shared was given.
+if test "${enable_mods_shared+set}" = set; then :
+ enableval=$enable_mods_shared;
for i in $enableval; do
- if test "$i" = "all" -o "$i" = "most"; then
+ if test "$i" = "all" -o "$i" = "most" -o "$i" = "few" -o "$i" = "reallyall"
+ then
module_selection=$i
+ module_default=shared
else
i=`echo $i | sed 's/-/_/g'`
- eval "enable_$i=yes"
+ eval "enable_$i=shared"
fi
done
fi
- # Check whether --enable-mods-shared was given.
-if test "${enable_mods_shared+set}" = set; then :
- enableval=$enable_mods_shared;
+ # Check whether --enable-mods-static was given.
+if test "${enable_mods_static+set}" = set; then :
+ enableval=$enable_mods_static;
for i in $enableval; do
- if test "$i" = "all" -o "$i" = "most"; then
+ if test "$i" = "all" -o "$i" = "most" -o "$i" = "few" -o "$i" = "reallyall"; then
module_selection=$i
- module_default=shared
+ module_default=static
else
i=`echo $i | sed 's/-/_/g'`
- eval "enable_$i=shared"
+ eval "enable_$i=static"
fi
done
@@ -7431,36 +8595,51 @@ fi
$as_echo_n "checking whether to enable mod_authn_file... " >&6; }
# Check whether --enable-authn-file was given.
if test "${enable_authn_file+set}" = set; then :
- enableval=$enable_authn_file;
+ enableval=$enable_authn_file; force_authn_file=$enableval
else
enable_authn_file=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authn_file" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authn_file" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authn_file" = "static"; then
- enable_authn_file=yes
+ enable_authn_file=static
elif test "$enable_authn_file" = "yes"; then
enable_authn_file=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authn_file" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authn_file=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authn_file" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authn_file=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authn_file" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authn_file=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authn_file=no
fi
+ elif test "$enable_authn_file" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authn_file" != "no" ; then
+ enable_authn_file=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authn_file" != "no"; then
:
@@ -7469,18 +8648,21 @@ fi
$as_echo "$enable_authn_file$_apmod_extra_msg" >&6; }
if test "$enable_authn_file" != "no"; then
case "$enable_authn_file" in
- shared*)
- enable_authn_file=`echo $enable_authn_file|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authn_file"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authn_file"
if test "authn_file" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authn_file=`echo $enable_authn_file|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authn_file"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_file"
+ fi
+ ;;
esac
@@ -7500,6 +8682,29 @@ $as_echo "$enable_authn_file$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHN_FILE_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHN_FILE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHN_FILE_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHN_FILE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHN_FILE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authn_file.la"
@@ -7524,36 +8729,51 @@ EOF
$as_echo_n "checking whether to enable mod_authn_dbm... " >&6; }
# Check whether --enable-authn-dbm was given.
if test "${enable_authn_dbm+set}" = set; then :
- enableval=$enable_authn_dbm;
+ enableval=$enable_authn_dbm; force_authn_dbm=$enableval
else
enable_authn_dbm=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authn_dbm" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authn_dbm" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authn_dbm" = "static"; then
- enable_authn_dbm=yes
+ enable_authn_dbm=static
elif test "$enable_authn_dbm" = "yes"; then
enable_authn_dbm=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authn_dbm" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authn_dbm=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authn_dbm" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authn_dbm=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authn_dbm" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authn_dbm=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authn_dbm=no
fi
+ elif test "$enable_authn_dbm" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authn_dbm" != "no" ; then
+ enable_authn_dbm=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authn_dbm" != "no"; then
:
@@ -7562,18 +8782,21 @@ fi
$as_echo "$enable_authn_dbm$_apmod_extra_msg" >&6; }
if test "$enable_authn_dbm" != "no"; then
case "$enable_authn_dbm" in
- shared*)
- enable_authn_dbm=`echo $enable_authn_dbm|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authn_dbm"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authn_dbm"
if test "authn_dbm" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authn_dbm=`echo $enable_authn_dbm|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authn_dbm"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_dbm"
+ fi
+ ;;
esac
@@ -7593,6 +8816,29 @@ $as_echo "$enable_authn_dbm$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHN_DBM_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHN_DBM_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHN_DBM_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHN_DBM_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHN_DBM_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authn_dbm.la"
@@ -7617,36 +8863,51 @@ EOF
$as_echo_n "checking whether to enable mod_authn_anon... " >&6; }
# Check whether --enable-authn-anon was given.
if test "${enable_authn_anon+set}" = set; then :
- enableval=$enable_authn_anon;
+ enableval=$enable_authn_anon; force_authn_anon=$enableval
else
enable_authn_anon=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authn_anon" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authn_anon" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authn_anon" = "static"; then
- enable_authn_anon=yes
+ enable_authn_anon=static
elif test "$enable_authn_anon" = "yes"; then
enable_authn_anon=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authn_anon" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authn_anon=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authn_anon" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authn_anon=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authn_anon" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authn_anon=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authn_anon=no
fi
+ elif test "$enable_authn_anon" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authn_anon" != "no" ; then
+ enable_authn_anon=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authn_anon" != "no"; then
:
@@ -7655,18 +8916,21 @@ fi
$as_echo "$enable_authn_anon$_apmod_extra_msg" >&6; }
if test "$enable_authn_anon" != "no"; then
case "$enable_authn_anon" in
- shared*)
- enable_authn_anon=`echo $enable_authn_anon|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authn_anon"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authn_anon"
if test "authn_anon" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authn_anon=`echo $enable_authn_anon|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authn_anon"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_anon"
+ fi
+ ;;
esac
@@ -7686,6 +8950,29 @@ $as_echo "$enable_authn_anon$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHN_ANON_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHN_ANON_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHN_ANON_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHN_ANON_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHN_ANON_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authn_anon.la"
@@ -7710,36 +8997,51 @@ EOF
$as_echo_n "checking whether to enable mod_authn_dbd... " >&6; }
# Check whether --enable-authn-dbd was given.
if test "${enable_authn_dbd+set}" = set; then :
- enableval=$enable_authn_dbd;
+ enableval=$enable_authn_dbd; force_authn_dbd=$enableval
else
enable_authn_dbd=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authn_dbd" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authn_dbd" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authn_dbd" = "static"; then
- enable_authn_dbd=yes
+ enable_authn_dbd=static
elif test "$enable_authn_dbd" = "yes"; then
enable_authn_dbd=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authn_dbd" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authn_dbd=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authn_dbd" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authn_dbd=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authn_dbd" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authn_dbd=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authn_dbd=no
fi
+ elif test "$enable_authn_dbd" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authn_dbd" != "no" ; then
+ enable_authn_dbd=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authn_dbd" != "no"; then
:
@@ -7748,18 +9050,21 @@ fi
$as_echo "$enable_authn_dbd$_apmod_extra_msg" >&6; }
if test "$enable_authn_dbd" != "no"; then
case "$enable_authn_dbd" in
- shared*)
- enable_authn_dbd=`echo $enable_authn_dbd|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authn_dbd"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authn_dbd"
if test "authn_dbd" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authn_dbd=`echo $enable_authn_dbd|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authn_dbd"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_dbd"
+ fi
+ ;;
esac
@@ -7779,6 +9084,29 @@ $as_echo "$enable_authn_dbd$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHN_DBD_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHN_DBD_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHN_DBD_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHN_DBD_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHN_DBD_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authn_dbd.la"
@@ -7799,66 +9127,83 @@ EOF
fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_default" >&5
-$as_echo_n "checking whether to enable mod_authn_default... " >&6; }
- # Check whether --enable-authn-default was given.
-if test "${enable_authn_default+set}" = set; then :
- enableval=$enable_authn_default;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_socache" >&5
+$as_echo_n "checking whether to enable mod_authn_socache... " >&6; }
+ # Check whether --enable-authn-socache was given.
+if test "${enable_authn_socache+set}" = set; then :
+ enableval=$enable_authn_socache; force_authn_socache=$enableval
else
- enable_authn_default=yes
+ enable_authn_socache=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authn_default" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
- if test "$enable_authn_default" = "static"; then
- enable_authn_default=yes
- elif test "$enable_authn_default" = "yes"; then
- enable_authn_default=$module_default
+ case "$enable_authn_socache" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_authn_socache" = "static"; then
+ enable_authn_socache=static
+ elif test "$enable_authn_socache" = "yes"; then
+ enable_authn_socache=$module_default
+ elif test "$enable_authn_socache" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_authn_socache=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_authn_socache=no
+ fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authn_default" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_authn_default=$module_default
+ elif test "$enable_authn_socache" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_authn_socache=$module_default
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authn_default" != "yes"; then
- enable_authn_default=no
- fi
- elif test "$enable_authn_default" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_authn_default=$module_default
- _apmod_extra_msg=" (all)"
else
- enable_authn_default=no
+ enable_authn_socache=no
fi
+ elif test "$enable_authn_socache" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authn_socache" != "no" ; then
+ enable_authn_socache=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
- if test "$enable_authn_default" != "no"; then
+ if test "$enable_authn_socache" != "no"; then
:
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_default$_apmod_extra_msg" >&5
-$as_echo "$enable_authn_default$_apmod_extra_msg" >&6; }
- if test "$enable_authn_default" != "no"; then
- case "$enable_authn_default" in
- shared*)
- enable_authn_default=`echo $enable_authn_default|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authn_default"
- ;;
- *)
- MODLIST="$MODLIST authn_default"
- if test "authn_default" = "so"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_socache$_apmod_extra_msg" >&5
+$as_echo "$enable_authn_socache$_apmod_extra_msg" >&6; }
+ if test "$enable_authn_socache" != "no"; then
+ case "$enable_authn_socache" in
+ static*)
+ MODLIST="$MODLIST authn_socache"
+ if test "authn_socache" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authn_socache=`echo $enable_authn_socache|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authn_socache"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_socache"
+ fi
+ ;;
esac
if test -z ""; then
- objects="mod_authn_default.lo"
+ objects="mod_authn_socache.lo"
else
objects=""
fi
@@ -7866,27 +9211,50 @@ $as_echo "$enable_authn_default$_apmod_extra_msg" >&6; }
if test -z "$module_standalone"; then
if test -z "$shared"; then
# The filename of a convenience library must have a "lib" prefix:
- libname="libmod_authn_default.la"
+ libname="libmod_authn_socache.la"
BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
modpath_static="$modpath_static $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $objects
- \$(MOD_LINK) $objects \$(MOD_AUTHN_DEFAULT_LDADD)
+ \$(MOD_LINK) $objects \$(MOD_AUTHN_SOCACHE_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHN_SOCACHE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHN_SOCACHE_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHN_SOCACHE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHN_SOCACHE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
- libname="mod_authn_default.la"
+ libname="mod_authn_socache.la"
shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
modpath_shared="$modpath_shared $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_AUTHN_DEFAULT_LDADD)
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_AUTHN_SOCACHE_LDADD)
EOF
fi
fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_AUTHN_DEFAULT_LDADD"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_AUTHN_SOCACHE_LDADD"
@@ -7894,65 +9262,83 @@ EOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_alias" >&5
-$as_echo_n "checking whether to enable mod_authn_alias... " >&6; }
- # Check whether --enable-authn-alias was given.
-if test "${enable_authn_alias+set}" = set; then :
- enableval=$enable_authn_alias;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authn_core" >&5
+$as_echo_n "checking whether to enable mod_authn_core... " >&6; }
+ # Check whether --enable-authn-core was given.
+if test "${enable_authn_core+set}" = set; then :
+ enableval=$enable_authn_core; force_authn_core=$enableval
else
- enable_authn_alias=no
+ enable_authn_core=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authn_alias" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
- if test "$enable_authn_alias" = "static"; then
- enable_authn_alias=yes
- elif test "$enable_authn_alias" = "yes"; then
- enable_authn_alias=$module_default
+ case "$enable_authn_core" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_authn_core" = "static"; then
+ enable_authn_core=static
+ elif test "$enable_authn_core" = "yes"; then
+ enable_authn_core=$module_default
+ elif test "$enable_authn_core" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_authn_core=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_authn_core=no
+ fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authn_alias" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_authn_alias=$module_default
+ elif test "$enable_authn_core" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_authn_core=$module_default
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authn_alias" != "yes"; then
- enable_authn_alias=no
- fi
- elif test "$enable_authn_alias" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_authn_alias=$module_default
- _apmod_extra_msg=" (all)"
else
- enable_authn_alias=no
+ enable_authn_core=no
fi
+ elif test "$enable_authn_core" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authn_core" != "no" ; then
+ enable_authn_core=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
- if test "$enable_authn_alias" != "no"; then
+ if test "$enable_authn_core" != "no"; then
:
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_alias$_apmod_extra_msg" >&5
-$as_echo "$enable_authn_alias$_apmod_extra_msg" >&6; }
- if test "$enable_authn_alias" != "no"; then
- case "$enable_authn_alias" in
- shared*)
- enable_authn_alias=`echo $enable_authn_alias|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authn_alias"
- ;;
- *)
- MODLIST="$MODLIST authn_alias"
- if test "authn_alias" = "so"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authn_core$_apmod_extra_msg" >&5
+$as_echo "$enable_authn_core$_apmod_extra_msg" >&6; }
+ if test "$enable_authn_core" != "no"; then
+ case "$enable_authn_core" in
+ static*)
+ MODLIST="$MODLIST authn_core"
+ if test "authn_core" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authn_core=`echo $enable_authn_core|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authn_core"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authn_core"
+ fi
+ ;;
esac
if test -z ""; then
- objects="mod_authn_alias.lo"
+ objects="mod_authn_core.lo"
else
objects=""
fi
@@ -7960,27 +9346,50 @@ $as_echo "$enable_authn_alias$_apmod_extra_msg" >&6; }
if test -z "$module_standalone"; then
if test -z "$shared"; then
# The filename of a convenience library must have a "lib" prefix:
- libname="libmod_authn_alias.la"
+ libname="libmod_authn_core.la"
BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
modpath_static="$modpath_static $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $objects
- \$(MOD_LINK) $objects \$(MOD_AUTHN_ALIAS_LDADD)
+ \$(MOD_LINK) $objects \$(MOD_AUTHN_CORE_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHN_CORE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHN_CORE_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHN_CORE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHN_CORE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
- libname="mod_authn_alias.la"
+ libname="mod_authn_core.la"
shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
modpath_shared="$modpath_shared $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_AUTHN_ALIAS_LDADD)
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_AUTHN_CORE_LDADD)
EOF
fi
fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_AUTHN_ALIAS_LDADD"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_AUTHN_CORE_LDADD"
@@ -7992,36 +9401,51 @@ EOF
$as_echo_n "checking whether to enable mod_authz_host... " >&6; }
# Check whether --enable-authz-host was given.
if test "${enable_authz_host+set}" = set; then :
- enableval=$enable_authz_host;
+ enableval=$enable_authz_host; force_authz_host=$enableval
else
enable_authz_host=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authz_host" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authz_host" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authz_host" = "static"; then
- enable_authz_host=yes
+ enable_authz_host=static
elif test "$enable_authz_host" = "yes"; then
enable_authz_host=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_host" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authz_host=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authz_host" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authz_host=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_host" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authz_host=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authz_host=no
fi
+ elif test "$enable_authz_host" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authz_host" != "no" ; then
+ enable_authz_host=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authz_host" != "no"; then
:
@@ -8030,18 +9454,21 @@ fi
$as_echo "$enable_authz_host$_apmod_extra_msg" >&6; }
if test "$enable_authz_host" != "no"; then
case "$enable_authz_host" in
- shared*)
- enable_authz_host=`echo $enable_authz_host|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authz_host"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authz_host"
if test "authz_host" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authz_host=`echo $enable_authz_host|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authz_host"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_host"
+ fi
+ ;;
esac
@@ -8061,6 +9488,29 @@ $as_echo "$enable_authz_host$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHZ_HOST_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHZ_HOST_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHZ_HOST_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHZ_HOST_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHZ_HOST_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authz_host.la"
@@ -8085,36 +9535,51 @@ EOF
$as_echo_n "checking whether to enable mod_authz_groupfile... " >&6; }
# Check whether --enable-authz-groupfile was given.
if test "${enable_authz_groupfile+set}" = set; then :
- enableval=$enable_authz_groupfile;
+ enableval=$enable_authz_groupfile; force_authz_groupfile=$enableval
else
enable_authz_groupfile=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authz_groupfile" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authz_groupfile" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authz_groupfile" = "static"; then
- enable_authz_groupfile=yes
+ enable_authz_groupfile=static
elif test "$enable_authz_groupfile" = "yes"; then
enable_authz_groupfile=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_groupfile" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authz_groupfile=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authz_groupfile" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authz_groupfile=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_groupfile" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authz_groupfile=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authz_groupfile=no
fi
+ elif test "$enable_authz_groupfile" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authz_groupfile" != "no" ; then
+ enable_authz_groupfile=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authz_groupfile" != "no"; then
:
@@ -8123,18 +9588,21 @@ fi
$as_echo "$enable_authz_groupfile$_apmod_extra_msg" >&6; }
if test "$enable_authz_groupfile" != "no"; then
case "$enable_authz_groupfile" in
- shared*)
- enable_authz_groupfile=`echo $enable_authz_groupfile|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authz_groupfile"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authz_groupfile"
if test "authz_groupfile" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authz_groupfile=`echo $enable_authz_groupfile|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authz_groupfile"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_groupfile"
+ fi
+ ;;
esac
@@ -8154,6 +9622,29 @@ $as_echo "$enable_authz_groupfile$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHZ_GROUPFILE_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHZ_GROUPFILE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHZ_GROUPFILE_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHZ_GROUPFILE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHZ_GROUPFILE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authz_groupfile.la"
@@ -8178,36 +9669,51 @@ EOF
$as_echo_n "checking whether to enable mod_authz_user... " >&6; }
# Check whether --enable-authz-user was given.
if test "${enable_authz_user+set}" = set; then :
- enableval=$enable_authz_user;
+ enableval=$enable_authz_user; force_authz_user=$enableval
else
enable_authz_user=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authz_user" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authz_user" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authz_user" = "static"; then
- enable_authz_user=yes
+ enable_authz_user=static
elif test "$enable_authz_user" = "yes"; then
enable_authz_user=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_user" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authz_user=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authz_user" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authz_user=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_user" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authz_user=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authz_user=no
fi
+ elif test "$enable_authz_user" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authz_user" != "no" ; then
+ enable_authz_user=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authz_user" != "no"; then
:
@@ -8216,18 +9722,21 @@ fi
$as_echo "$enable_authz_user$_apmod_extra_msg" >&6; }
if test "$enable_authz_user" != "no"; then
case "$enable_authz_user" in
- shared*)
- enable_authz_user=`echo $enable_authz_user|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authz_user"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authz_user"
if test "authz_user" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authz_user=`echo $enable_authz_user|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authz_user"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_user"
+ fi
+ ;;
esac
@@ -8247,6 +9756,29 @@ $as_echo "$enable_authz_user$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHZ_USER_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHZ_USER_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHZ_USER_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHZ_USER_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHZ_USER_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authz_user.la"
@@ -8271,36 +9803,51 @@ EOF
$as_echo_n "checking whether to enable mod_authz_dbm... " >&6; }
# Check whether --enable-authz-dbm was given.
if test "${enable_authz_dbm+set}" = set; then :
- enableval=$enable_authz_dbm;
+ enableval=$enable_authz_dbm; force_authz_dbm=$enableval
else
enable_authz_dbm=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authz_dbm" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authz_dbm" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authz_dbm" = "static"; then
- enable_authz_dbm=yes
+ enable_authz_dbm=static
elif test "$enable_authz_dbm" = "yes"; then
enable_authz_dbm=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_dbm" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authz_dbm=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authz_dbm" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authz_dbm=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_dbm" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authz_dbm=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authz_dbm=no
fi
+ elif test "$enable_authz_dbm" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authz_dbm" != "no" ; then
+ enable_authz_dbm=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authz_dbm" != "no"; then
:
@@ -8309,18 +9856,21 @@ fi
$as_echo "$enable_authz_dbm$_apmod_extra_msg" >&6; }
if test "$enable_authz_dbm" != "no"; then
case "$enable_authz_dbm" in
- shared*)
- enable_authz_dbm=`echo $enable_authz_dbm|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authz_dbm"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authz_dbm"
if test "authz_dbm" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authz_dbm=`echo $enable_authz_dbm|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authz_dbm"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_dbm"
+ fi
+ ;;
esac
@@ -8340,6 +9890,29 @@ $as_echo "$enable_authz_dbm$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHZ_DBM_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHZ_DBM_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHZ_DBM_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHZ_DBM_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHZ_DBM_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authz_dbm.la"
@@ -8364,36 +9937,51 @@ EOF
$as_echo_n "checking whether to enable mod_authz_owner... " >&6; }
# Check whether --enable-authz-owner was given.
if test "${enable_authz_owner+set}" = set; then :
- enableval=$enable_authz_owner;
+ enableval=$enable_authz_owner; force_authz_owner=$enableval
else
enable_authz_owner=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authz_owner" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authz_owner" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authz_owner" = "static"; then
- enable_authz_owner=yes
+ enable_authz_owner=static
elif test "$enable_authz_owner" = "yes"; then
enable_authz_owner=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_owner" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authz_owner=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authz_owner" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authz_owner=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authz_owner" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authz_owner=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authz_owner=no
fi
+ elif test "$enable_authz_owner" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authz_owner" != "no" ; then
+ enable_authz_owner=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authz_owner" != "no"; then
:
@@ -8402,18 +9990,21 @@ fi
$as_echo "$enable_authz_owner$_apmod_extra_msg" >&6; }
if test "$enable_authz_owner" != "no"; then
case "$enable_authz_owner" in
- shared*)
- enable_authz_owner=`echo $enable_authz_owner|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authz_owner"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authz_owner"
if test "authz_owner" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authz_owner=`echo $enable_authz_owner|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authz_owner"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_owner"
+ fi
+ ;;
esac
@@ -8433,6 +10024,29 @@ $as_echo "$enable_authz_owner$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHZ_OWNER_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHZ_OWNER_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHZ_OWNER_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHZ_OWNER_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHZ_OWNER_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authz_owner.la"
@@ -8453,56 +10067,403 @@ EOF
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authz_dbd" >&5
+$as_echo_n "checking whether to enable mod_authz_dbd... " >&6; }
+ # Check whether --enable-authz-dbd was given.
+if test "${enable_authz_dbd+set}" = set; then :
+ enableval=$enable_authz_dbd; force_authz_dbd=$enableval
+else
+ enable_authz_dbd=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_authz_dbd" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_authz_dbd" = "static"; then
+ enable_authz_dbd=static
+ elif test "$enable_authz_dbd" = "yes"; then
+ enable_authz_dbd=$module_default
+ elif test "$enable_authz_dbd" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_authz_dbd=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_authz_dbd=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_authz_dbd" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_authz_dbd=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_authz_dbd=no
+ fi
+ elif test "$enable_authz_dbd" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authz_dbd" != "no" ; then
+ enable_authz_dbd=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_authz_dbd" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authz_dbd$_apmod_extra_msg" >&5
+$as_echo "$enable_authz_dbd$_apmod_extra_msg" >&6; }
+ if test "$enable_authz_dbd" != "no"; then
+ case "$enable_authz_dbd" in
+ static*)
+ MODLIST="$MODLIST authz_dbd"
+ if test "authz_dbd" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_authz_dbd=`echo $enable_authz_dbd|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authz_dbd"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_dbd"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_authz_dbd.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_authz_dbd.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_AUTHZ_DBD_LDADD)
+EOF
+ if test ! -z "\$(MOD_AUTHZ_DBD_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHZ_DBD_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHZ_DBD_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHZ_DBD_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_authz_dbd.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_AUTHZ_DBD_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_AUTHZ_DBD_LDADD"
+
+
+
+ fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authz_core" >&5
+$as_echo_n "checking whether to enable mod_authz_core... " >&6; }
+ # Check whether --enable-authz-core was given.
+if test "${enable_authz_core+set}" = set; then :
+ enableval=$enable_authz_core; force_authz_core=$enableval
+else
+ enable_authz_core=yes
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_authz_core" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_authz_core" = "static"; then
+ enable_authz_core=static
+ elif test "$enable_authz_core" = "yes"; then
+ enable_authz_core=$module_default
+ elif test "$enable_authz_core" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_authz_core=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_authz_core=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_authz_core" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_authz_core=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_authz_core=no
+ fi
+ elif test "$enable_authz_core" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authz_core" != "no" ; then
+ enable_authz_core=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_authz_core" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authz_core$_apmod_extra_msg" >&5
+$as_echo "$enable_authz_core$_apmod_extra_msg" >&6; }
+ if test "$enable_authz_core" != "no"; then
+ case "$enable_authz_core" in
+ static*)
+ MODLIST="$MODLIST authz_core"
+ if test "authz_core" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_authz_core=`echo $enable_authz_core|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authz_core"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authz_core"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_authz_core.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_authz_core.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_AUTHZ_CORE_LDADD)
+EOF
+ if test ! -z "\$(MOD_AUTHZ_CORE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHZ_CORE_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHZ_CORE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHZ_CORE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_authz_core.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_AUTHZ_CORE_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_AUTHZ_CORE_LDADD"
+
+
+
+ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authnz_ldap" >&5
$as_echo_n "checking whether to enable mod_authnz_ldap... " >&6; }
# Check whether --enable-authnz-ldap was given.
if test "${enable_authnz_ldap+set}" = set; then :
- enableval=$enable_authnz_ldap;
+ enableval=$enable_authnz_ldap; force_authnz_ldap=$enableval
else
- enable_authnz_ldap=no
+ enable_authnz_ldap=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authnz_ldap" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_authnz_ldap" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_authnz_ldap" = "static"; then
- enable_authnz_ldap=yes
+ enable_authnz_ldap=static
elif test "$enable_authnz_ldap" = "yes"; then
enable_authnz_ldap=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authnz_ldap" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_authnz_ldap=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authnz_ldap" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_authnz_ldap=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_authnz_ldap" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_authnz_ldap=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_authnz_ldap=no
fi
+ elif test "$enable_authnz_ldap" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_authnz_ldap" != "no" ; then
+ enable_authnz_ldap=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_authnz_ldap" != "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
$as_echo "checking dependencies" >&6; }
- MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_AUTHNZ_LDAP_LDADD=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap support in apr/apr-util" >&5
+$as_echo_n "checking for ldap support in apr/apr-util... " >&6; }
+if ${ac_cv_APR_HAS_LDAP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ apache_old_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCLUDES"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <apr_ldap.h>
+#if APR_HAS_LDAP
+YES_IS_DEFINED
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
+ ac_cv_APR_HAS_LDAP=yes
+else
+ ac_cv_APR_HAS_LDAP=no
+fi
+rm -f conftest*
+
+ CPPFLAGS="$apache_old_cppflags"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_APR_HAS_LDAP" >&5
+$as_echo "$ac_cv_APR_HAS_LDAP" >&6; }
+
+ if test "$ac_cv_APR_HAS_LDAP" = "yes" ; then
+ if test -z "$apu_config" ; then
+ LDAP_LIBS="`$apr_config --ldap-libs`"
+ else
+ LDAP_LIBS="`$apu_config --ldap-libs`"
+ fi
+
+ if test "x$MOD_AUTHNZ_LDAP_LDADD" = "x"; then
+ test "x$silent" != "xyes" && echo " setting MOD_AUTHNZ_LDAP_LDADD to \"$LDAP_LIBS\""
+ MOD_AUTHNZ_LDAP_LDADD="$LDAP_LIBS"
+ else
+ apr_addto_bugger="$LDAP_LIBS"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $MOD_AUTHNZ_LDAP_LDADD; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_AUTHNZ_LDAP_LDADD"
+ MOD_AUTHNZ_LDAP_LDADD="$MOD_AUTHNZ_LDAP_LDADD $i"
+ fi
+ done
+ fi
+
+
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: apr/apr-util is compiled without ldap support" >&5
+$as_echo "$as_me: WARNING: apr/apr-util is compiled without ldap support" >&2;}
+ enable_authnz_ldap=no
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authnz_ldap" >&5
$as_echo_n "checking whether to enable mod_authnz_ldap... " >&6; }
if test "$enable_authnz_ldap" = "no"; then
- if test "$_apmod_error_fatal" = "no"; then
+ if test "$_apmod_required" = "no"; then
_apmod_extra_msg=" (disabled)"
else
- as_fn_error "mod_authnz_ldap has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ as_fn_error $? "mod_authnz_ldap has been requested but can not be built due to prerequisite failures" "$LINENO" 5
fi
fi
fi
@@ -8510,18 +10471,21 @@ $as_echo_n "checking whether to enable mod_authnz_ldap... " >&6; }
$as_echo "$enable_authnz_ldap$_apmod_extra_msg" >&6; }
if test "$enable_authnz_ldap" != "no"; then
case "$enable_authnz_ldap" in
- shared*)
- enable_authnz_ldap=`echo $enable_authnz_ldap|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authnz_ldap"
- ;;
- *)
+ static*)
MODLIST="$MODLIST authnz_ldap"
if test "authnz_ldap" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_authnz_ldap=`echo $enable_authnz_ldap|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES authnz_ldap"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},authnz_ldap"
+ fi
+ ;;
esac
@@ -8541,6 +10505,29 @@ $as_echo "$enable_authnz_ldap$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTHNZ_LDAP_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTHNZ_LDAP_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTHNZ_LDAP_LDADD)\""
+ AP_LIBS="\$(MOD_AUTHNZ_LDAP_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTHNZ_LDAP_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_authnz_ldap.la"
@@ -8562,65 +10549,83 @@ EOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_authz_default" >&5
-$as_echo_n "checking whether to enable mod_authz_default... " >&6; }
- # Check whether --enable-authz-default was given.
-if test "${enable_authz_default+set}" = set; then :
- enableval=$enable_authz_default;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_access_compat" >&5
+$as_echo_n "checking whether to enable mod_access_compat... " >&6; }
+ # Check whether --enable-access-compat was given.
+if test "${enable_access_compat+set}" = set; then :
+ enableval=$enable_access_compat; force_access_compat=$enableval
else
- enable_authz_default=yes
+ enable_access_compat=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_authz_default" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
- if test "$enable_authz_default" = "static"; then
- enable_authz_default=yes
- elif test "$enable_authz_default" = "yes"; then
- enable_authz_default=$module_default
+ case "$enable_access_compat" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_access_compat" = "static"; then
+ enable_access_compat=static
+ elif test "$enable_access_compat" = "yes"; then
+ enable_access_compat=$module_default
+ elif test "$enable_access_compat" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_access_compat=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_access_compat=no
+ fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authz_default" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_authz_default=$module_default
+ elif test "$enable_access_compat" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_access_compat=$module_default
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_authz_default" != "yes"; then
- enable_authz_default=no
- fi
- elif test "$enable_authz_default" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_authz_default=$module_default
- _apmod_extra_msg=" (all)"
else
- enable_authz_default=no
+ enable_access_compat=no
fi
+ elif test "$enable_access_compat" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_access_compat" != "no" ; then
+ enable_access_compat=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
- if test "$enable_authz_default" != "no"; then
+ if test "$enable_access_compat" != "no"; then
:
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_authz_default$_apmod_extra_msg" >&5
-$as_echo "$enable_authz_default$_apmod_extra_msg" >&6; }
- if test "$enable_authz_default" != "no"; then
- case "$enable_authz_default" in
- shared*)
- enable_authz_default=`echo $enable_authz_default|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES authz_default"
- ;;
- *)
- MODLIST="$MODLIST authz_default"
- if test "authz_default" = "so"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_access_compat$_apmod_extra_msg" >&5
+$as_echo "$enable_access_compat$_apmod_extra_msg" >&6; }
+ if test "$enable_access_compat" != "no"; then
+ case "$enable_access_compat" in
+ static*)
+ MODLIST="$MODLIST access_compat"
+ if test "access_compat" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_access_compat=`echo $enable_access_compat|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES access_compat"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},access_compat"
+ fi
+ ;;
esac
if test -z ""; then
- objects="mod_authz_default.lo"
+ objects="mod_access_compat.lo"
else
objects=""
fi
@@ -8628,27 +10633,50 @@ $as_echo "$enable_authz_default$_apmod_extra_msg" >&6; }
if test -z "$module_standalone"; then
if test -z "$shared"; then
# The filename of a convenience library must have a "lib" prefix:
- libname="libmod_authz_default.la"
+ libname="libmod_access_compat.la"
BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
modpath_static="$modpath_static $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $objects
- \$(MOD_LINK) $objects \$(MOD_AUTHZ_DEFAULT_LDADD)
+ \$(MOD_LINK) $objects \$(MOD_ACCESS_COMPAT_LDADD)
EOF
+ if test ! -z "\$(MOD_ACCESS_COMPAT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_ACCESS_COMPAT_LDADD)\""
+ AP_LIBS="\$(MOD_ACCESS_COMPAT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_ACCESS_COMPAT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
- libname="mod_authz_default.la"
+ libname="mod_access_compat.la"
shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
modpath_shared="$modpath_shared $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_AUTHZ_DEFAULT_LDADD)
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_ACCESS_COMPAT_LDADD)
EOF
fi
fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_AUTHZ_DEFAULT_LDADD"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_ACCESS_COMPAT_LDADD"
@@ -8661,36 +10689,51 @@ EOF
$as_echo_n "checking whether to enable mod_auth_basic... " >&6; }
# Check whether --enable-auth-basic was given.
if test "${enable_auth_basic+set}" = set; then :
- enableval=$enable_auth_basic;
+ enableval=$enable_auth_basic; force_auth_basic=$enableval
else
enable_auth_basic=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_auth_basic" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_auth_basic" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_auth_basic" = "static"; then
- enable_auth_basic=yes
+ enable_auth_basic=static
elif test "$enable_auth_basic" = "yes"; then
enable_auth_basic=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_auth_basic" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_auth_basic=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_auth_basic" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_auth_basic=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_auth_basic" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_auth_basic=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_auth_basic=no
fi
+ elif test "$enable_auth_basic" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_auth_basic" != "no" ; then
+ enable_auth_basic=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_auth_basic" != "no"; then
:
@@ -8699,18 +10742,21 @@ fi
$as_echo "$enable_auth_basic$_apmod_extra_msg" >&6; }
if test "$enable_auth_basic" != "no"; then
case "$enable_auth_basic" in
- shared*)
- enable_auth_basic=`echo $enable_auth_basic|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES auth_basic"
- ;;
- *)
+ static*)
MODLIST="$MODLIST auth_basic"
if test "auth_basic" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_auth_basic=`echo $enable_auth_basic|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES auth_basic"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},auth_basic"
+ fi
+ ;;
esac
@@ -8730,6 +10776,29 @@ $as_echo "$enable_auth_basic$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTH_BASIC_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTH_BASIC_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTH_BASIC_LDADD)\""
+ AP_LIBS="\$(MOD_AUTH_BASIC_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTH_BASIC_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_auth_basic.la"
@@ -8750,40 +10819,189 @@ EOF
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_auth_form" >&5
+$as_echo_n "checking whether to enable mod_auth_form... " >&6; }
+ # Check whether --enable-auth-form was given.
+if test "${enable_auth_form+set}" = set; then :
+ enableval=$enable_auth_form; force_auth_form=$enableval
+else
+ enable_auth_form=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_auth_form" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_auth_form" = "static"; then
+ enable_auth_form=static
+ elif test "$enable_auth_form" = "yes"; then
+ enable_auth_form=$module_default
+ elif test "$enable_auth_form" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_auth_form=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_auth_form=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_auth_form" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_auth_form=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_auth_form=no
+ fi
+ elif test "$enable_auth_form" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_auth_form" != "no" ; then
+ enable_auth_form=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_auth_form" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_auth_form$_apmod_extra_msg" >&5
+$as_echo "$enable_auth_form$_apmod_extra_msg" >&6; }
+ if test "$enable_auth_form" != "no"; then
+ case "$enable_auth_form" in
+ static*)
+ MODLIST="$MODLIST auth_form"
+ if test "auth_form" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_auth_form=`echo $enable_auth_form|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES auth_form"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},auth_form"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_auth_form.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_auth_form.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_AUTH_FORM_LDADD)
+EOF
+ if test ! -z "\$(MOD_AUTH_FORM_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTH_FORM_LDADD)\""
+ AP_LIBS="\$(MOD_AUTH_FORM_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTH_FORM_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_auth_form.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_AUTH_FORM_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_AUTH_FORM_LDADD"
+
+
+
+ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_auth_digest" >&5
$as_echo_n "checking whether to enable mod_auth_digest... " >&6; }
# Check whether --enable-auth-digest was given.
if test "${enable_auth_digest+set}" = set; then :
- enableval=$enable_auth_digest;
+ enableval=$enable_auth_digest; force_auth_digest=$enableval
else
enable_auth_digest=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_auth_digest" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_auth_digest" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_auth_digest" = "static"; then
- enable_auth_digest=yes
+ enable_auth_digest=static
elif test "$enable_auth_digest" = "yes"; then
enable_auth_digest=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_auth_digest" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_auth_digest=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_auth_digest" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_auth_digest=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_auth_digest" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_auth_digest=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_auth_digest=no
fi
+ elif test "$enable_auth_digest" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_auth_digest" != "no" ; then
+ enable_auth_digest=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_auth_digest" != "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -8820,10 +11038,10 @@ CPPFLAGS=$apr_old_cppflags
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_auth_digest" >&5
$as_echo_n "checking whether to enable mod_auth_digest... " >&6; }
if test "$enable_auth_digest" = "no"; then
- if test "$_apmod_error_fatal" = "no"; then
+ if test "$_apmod_required" = "no"; then
_apmod_extra_msg=" (disabled)"
else
- as_fn_error "mod_auth_digest has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ as_fn_error $? "mod_auth_digest has been requested but can not be built due to prerequisite failures" "$LINENO" 5
fi
fi
fi
@@ -8831,18 +11049,21 @@ $as_echo_n "checking whether to enable mod_auth_digest... " >&6; }
$as_echo "$enable_auth_digest$_apmod_extra_msg" >&6; }
if test "$enable_auth_digest" != "no"; then
case "$enable_auth_digest" in
- shared*)
- enable_auth_digest=`echo $enable_auth_digest|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES auth_digest"
- ;;
- *)
+ static*)
MODLIST="$MODLIST auth_digest"
if test "auth_digest" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_auth_digest=`echo $enable_auth_digest|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES auth_digest"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},auth_digest"
+ fi
+ ;;
esac
@@ -8862,6 +11083,29 @@ $as_echo "$enable_auth_digest$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTH_DIGEST_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTH_DIGEST_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTH_DIGEST_LDADD)\""
+ AP_LIBS="\$(MOD_AUTH_DIGEST_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTH_DIGEST_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_auth_digest.la"
@@ -8883,6 +11127,163 @@ EOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_allowmethods" >&5
+$as_echo_n "checking whether to enable mod_allowmethods... " >&6; }
+ # Check whether --enable-allowmethods was given.
+if test "${enable_allowmethods+set}" = set; then :
+ enableval=$enable_allowmethods; force_allowmethods=$enableval
+else
+ enable_allowmethods=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_allowmethods" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_allowmethods" = "static"; then
+ enable_allowmethods=static
+ elif test "$enable_allowmethods" = "yes"; then
+ enable_allowmethods=$module_default
+ elif test "$enable_allowmethods" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_allowmethods=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_allowmethods=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_allowmethods" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_allowmethods=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_allowmethods=no
+ fi
+ elif test "$enable_allowmethods" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_allowmethods" != "no" ; then
+ enable_allowmethods=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_allowmethods" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_allowmethods$_apmod_extra_msg" >&5
+$as_echo "$enable_allowmethods$_apmod_extra_msg" >&6; }
+ if test "$enable_allowmethods" != "no"; then
+ case "$enable_allowmethods" in
+ static*)
+ MODLIST="$MODLIST allowmethods"
+ if test "allowmethods" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_allowmethods=`echo $enable_allowmethods|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES allowmethods"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},allowmethods"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_allowmethods.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_allowmethods.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_ALLOWMETHODS_LDADD)
+EOF
+ if test ! -z "\$(MOD_ALLOWMETHODS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_ALLOWMETHODS_LDADD)\""
+ AP_LIBS="\$(MOD_ALLOWMETHODS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_ALLOWMETHODS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_allowmethods.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_ALLOWMETHODS_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_ALLOWMETHODS_LDADD"
+
+
+
+ fi
+
+
+
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+
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
@@ -8912,36 +11313,51 @@ EOF
$as_echo_n "checking whether to enable mod_isapi... " >&6; }
# Check whether --enable-isapi was given.
if test "${enable_isapi+set}" = set; then :
- enableval=$enable_isapi;
+ enableval=$enable_isapi; force_isapi=$enableval
else
enable_isapi=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_isapi" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_isapi" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_isapi" = "static"; then
- enable_isapi=yes
+ enable_isapi=static
elif test "$enable_isapi" = "yes"; then
enable_isapi=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_isapi" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_isapi=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_isapi" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_isapi=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_isapi" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_isapi=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_isapi=no
fi
+ elif test "$enable_isapi" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_isapi" != "no" ; then
+ enable_isapi=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_isapi" != "no"; then
:
@@ -8950,18 +11366,21 @@ fi
$as_echo "$enable_isapi$_apmod_extra_msg" >&6; }
if test "$enable_isapi" != "no"; then
case "$enable_isapi" in
- shared*)
- enable_isapi=`echo $enable_isapi|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES isapi"
- ;;
- *)
+ static*)
MODLIST="$MODLIST isapi"
if test "isapi" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_isapi=`echo $enable_isapi|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES isapi"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},isapi"
+ fi
+ ;;
esac
@@ -8981,6 +11400,29 @@ $as_echo "$enable_isapi$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_ISAPI_LDADD)
EOF
+ if test ! -z "\$(MOD_ISAPI_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_ISAPI_LDADD)\""
+ AP_LIBS="\$(MOD_ISAPI_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_ISAPI_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_isapi.la"
@@ -9031,36 +11473,51 @@ EOF
$as_echo_n "checking whether to enable mod_file_cache... " >&6; }
# Check whether --enable-file-cache was given.
if test "${enable_file_cache+set}" = set; then :
- enableval=$enable_file_cache;
+ enableval=$enable_file_cache; force_file_cache=$enableval
else
- enable_file_cache=no
+ enable_file_cache=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_file_cache" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_file_cache" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_file_cache" = "static"; then
- enable_file_cache=yes
+ enable_file_cache=static
elif test "$enable_file_cache" = "yes"; then
enable_file_cache=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_file_cache" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_file_cache=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_file_cache" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_file_cache=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_file_cache" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_file_cache=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_file_cache=no
fi
+ elif test "$enable_file_cache" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_file_cache" != "no" ; then
+ enable_file_cache=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_file_cache" != "no"; then
:
@@ -9069,18 +11526,21 @@ fi
$as_echo "$enable_file_cache$_apmod_extra_msg" >&6; }
if test "$enable_file_cache" != "no"; then
case "$enable_file_cache" in
- shared*)
- enable_file_cache=`echo $enable_file_cache|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES file_cache"
- ;;
- *)
+ static*)
MODLIST="$MODLIST file_cache"
if test "file_cache" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_file_cache=`echo $enable_file_cache|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES file_cache"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},file_cache"
+ fi
+ ;;
esac
@@ -9100,6 +11560,29 @@ $as_echo "$enable_file_cache$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_FILE_CACHE_LDADD)
EOF
+ if test ! -z "\$(MOD_FILE_CACHE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_FILE_CACHE_LDADD)\""
+ AP_LIBS="\$(MOD_FILE_CACHE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_FILE_CACHE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_file_cache.la"
@@ -9121,42 +11604,66 @@ EOF
cache_objs="mod_cache.lo cache_storage.lo cache_util.lo "
-mem_cache_objs="mod_mem_cache.lo cache_cache.lo cache_pqueue.lo cache_hash.lo "
+cache_disk_objs="mod_cache_disk.lo"
+
+case "$host" in
+ *os2*)
+ # OS/2 DLLs must resolve all symbols at build time
+ # and we need some from main cache module
+ cache_disk_objs="$cache_disk_objs mod_cache.la"
+ ;;
+esac
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_cache" >&5
$as_echo_n "checking whether to enable mod_cache... " >&6; }
# Check whether --enable-cache was given.
if test "${enable_cache+set}" = set; then :
- enableval=$enable_cache;
+ enableval=$enable_cache; force_cache=$enableval
else
- enable_cache=no
+ enable_cache=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_cache" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_cache" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_cache" = "static"; then
- enable_cache=yes
+ enable_cache=static
elif test "$enable_cache" = "yes"; then
enable_cache=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cache" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_cache=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_cache" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_cache=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cache" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_cache=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_cache=no
fi
+ elif test "$enable_cache" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_cache" != "no" ; then
+ enable_cache=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_cache" != "no"; then
:
@@ -9165,18 +11672,21 @@ fi
$as_echo "$enable_cache$_apmod_extra_msg" >&6; }
if test "$enable_cache" != "no"; then
case "$enable_cache" in
- shared*)
- enable_cache=`echo $enable_cache|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES cache"
- ;;
- *)
+ static*)
MODLIST="$MODLIST cache"
if test "cache" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_cache=`echo $enable_cache|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES cache"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cache"
+ fi
+ ;;
esac
@@ -9196,6 +11706,29 @@ $as_echo "$enable_cache$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CACHE_LDADD)
EOF
+ if test ! -z "\$(MOD_CACHE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CACHE_LDADD)\""
+ AP_LIBS="\$(MOD_CACHE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CACHE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_cache.la"
@@ -9216,65 +11749,354 @@ EOF
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_disk_cache" >&5
-$as_echo_n "checking whether to enable mod_disk_cache... " >&6; }
- # Check whether --enable-disk-cache was given.
-if test "${enable_disk_cache+set}" = set; then :
- enableval=$enable_disk_cache;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_cache_disk" >&5
+$as_echo_n "checking whether to enable mod_cache_disk... " >&6; }
+ # Check whether --enable-cache-disk was given.
+if test "${enable_cache_disk+set}" = set; then :
+ enableval=$enable_cache_disk; force_cache_disk=$enableval
else
- enable_disk_cache=no
+ enable_cache_disk=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_disk_cache" = "most"; then
- _apmod_error_fatal="no"
+ case "$enable_cache_disk" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_cache_disk" = "static"; then
+ enable_cache_disk=static
+ elif test "$enable_cache_disk" = "yes"; then
+ enable_cache_disk=$module_default
+ elif test "$enable_cache_disk" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_cache_disk=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_cache_disk=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_cache_disk" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_cache_disk=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_cache_disk=no
+ fi
+ elif test "$enable_cache_disk" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_cache_disk" != "no" ; then
+ enable_cache_disk=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_cache_disk" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cache_disk$_apmod_extra_msg" >&5
+$as_echo "$enable_cache_disk$_apmod_extra_msg" >&6; }
+ if test "$enable_cache_disk" != "no"; then
+ case "$enable_cache_disk" in
+ static*)
+ MODLIST="$MODLIST cache_disk"
+ if test "cache_disk" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_cache_disk=`echo $enable_cache_disk|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES cache_disk"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cache_disk"
+ fi
+ ;;
+ esac
+
+
+ if test -z "$cache_disk_objs"; then
+ objects="mod_cache_disk.lo"
+ else
+ objects="$cache_disk_objs"
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_cache_disk.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_CACHE_DISK_LDADD)
+EOF
+ if test ! -z "\$(MOD_CACHE_DISK_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CACHE_DISK_LDADD)\""
+ AP_LIBS="\$(MOD_CACHE_DISK_LDADD)"
else
- _apmod_error_fatal="yes"
+ apr_addto_bugger="\$(MOD_CACHE_DISK_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_cache_disk.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_CACHE_DISK_LDADD)
+EOF
+ fi
fi
- if test "$enable_disk_cache" = "static"; then
- enable_disk_cache=yes
- elif test "$enable_disk_cache" = "yes"; then
- enable_disk_cache=$module_default
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_CACHE_DISK_LDADD"
+
+
+
+ fi
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_socache_shmcb" >&5
+$as_echo_n "checking whether to enable mod_socache_shmcb... " >&6; }
+ # Check whether --enable-socache-shmcb was given.
+if test "${enable_socache_shmcb+set}" = set; then :
+ enableval=$enable_socache_shmcb; force_socache_shmcb=$enableval
+else
+ enable_socache_shmcb=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_socache_shmcb" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_socache_shmcb" = "static"; then
+ enable_socache_shmcb=static
+ elif test "$enable_socache_shmcb" = "yes"; then
+ enable_socache_shmcb=$module_default
+ elif test "$enable_socache_shmcb" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_socache_shmcb=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_socache_shmcb=no
+ fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_disk_cache" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_disk_cache=$module_default
+ elif test "$enable_socache_shmcb" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_socache_shmcb=$module_default
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_disk_cache" != "yes"; then
- enable_disk_cache=no
- fi
- elif test "$enable_disk_cache" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_disk_cache=$module_default
- _apmod_extra_msg=" (all)"
else
- enable_disk_cache=no
+ enable_socache_shmcb=no
fi
+ elif test "$enable_socache_shmcb" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_socache_shmcb" != "no" ; then
+ enable_socache_shmcb=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
- if test "$enable_disk_cache" != "no"; then
+ if test "$enable_socache_shmcb" != "no"; then
:
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_disk_cache$_apmod_extra_msg" >&5
-$as_echo "$enable_disk_cache$_apmod_extra_msg" >&6; }
- if test "$enable_disk_cache" != "no"; then
- case "$enable_disk_cache" in
- shared*)
- enable_disk_cache=`echo $enable_disk_cache|sed 's/shared,*//'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_socache_shmcb$_apmod_extra_msg" >&5
+$as_echo "$enable_socache_shmcb$_apmod_extra_msg" >&6; }
+ if test "$enable_socache_shmcb" != "no"; then
+ case "$enable_socache_shmcb" in
+ static*)
+ MODLIST="$MODLIST socache_shmcb"
+ if test "socache_shmcb" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_socache_shmcb=`echo $enable_socache_shmcb|sed 's/shared,*//'`
sharedobjs=yes
shared=yes
- DSO_MODULES="$DSO_MODULES disk_cache"
+ DSO_MODULES="$DSO_MODULES socache_shmcb"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},socache_shmcb"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_socache_shmcb.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_socache_shmcb.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SOCACHE_SHMCB_LDADD)
+EOF
+ if test ! -z "\$(MOD_SOCACHE_SHMCB_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SOCACHE_SHMCB_LDADD)\""
+ AP_LIBS="\$(MOD_SOCACHE_SHMCB_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SOCACHE_SHMCB_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_socache_shmcb.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SOCACHE_SHMCB_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SOCACHE_SHMCB_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_socache_dbm" >&5
+$as_echo_n "checking whether to enable mod_socache_dbm... " >&6; }
+ # Check whether --enable-socache-dbm was given.
+if test "${enable_socache_dbm+set}" = set; then :
+ enableval=$enable_socache_dbm; force_socache_dbm=$enableval
+else
+ enable_socache_dbm=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_socache_dbm" in
+ yes|static|shared)
+ _apmod_required="yes"
;;
*)
- MODLIST="$MODLIST disk_cache"
- if test "disk_cache" = "so"; then
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_socache_dbm" = "static"; then
+ enable_socache_dbm=static
+ elif test "$enable_socache_dbm" = "yes"; then
+ enable_socache_dbm=$module_default
+ elif test "$enable_socache_dbm" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_socache_dbm=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_socache_dbm=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_socache_dbm" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_socache_dbm=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_socache_dbm=no
+ fi
+ elif test "$enable_socache_dbm" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_socache_dbm" != "no" ; then
+ enable_socache_dbm=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_socache_dbm" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_socache_dbm$_apmod_extra_msg" >&5
+$as_echo "$enable_socache_dbm$_apmod_extra_msg" >&6; }
+ if test "$enable_socache_dbm" != "no"; then
+ case "$enable_socache_dbm" in
+ static*)
+ MODLIST="$MODLIST socache_dbm"
+ if test "socache_dbm" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_socache_dbm=`echo $enable_socache_dbm|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES socache_dbm"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},socache_dbm"
+ fi
+ ;;
esac
if test -z ""; then
- objects="mod_disk_cache.lo"
+ objects="mod_socache_dbm.lo"
else
objects=""
fi
@@ -9282,123 +12104,1092 @@ $as_echo "$enable_disk_cache$_apmod_extra_msg" >&6; }
if test -z "$module_standalone"; then
if test -z "$shared"; then
# The filename of a convenience library must have a "lib" prefix:
- libname="libmod_disk_cache.la"
+ libname="libmod_socache_dbm.la"
BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
modpath_static="$modpath_static $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $objects
- \$(MOD_LINK) $objects \$(MOD_DISK_CACHE_LDADD)
+ \$(MOD_LINK) $objects \$(MOD_SOCACHE_DBM_LDADD)
EOF
+ if test ! -z "\$(MOD_SOCACHE_DBM_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SOCACHE_DBM_LDADD)\""
+ AP_LIBS="\$(MOD_SOCACHE_DBM_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SOCACHE_DBM_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
- libname="mod_disk_cache.la"
+ libname="mod_socache_dbm.la"
shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
modpath_shared="$modpath_shared $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_DISK_CACHE_LDADD)
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SOCACHE_DBM_LDADD)
EOF
fi
fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_DISK_CACHE_LDADD"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SOCACHE_DBM_LDADD"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_mem_cache" >&5
-$as_echo_n "checking whether to enable mod_mem_cache... " >&6; }
- # Check whether --enable-mem-cache was given.
-if test "${enable_mem_cache+set}" = set; then :
- enableval=$enable_mem_cache;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_socache_memcache" >&5
+$as_echo_n "checking whether to enable mod_socache_memcache... " >&6; }
+ # Check whether --enable-socache-memcache was given.
+if test "${enable_socache_memcache+set}" = set; then :
+ enableval=$enable_socache_memcache; force_socache_memcache=$enableval
else
- enable_mem_cache=no
+ enable_socache_memcache=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_mem_cache" = "most"; then
- _apmod_error_fatal="no"
+ case "$enable_socache_memcache" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_socache_memcache" = "static"; then
+ enable_socache_memcache=static
+ elif test "$enable_socache_memcache" = "yes"; then
+ enable_socache_memcache=$module_default
+ elif test "$enable_socache_memcache" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_socache_memcache=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_socache_memcache=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_socache_memcache" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_socache_memcache=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_socache_memcache=no
+ fi
+ elif test "$enable_socache_memcache" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_socache_memcache" != "no" ; then
+ enable_socache_memcache=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_socache_memcache" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_socache_memcache$_apmod_extra_msg" >&5
+$as_echo "$enable_socache_memcache$_apmod_extra_msg" >&6; }
+ if test "$enable_socache_memcache" != "no"; then
+ case "$enable_socache_memcache" in
+ static*)
+ MODLIST="$MODLIST socache_memcache"
+ if test "socache_memcache" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_socache_memcache=`echo $enable_socache_memcache|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES socache_memcache"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},socache_memcache"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_socache_memcache.lo"
else
- _apmod_error_fatal="yes"
+ objects=""
fi
- if test "$enable_mem_cache" = "static"; then
- enable_mem_cache=yes
- elif test "$enable_mem_cache" = "yes"; then
- enable_mem_cache=$module_default
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_socache_memcache.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SOCACHE_MEMCACHE_LDADD)
+EOF
+ if test ! -z "\$(MOD_SOCACHE_MEMCACHE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SOCACHE_MEMCACHE_LDADD)\""
+ AP_LIBS="\$(MOD_SOCACHE_MEMCACHE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SOCACHE_MEMCACHE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_socache_memcache.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SOCACHE_MEMCACHE_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SOCACHE_MEMCACHE_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_socache_dc" >&5
+$as_echo_n "checking whether to enable mod_socache_dc... " >&6; }
+ # Check whether --enable-socache-dc was given.
+if test "${enable_socache_dc+set}" = set; then :
+ enableval=$enable_socache_dc; force_socache_dc=$enableval
+else
+ enable_socache_dc=no
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_socache_dc" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_socache_dc" = "static"; then
+ enable_socache_dc=static
+ elif test "$enable_socache_dc" = "yes"; then
+ enable_socache_dc=$module_default
+ elif test "$enable_socache_dc" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_socache_dc=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_socache_dc=no
+ fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_mem_cache" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_mem_cache=$module_default
+ elif test "$enable_socache_dc" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_socache_dc=$module_default
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_mem_cache" != "yes"; then
- enable_mem_cache=no
+ else
+ enable_socache_dc=no
+ fi
+ elif test "$enable_socache_dc" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_socache_dc" != "no" ; then
+ enable_socache_dc=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_socache_dc" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+
+if test "x$ap_distcache_configured" = "x"; then
+ ap_distcache_found=""
+ ap_distcache_base=""
+ ap_distcache_libs=""
+ ap_distcache_ldflags=""
+ ap_distcache_with=""
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for user-provided distcache base" >&5
+$as_echo_n "checking for user-provided distcache base... " >&6; }
+
+# Check whether --with-distcache was given.
+if test "${with_distcache+set}" = set; then :
+ withval=$with_distcache;
+ if test "x$withval" != "xyes" -a "x$withval" != "x"; then
+ ap_distcache_with="yes"
+ ap_distcache_base="`cd $withval ; pwd`"
fi
- elif test "$enable_mem_cache" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_mem_cache=$module_default
- _apmod_extra_msg=" (all)"
+
+fi
+
+ if test "x$ap_distcache_base" = "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_distcache_base" >&5
+$as_echo "$ap_distcache_base" >&6; }
+ fi
+
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LIBS="$LIBS"
+ saved_LDFLAGS="$LDFLAGS"
+
+ if test "x$ap_distcache_base" != "x"; then
+
+ if test "x$CPPFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-I$ap_distcache_base/include\""
+ CPPFLAGS="-I$ap_distcache_base/include"
+ else
+ apr_addto_bugger="-I$ap_distcache_base/include"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CPPFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I$ap_distcache_base/include\""
+ INCLUDES="-I$ap_distcache_base/include"
+ else
+ apr_addto_bugger="-I$ap_distcache_base/include"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+ if test "x$LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting LDFLAGS to \"-L$ap_distcache_base/lib\""
+ LDFLAGS="-L$ap_distcache_base/lib"
+ else
+ apr_addto_bugger="-L$ap_distcache_base/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS"
+ LDFLAGS="$LDFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$ap_distcache_ldflags" = "x"; then
+ test "x$silent" != "xyes" && echo " setting ap_distcache_ldflags to \"-L$ap_distcache_base/lib\""
+ ap_distcache_ldflags="-L$ap_distcache_base/lib"
+ else
+ apr_addto_bugger="-L$ap_distcache_base/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $ap_distcache_ldflags; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to ap_distcache_ldflags"
+ ap_distcache_ldflags="$ap_distcache_ldflags $i"
+ fi
+ done
+ fi
+
+ if test "x$ap_platform_runtime_link_flag" != "x"; then
+
+ if test "x$LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_distcache_base/lib\""
+ LDFLAGS="$ap_platform_runtime_link_flag$ap_distcache_base/lib"
+ else
+ apr_addto_bugger="$ap_platform_runtime_link_flag$ap_distcache_base/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS"
+ LDFLAGS="$LDFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$ap_distcache_ldflags" = "x"; then
+ test "x$silent" != "xyes" && echo " setting ap_distcache_ldflags to \"$ap_platform_runtime_link_flag$ap_distcache_base/lib\""
+ ap_distcache_ldflags="$ap_platform_runtime_link_flag$ap_distcache_base/lib"
+ else
+ apr_addto_bugger="$ap_platform_runtime_link_flag$ap_distcache_base/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $ap_distcache_ldflags; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to ap_distcache_ldflags"
+ ap_distcache_ldflags="$ap_distcache_ldflags $i"
+ fi
+ done
+ fi
+
+ fi
+ fi
+ for ac_header in distcache/dc_client.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "distcache/dc_client.h" "ac_cv_header_distcache_dc_client_h" "$ac_includes_default"
+if test "x$ac_cv_header_distcache_dc_client_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DISTCACHE_DC_CLIENT_H 1
+_ACEOF
+ ap_distcache_found="yes"
+fi
+
+done
+
+ if test "$ap_distcache_found" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for distcache version" >&5
+$as_echo_n "checking for distcache version... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <distcache/dc_client.h>
+int
+main ()
+{
+
+#if DISTCACHE_CLIENT_API != 0x0001
+#error "distcache API version is unrecognised"
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ap_distcache_found="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_distcache_found" >&5
+$as_echo "$ap_distcache_found" >&6; }
+ fi
+ if test "$ap_distcache_found" != "yes"; then
+ if test "x$ap_distcache_with" = "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ...No distcache detected" >&5
+$as_echo "$as_me: WARNING: ...No distcache detected" >&2;}
+ else
+ as_fn_error $? "...No distcache detected" "$LINENO" 5
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for distcache libraries" >&5
+$as_echo_n "checking for distcache libraries... " >&6; }
+ ap_distcache_libs="-ldistcache -lnal"
+
+ if test "x$LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting LIBS to \"$ap_distcache_libs\""
+ LIBS="$ap_distcache_libs"
+ else
+ apr_addto_bugger="$ap_distcache_libs"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to LIBS"
+ LIBS="$LIBS $i"
+ fi
+ done
+ fi
+
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <distcache/dc_client.h>
+int
+main ()
+{
+DC_CTX *foo = DC_CTX_new((const char *)0,0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+else
+ ap_distcache_found="no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_distcache_found" >&5
+$as_echo "$ap_distcache_found" >&6; }
+ if test "$ap_distcache_found" != "yes"; then
+ if test "x$ap_distcache_base" = "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ... Error, distcache libraries were missing or unusable" >&5
+$as_echo "$as_me: WARNING: ... Error, distcache libraries were missing or unusable" >&2;}
+ else
+ as_fn_error $? "... Error, distcache libraries were missing or unusable" "$LINENO" 5
+ fi
+ fi
+ fi
+
+ CPPFLAGS="$saved_CPPFLAGS"
+ LIBS="$saved_LIBS"
+ LDFLAGS="$saved_LDFLAGS"
+
+ if test "$ap_distcache_found" = "yes"; then
+
+ if test "x$MOD_SOCACHE_DC_LDADD" = "x"; then
+ test "x$silent" != "xyes" && echo " setting MOD_SOCACHE_DC_LDADD to \"$ap_distcache_ldflags $ap_distcache_libs\""
+ MOD_SOCACHE_DC_LDADD="$ap_distcache_ldflags $ap_distcache_libs"
+ else
+ apr_addto_bugger="$ap_distcache_ldflags $ap_distcache_libs"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $MOD_SOCACHE_DC_LDADD; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_SOCACHE_DC_LDADD"
+ MOD_SOCACHE_DC_LDADD="$MOD_SOCACHE_DC_LDADD $i"
+ fi
+ done
+ fi
+
+
+$as_echo "#define HAVE_DISTCACHE 1" >>confdefs.h
+
+ else
+ enable_socache_dc=no
+ fi
+ ap_distcache_configured="yes"
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_socache_dc" >&5
+$as_echo_n "checking whether to enable mod_socache_dc... " >&6; }
+ if test "$enable_socache_dc" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ as_fn_error $? "mod_socache_dc has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ fi
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_socache_dc$_apmod_extra_msg" >&5
+$as_echo "$enable_socache_dc$_apmod_extra_msg" >&6; }
+ if test "$enable_socache_dc" != "no"; then
+ case "$enable_socache_dc" in
+ static*)
+ MODLIST="$MODLIST socache_dc"
+ if test "socache_dc" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_socache_dc=`echo $enable_socache_dc|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES socache_dc"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},socache_dc"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_socache_dc.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_socache_dc.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SOCACHE_DC_LDADD)
+EOF
+ if test ! -z "\$(MOD_SOCACHE_DC_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SOCACHE_DC_LDADD)\""
+ AP_LIBS="\$(MOD_SOCACHE_DC_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SOCACHE_DC_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
- enable_mem_cache=no
+ apache_need_shared=yes
+ libname="mod_socache_dc.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SOCACHE_DC_LDADD)
+EOF
fi
fi
- if test "$enable_mem_cache" != "no"; then
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SOCACHE_DC_LDADD"
+
+
+
+ fi
+
+
+
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+
+ 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
+ if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+ MODULE_DIRS="$MODULE_DIRS $current_dir"
+ else
+ MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ fi
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+
+
+
+
+
+
+ current_dir=core
+ modpath_current=modules/core
+ modpath_static=
+ modpath_shared=
+ test -d core || $srcdir/build/mkdir.sh $modpath_current
+ > $modpath_current/modules.mk
+
+
+
+apr_old_cppflags=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $INCLUDES"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <apr.h>
+#if APR_HAS_DSO
+YES_IS_DEFINED
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
+ ac_cv_define_APR_HAS_DSO=yes
+else
+ ac_cv_define_APR_HAS_DSO=no
+fi
+rm -f conftest*
+
+CPPFLAGS=$apr_old_cppflags
+
+
+case "x$enable_so" in
+ "xyes")
+ if test $ac_cv_define_APR_HAS_DSO = "no"; then
+ as_fn_error $? "mod_so has been requested but cannot be built on your system" "$LINENO" 5
+ fi
+ ;;
+ "xshared")
+ as_fn_error $? "mod_so can not be built as a shared DSO" "$LINENO" 5
+ ;;
+ "xno")
+ ;;
+ "x")
+ enable_so=$ac_cv_define_APR_HAS_DSO
+ ;;
+esac
+
+if test "x$enable_so" = "xyes"; then
+ enable_so="static"
+fi
+
+if test "x$enable_so" = "xstatic"; then
+
+ if test "x$HTTPD_LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting HTTPD_LDFLAGS to \"-export-dynamic\""
+ HTTPD_LDFLAGS="-export-dynamic"
+ else
+ apr_addto_bugger="-export-dynamic"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $HTTPD_LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to HTTPD_LDFLAGS"
+ HTTPD_LDFLAGS="$HTTPD_LDFLAGS $i"
+ fi
+ done
+ fi
+
+ INSTALL_DSO=yes
+else
+ INSTALL_DSO=no
+fi
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST INSTALL_DSO"
+
+
+
+if test "$sharedobjs" = "yes"; then
+ if test $ac_cv_define_APR_HAS_DSO = "no"; then
+ as_fn_error $? "shared objects have been requested but cannot be built since mod_so cannot be built" "$LINENO" 5
+ elif test $enable_so = "no"; then
+ as_fn_error $? "shared objects have been requested but cannot be built since mod_so was disabled" "$LINENO" 5
+ fi
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_so" >&5
+$as_echo_n "checking whether to enable mod_so... " >&6; }
+ # Check whether --enable-so was given.
+if test "${enable_so+set}" = set; then :
+ enableval=$enable_so; force_so=$enableval
+else
+ enable_so=$enable_so
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_so" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_so" = "static"; then
+ enable_so=static
+ elif test "$enable_so" = "yes"; then
+ enable_so=$module_default
+ elif test "$enable_so" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_so=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_so=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_so" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_so=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_so=no
+ fi
+ elif test "$enable_so" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_so" != "no" ; then
+ enable_so=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_so" != "no"; then
:
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mem_cache$_apmod_extra_msg" >&5
-$as_echo "$enable_mem_cache$_apmod_extra_msg" >&6; }
- if test "$enable_mem_cache" != "no"; then
- case "$enable_mem_cache" in
- shared*)
- enable_mem_cache=`echo $enable_mem_cache|sed 's/shared,*//'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_so$_apmod_extra_msg" >&5
+$as_echo "$enable_so$_apmod_extra_msg" >&6; }
+ if test "$enable_so" != "no"; then
+ case "$enable_so" in
+ static*)
+ MODLIST="$MODLIST so"
+ if test "so" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_so=`echo $enable_so|sed 's/shared,*//'`
sharedobjs=yes
shared=yes
- DSO_MODULES="$DSO_MODULES mem_cache"
+ DSO_MODULES="$DSO_MODULES so"
+ if test "$enable_so" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},so"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_so.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_so.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SO_LDADD)
+EOF
+ if test ! -z "\$(MOD_SO_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SO_LDADD)\""
+ AP_LIBS="\$(MOD_SO_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SO_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_so.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SO_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SO_LDADD"
+
+
+
+ fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_watchdog" >&5
+$as_echo_n "checking whether to enable mod_watchdog... " >&6; }
+ # Check whether --enable-watchdog was given.
+if test "${enable_watchdog+set}" = set; then :
+ enableval=$enable_watchdog; force_watchdog=$enableval
+else
+ enable_watchdog=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_watchdog" in
+ yes|static|shared)
+ _apmod_required="yes"
;;
*)
- MODLIST="$MODLIST mem_cache"
- if test "mem_cache" = "so"; then
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_watchdog" = "static"; then
+ enable_watchdog=static
+ elif test "$enable_watchdog" = "yes"; then
+ enable_watchdog=$module_default
+ elif test "$enable_watchdog" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_watchdog=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_watchdog=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_watchdog" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_watchdog=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_watchdog=no
+ fi
+ elif test "$enable_watchdog" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_watchdog" != "no" ; then
+ enable_watchdog=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_watchdog" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+
+apr_old_cppflags=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $INCLUDES"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <apr.h>
+#if APR_HAS_THREADS
+YES_IS_DEFINED
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
+ ac_cv_define_APR_HAS_THREADS=yes
+else
+ ac_cv_define_APR_HAS_THREADS=no
+fi
+rm -f conftest*
+
+CPPFLAGS=$apr_old_cppflags
+
+ if test $ac_cv_define_APR_HAS_THREADS = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mod_watchdog requires apr to be built with --enable-threads" >&5
+$as_echo "$as_me: WARNING: mod_watchdog requires apr to be built with --enable-threads" >&2;}
+ enable_watchdog=no
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_watchdog" >&5
+$as_echo_n "checking whether to enable mod_watchdog... " >&6; }
+ if test "$enable_watchdog" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ as_fn_error $? "mod_watchdog has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ fi
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_watchdog$_apmod_extra_msg" >&5
+$as_echo "$enable_watchdog$_apmod_extra_msg" >&6; }
+ if test "$enable_watchdog" != "no"; then
+ case "$enable_watchdog" in
+ static*)
+ MODLIST="$MODLIST watchdog"
+ if test "watchdog" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_watchdog=`echo $enable_watchdog|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES watchdog"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},watchdog"
+ fi
+ ;;
esac
- if test -z "$mem_cache_objs"; then
- objects="mod_mem_cache.lo"
+ if test -z ""; then
+ objects="mod_watchdog.lo"
else
- objects="$mem_cache_objs"
+ objects=""
fi
if test -z "$module_standalone"; then
if test -z "$shared"; then
# The filename of a convenience library must have a "lib" prefix:
- libname="libmod_mem_cache.la"
+ libname="libmod_watchdog.la"
BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
modpath_static="$modpath_static $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $objects
- \$(MOD_LINK) $objects \$(MOD_MEM_CACHE_LDADD)
+ \$(MOD_LINK) $objects \$(MOD_WATCHDOG_LDADD)
EOF
+ if test ! -z "\$(MOD_WATCHDOG_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_WATCHDOG_LDADD)\""
+ AP_LIBS="\$(MOD_WATCHDOG_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_WATCHDOG_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
- libname="mod_mem_cache.la"
+ libname="mod_watchdog.la"
shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
modpath_shared="$modpath_shared $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_MEM_CACHE_LDADD)
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_WATCHDOG_LDADD)
EOF
fi
fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_MEM_CACHE_LDADD"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_WATCHDOG_LDADD"
+
+
+
+ fi
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
fi
@@ -9431,36 +13222,51 @@ EOF
$as_echo_n "checking whether to enable mod_dbd... " >&6; }
# Check whether --enable-dbd was given.
if test "${enable_dbd+set}" = set; then :
- enableval=$enable_dbd;
+ enableval=$enable_dbd; force_dbd=$enableval
else
enable_dbd=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_dbd" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_dbd" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_dbd" = "static"; then
- enable_dbd=yes
+ enable_dbd=static
elif test "$enable_dbd" = "yes"; then
enable_dbd=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dbd" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_dbd=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_dbd" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_dbd=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dbd" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_dbd=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_dbd=no
fi
+ elif test "$enable_dbd" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_dbd" != "no" ; then
+ enable_dbd=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_dbd" != "no"; then
:
@@ -9469,18 +13275,21 @@ fi
$as_echo "$enable_dbd$_apmod_extra_msg" >&6; }
if test "$enable_dbd" != "no"; then
case "$enable_dbd" in
- shared*)
- enable_dbd=`echo $enable_dbd|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES dbd"
- ;;
- *)
+ static*)
MODLIST="$MODLIST dbd"
if test "dbd" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_dbd=`echo $enable_dbd|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES dbd"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dbd"
+ fi
+ ;;
esac
@@ -9500,6 +13309,29 @@ $as_echo "$enable_dbd$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_DBD_LDADD)
EOF
+ if test ! -z "\$(MOD_DBD_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_DBD_LDADD)\""
+ AP_LIBS="\$(MOD_DBD_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_DBD_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_dbd.la"
@@ -9521,6 +13353,28 @@ EOF
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+
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
@@ -9536,11 +13390,11 @@ EOF
- current_dir=debug
- modpath_current=modules/debug
+ current_dir=debugging
+ modpath_current=modules/debugging
modpath_static=
modpath_shared=
- test -d debug || $srcdir/build/mkdir.sh $modpath_current
+ test -d debugging || $srcdir/build/mkdir.sh $modpath_current
> $modpath_current/modules.mk
@@ -9549,36 +13403,51 @@ EOF
$as_echo_n "checking whether to enable mod_bucketeer... " >&6; }
# Check whether --enable-bucketeer was given.
if test "${enable_bucketeer+set}" = set; then :
- enableval=$enable_bucketeer;
+ enableval=$enable_bucketeer; force_bucketeer=$enableval
else
enable_bucketeer=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_bucketeer" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_bucketeer" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_bucketeer" = "static"; then
- enable_bucketeer=yes
+ enable_bucketeer=static
elif test "$enable_bucketeer" = "yes"; then
enable_bucketeer=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_bucketeer" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_bucketeer=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_bucketeer" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_bucketeer=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_bucketeer" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_bucketeer=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_bucketeer=no
fi
+ elif test "$enable_bucketeer" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_bucketeer" != "no" ; then
+ enable_bucketeer=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_bucketeer" != "no"; then
:
@@ -9587,18 +13456,21 @@ fi
$as_echo "$enable_bucketeer$_apmod_extra_msg" >&6; }
if test "$enable_bucketeer" != "no"; then
case "$enable_bucketeer" in
- shared*)
- enable_bucketeer=`echo $enable_bucketeer|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES bucketeer"
- ;;
- *)
+ static*)
MODLIST="$MODLIST bucketeer"
if test "bucketeer" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_bucketeer=`echo $enable_bucketeer|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES bucketeer"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},bucketeer"
+ fi
+ ;;
esac
@@ -9618,6 +13490,29 @@ $as_echo "$enable_bucketeer$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_BUCKETEER_LDADD)
EOF
+ if test ! -z "\$(MOD_BUCKETEER_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_BUCKETEER_LDADD)\""
+ AP_LIBS="\$(MOD_BUCKETEER_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_BUCKETEER_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_bucketeer.la"
@@ -9642,36 +13537,51 @@ EOF
$as_echo_n "checking whether to enable mod_dumpio... " >&6; }
# Check whether --enable-dumpio was given.
if test "${enable_dumpio+set}" = set; then :
- enableval=$enable_dumpio;
+ enableval=$enable_dumpio; force_dumpio=$enableval
else
enable_dumpio=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_dumpio" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_dumpio" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_dumpio" = "static"; then
- enable_dumpio=yes
+ enable_dumpio=static
elif test "$enable_dumpio" = "yes"; then
enable_dumpio=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dumpio" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_dumpio=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_dumpio" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_dumpio=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dumpio" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_dumpio=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_dumpio=no
fi
+ elif test "$enable_dumpio" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_dumpio" != "no" ; then
+ enable_dumpio=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_dumpio" != "no"; then
:
@@ -9680,18 +13590,21 @@ fi
$as_echo "$enable_dumpio$_apmod_extra_msg" >&6; }
if test "$enable_dumpio" != "no"; then
case "$enable_dumpio" in
- shared*)
- enable_dumpio=`echo $enable_dumpio|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES dumpio"
- ;;
- *)
+ static*)
MODLIST="$MODLIST dumpio"
if test "dumpio" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_dumpio=`echo $enable_dumpio|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES dumpio"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dumpio"
+ fi
+ ;;
esac
@@ -9711,6 +13624,29 @@ $as_echo "$enable_dumpio$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_DUMPIO_LDADD)
EOF
+ if test ! -z "\$(MOD_DUMPIO_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_DUMPIO_LDADD)\""
+ AP_LIBS="\$(MOD_DUMPIO_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_DUMPIO_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_dumpio.la"
@@ -9761,36 +13697,51 @@ EOF
$as_echo_n "checking whether to enable mod_echo... " >&6; }
# Check whether --enable-echo was given.
if test "${enable_echo+set}" = set; then :
- enableval=$enable_echo;
+ enableval=$enable_echo; force_echo=$enableval
else
- enable_echo=no
+ enable_echo=maybe-all
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_echo" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_echo" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_echo" = "static"; then
- enable_echo=yes
+ enable_echo=static
elif test "$enable_echo" = "yes"; then
enable_echo=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_echo" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_echo=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_echo" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_echo=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_echo" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_echo=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_echo=no
fi
+ elif test "$enable_echo" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_echo" != "no" ; then
+ enable_echo=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_echo" != "no"; then
:
@@ -9799,18 +13750,21 @@ fi
$as_echo "$enable_echo$_apmod_extra_msg" >&6; }
if test "$enable_echo" != "no"; then
case "$enable_echo" in
- shared*)
- enable_echo=`echo $enable_echo|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES echo"
- ;;
- *)
+ static*)
MODLIST="$MODLIST echo"
if test "echo" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_echo=`echo $enable_echo|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES echo"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},echo"
+ fi
+ ;;
esac
@@ -9830,6 +13784,29 @@ $as_echo "$enable_echo$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_ECHO_LDADD)
EOF
+ if test ! -z "\$(MOD_ECHO_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_ECHO_LDADD)\""
+ AP_LIBS="\$(MOD_ECHO_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_ECHO_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_echo.la"
@@ -9866,74 +13843,92 @@ EOF
- current_dir=experimental
- modpath_current=modules/experimental
+ current_dir=examples
+ modpath_current=modules/examples
modpath_static=
modpath_shared=
- test -d experimental || $srcdir/build/mkdir.sh $modpath_current
+ test -d examples || $srcdir/build/mkdir.sh $modpath_current
> $modpath_current/modules.mk
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_example" >&5
-$as_echo_n "checking whether to enable mod_example... " >&6; }
- # Check whether --enable-example was given.
-if test "${enable_example+set}" = set; then :
- enableval=$enable_example;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_example_hooks" >&5
+$as_echo_n "checking whether to enable mod_example_hooks... " >&6; }
+ # Check whether --enable-example-hooks was given.
+if test "${enable_example_hooks+set}" = set; then :
+ enableval=$enable_example_hooks; force_example_hooks=$enableval
else
- enable_example=no
+ enable_example_hooks=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_example" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
- if test "$enable_example" = "static"; then
- enable_example=yes
- elif test "$enable_example" = "yes"; then
- enable_example=$module_default
+ case "$enable_example_hooks" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_example_hooks" = "static"; then
+ enable_example_hooks=static
+ elif test "$enable_example_hooks" = "yes"; then
+ enable_example_hooks=$module_default
+ elif test "$enable_example_hooks" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_example_hooks=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_example_hooks=no
+ fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_example" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_example=$module_default
+ elif test "$enable_example_hooks" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_example_hooks=$module_default
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_example" != "yes"; then
- enable_example=no
- fi
- elif test "$enable_example" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_example=$module_default
- _apmod_extra_msg=" (all)"
else
- enable_example=no
+ enable_example_hooks=no
fi
+ elif test "$enable_example_hooks" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_example_hooks" != "no" ; then
+ enable_example_hooks=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
- if test "$enable_example" != "no"; then
+ if test "$enable_example_hooks" != "no"; then
:
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_example$_apmod_extra_msg" >&5
-$as_echo "$enable_example$_apmod_extra_msg" >&6; }
- if test "$enable_example" != "no"; then
- case "$enable_example" in
- shared*)
- enable_example=`echo $enable_example|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES example"
- ;;
- *)
- MODLIST="$MODLIST example"
- if test "example" = "so"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_example_hooks$_apmod_extra_msg" >&5
+$as_echo "$enable_example_hooks$_apmod_extra_msg" >&6; }
+ if test "$enable_example_hooks" != "no"; then
+ case "$enable_example_hooks" in
+ static*)
+ MODLIST="$MODLIST example_hooks"
+ if test "example_hooks" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_example_hooks=`echo $enable_example_hooks|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES example_hooks"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},example_hooks"
+ fi
+ ;;
esac
if test -z ""; then
- objects="mod_example.lo"
+ objects="mod_example_hooks.lo"
else
objects=""
fi
@@ -9941,27 +13936,50 @@ $as_echo "$enable_example$_apmod_extra_msg" >&6; }
if test -z "$module_standalone"; then
if test -z "$shared"; then
# The filename of a convenience library must have a "lib" prefix:
- libname="libmod_example.la"
+ libname="libmod_example_hooks.la"
BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
modpath_static="$modpath_static $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $objects
- \$(MOD_LINK) $objects \$(MOD_EXAMPLE_LDADD)
+ \$(MOD_LINK) $objects \$(MOD_EXAMPLE_HOOKS_LDADD)
EOF
+ if test ! -z "\$(MOD_EXAMPLE_HOOKS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_EXAMPLE_HOOKS_LDADD)\""
+ AP_LIBS="\$(MOD_EXAMPLE_HOOKS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_EXAMPLE_HOOKS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
- libname="mod_example.la"
+ libname="mod_example_hooks.la"
shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
modpath_shared="$modpath_shared $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_EXAMPLE_LDADD)
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_EXAMPLE_HOOKS_LDADD)
EOF
fi
fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_EXAMPLE_LDADD"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_EXAMPLE_HOOKS_LDADD"
@@ -9972,36 +13990,51 @@ EOF
$as_echo_n "checking whether to enable mod_case_filter... " >&6; }
# Check whether --enable-case-filter was given.
if test "${enable_case_filter+set}" = set; then :
- enableval=$enable_case_filter;
+ enableval=$enable_case_filter; force_case_filter=$enableval
else
enable_case_filter=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_case_filter" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_case_filter" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_case_filter" = "static"; then
- enable_case_filter=yes
+ enable_case_filter=static
elif test "$enable_case_filter" = "yes"; then
enable_case_filter=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_case_filter" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_case_filter=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_case_filter" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_case_filter=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_case_filter" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_case_filter=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_case_filter=no
fi
+ elif test "$enable_case_filter" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_case_filter" != "no" ; then
+ enable_case_filter=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_case_filter" != "no"; then
:
@@ -10010,18 +14043,21 @@ fi
$as_echo "$enable_case_filter$_apmod_extra_msg" >&6; }
if test "$enable_case_filter" != "no"; then
case "$enable_case_filter" in
- shared*)
- enable_case_filter=`echo $enable_case_filter|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES case_filter"
- ;;
- *)
+ static*)
MODLIST="$MODLIST case_filter"
if test "case_filter" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_case_filter=`echo $enable_case_filter|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES case_filter"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},case_filter"
+ fi
+ ;;
esac
@@ -10041,6 +14077,29 @@ $as_echo "$enable_case_filter$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CASE_FILTER_LDADD)
EOF
+ if test ! -z "\$(MOD_CASE_FILTER_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CASE_FILTER_LDADD)\""
+ AP_LIBS="\$(MOD_CASE_FILTER_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CASE_FILTER_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_case_filter.la"
@@ -10065,36 +14124,51 @@ EOF
$as_echo_n "checking whether to enable mod_case_filter_in... " >&6; }
# Check whether --enable-case-filter-in was given.
if test "${enable_case_filter_in+set}" = set; then :
- enableval=$enable_case_filter_in;
+ enableval=$enable_case_filter_in; force_case_filter_in=$enableval
else
enable_case_filter_in=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_case_filter_in" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_case_filter_in" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_case_filter_in" = "static"; then
- enable_case_filter_in=yes
+ enable_case_filter_in=static
elif test "$enable_case_filter_in" = "yes"; then
enable_case_filter_in=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_case_filter_in" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_case_filter_in=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_case_filter_in" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_case_filter_in=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_case_filter_in" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_case_filter_in=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_case_filter_in=no
fi
+ elif test "$enable_case_filter_in" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_case_filter_in" != "no" ; then
+ enable_case_filter_in=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_case_filter_in" != "no"; then
:
@@ -10103,18 +14177,21 @@ fi
$as_echo "$enable_case_filter_in$_apmod_extra_msg" >&6; }
if test "$enable_case_filter_in" != "no"; then
case "$enable_case_filter_in" in
- shared*)
- enable_case_filter_in=`echo $enable_case_filter_in|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES case_filter_in"
- ;;
- *)
+ static*)
MODLIST="$MODLIST case_filter_in"
if test "case_filter_in" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_case_filter_in=`echo $enable_case_filter_in|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES case_filter_in"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},case_filter_in"
+ fi
+ ;;
esac
@@ -10134,6 +14211,29 @@ $as_echo "$enable_case_filter_in$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CASE_FILTER_IN_LDADD)
EOF
+ if test ! -z "\$(MOD_CASE_FILTER_IN_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CASE_FILTER_IN_LDADD)\""
+ AP_LIBS="\$(MOD_CASE_FILTER_IN_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CASE_FILTER_IN_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_case_filter_in.la"
@@ -10154,6 +14254,164 @@ EOF
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_example_ipc" >&5
+$as_echo_n "checking whether to enable mod_example_ipc... " >&6; }
+ # Check whether --enable-example-ipc was given.
+if test "${enable_example_ipc+set}" = set; then :
+ enableval=$enable_example_ipc; force_example_ipc=$enableval
+else
+ enable_example_ipc=no
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_example_ipc" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_example_ipc" = "static"; then
+ enable_example_ipc=static
+ elif test "$enable_example_ipc" = "yes"; then
+ enable_example_ipc=$module_default
+ elif test "$enable_example_ipc" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_example_ipc=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_example_ipc=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_example_ipc" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_example_ipc=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_example_ipc=no
+ fi
+ elif test "$enable_example_ipc" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_example_ipc" != "no" ; then
+ enable_example_ipc=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_example_ipc" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_example_ipc$_apmod_extra_msg" >&5
+$as_echo "$enable_example_ipc$_apmod_extra_msg" >&6; }
+ if test "$enable_example_ipc" != "no"; then
+ case "$enable_example_ipc" in
+ static*)
+ MODLIST="$MODLIST example_ipc"
+ if test "example_ipc" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_example_ipc=`echo $enable_example_ipc|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES example_ipc"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},example_ipc"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_example_ipc.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_example_ipc.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_EXAMPLE_IPC_LDADD)
+EOF
+ if test ! -z "\$(MOD_EXAMPLE_IPC_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_EXAMPLE_IPC_LDADD)\""
+ AP_LIBS="\$(MOD_EXAMPLE_IPC_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_EXAMPLE_IPC_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_example_ipc.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_EXAMPLE_IPC_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_EXAMPLE_IPC_LDADD"
+
+
+
+ fi
+
+
+
+ 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
+ if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+ MODULE_DIRS="$MODULE_DIRS $current_dir"
+ else
+ MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ fi
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+
+
+
+
+
+ current_dir=experimental
+ modpath_current=modules/experimental
+ modpath_static=
+ modpath_shared=
+ test -d experimental || $srcdir/build/mkdir.sh $modpath_current
+ > $modpath_current/modules.mk
+
+
echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
echo "static = $modpath_static" >> $modpath_current/modules.mk
@@ -10180,40 +14438,457 @@ EOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_buffer" >&5
+$as_echo_n "checking whether to enable mod_buffer... " >&6; }
+ # Check whether --enable-buffer was given.
+if test "${enable_buffer+set}" = set; then :
+ enableval=$enable_buffer; force_buffer=$enableval
+else
+ enable_buffer=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_buffer" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_buffer" = "static"; then
+ enable_buffer=static
+ elif test "$enable_buffer" = "yes"; then
+ enable_buffer=$module_default
+ elif test "$enable_buffer" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_buffer=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_buffer=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_buffer" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_buffer=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_buffer=no
+ fi
+ elif test "$enable_buffer" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_buffer" != "no" ; then
+ enable_buffer=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_buffer" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_buffer$_apmod_extra_msg" >&5
+$as_echo "$enable_buffer$_apmod_extra_msg" >&6; }
+ if test "$enable_buffer" != "no"; then
+ case "$enable_buffer" in
+ static*)
+ MODLIST="$MODLIST buffer"
+ if test "buffer" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_buffer=`echo $enable_buffer|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES buffer"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},buffer"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_buffer.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_buffer.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_BUFFER_LDADD)
+EOF
+ if test ! -z "\$(MOD_BUFFER_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_BUFFER_LDADD)\""
+ AP_LIBS="\$(MOD_BUFFER_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_BUFFER_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_buffer.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_BUFFER_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_BUFFER_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_data" >&5
+$as_echo_n "checking whether to enable mod_data... " >&6; }
+ # Check whether --enable-data was given.
+if test "${enable_data+set}" = set; then :
+ enableval=$enable_data; force_data=$enableval
+else
+ enable_data=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_data" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_data" = "static"; then
+ enable_data=static
+ elif test "$enable_data" = "yes"; then
+ enable_data=$module_default
+ elif test "$enable_data" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_data=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_data=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_data" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_data=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_data=no
+ fi
+ elif test "$enable_data" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_data" != "no" ; then
+ enable_data=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_data" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_data$_apmod_extra_msg" >&5
+$as_echo "$enable_data$_apmod_extra_msg" >&6; }
+ if test "$enable_data" != "no"; then
+ case "$enable_data" in
+ static*)
+ MODLIST="$MODLIST data"
+ if test "data" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_data=`echo $enable_data|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES data"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},data"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_data.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_data.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_DATA_LDADD)
+EOF
+ if test ! -z "\$(MOD_DATA_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_DATA_LDADD)\""
+ AP_LIBS="\$(MOD_DATA_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_DATA_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_data.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_DATA_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_DATA_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ratelimit" >&5
+$as_echo_n "checking whether to enable mod_ratelimit... " >&6; }
+ # Check whether --enable-ratelimit was given.
+if test "${enable_ratelimit+set}" = set; then :
+ enableval=$enable_ratelimit; force_ratelimit=$enableval
+else
+ enable_ratelimit=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_ratelimit" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_ratelimit" = "static"; then
+ enable_ratelimit=static
+ elif test "$enable_ratelimit" = "yes"; then
+ enable_ratelimit=$module_default
+ elif test "$enable_ratelimit" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_ratelimit=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_ratelimit=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_ratelimit" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_ratelimit=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_ratelimit=no
+ fi
+ elif test "$enable_ratelimit" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_ratelimit" != "no" ; then
+ enable_ratelimit=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_ratelimit" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ratelimit$_apmod_extra_msg" >&5
+$as_echo "$enable_ratelimit$_apmod_extra_msg" >&6; }
+ if test "$enable_ratelimit" != "no"; then
+ case "$enable_ratelimit" in
+ static*)
+ MODLIST="$MODLIST ratelimit"
+ if test "ratelimit" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_ratelimit=`echo $enable_ratelimit|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES ratelimit"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ratelimit"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_ratelimit.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_ratelimit.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_RATELIMIT_LDADD)
+EOF
+ if test ! -z "\$(MOD_RATELIMIT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_RATELIMIT_LDADD)\""
+ AP_LIBS="\$(MOD_RATELIMIT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_RATELIMIT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_ratelimit.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_RATELIMIT_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_RATELIMIT_LDADD"
+
+
+
+ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_reqtimeout" >&5
$as_echo_n "checking whether to enable mod_reqtimeout... " >&6; }
# Check whether --enable-reqtimeout was given.
if test "${enable_reqtimeout+set}" = set; then :
- enableval=$enable_reqtimeout;
+ enableval=$enable_reqtimeout; force_reqtimeout=$enableval
else
- enable_reqtimeout=most
+ enable_reqtimeout=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_reqtimeout" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_reqtimeout" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_reqtimeout" = "static"; then
- enable_reqtimeout=yes
+ enable_reqtimeout=static
elif test "$enable_reqtimeout" = "yes"; then
enable_reqtimeout=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_reqtimeout" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_reqtimeout=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_reqtimeout" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_reqtimeout=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_reqtimeout" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_reqtimeout=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_reqtimeout=no
fi
+ elif test "$enable_reqtimeout" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_reqtimeout" != "no" ; then
+ enable_reqtimeout=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_reqtimeout" != "no"; then
:
@@ -10222,18 +14897,21 @@ fi
$as_echo "$enable_reqtimeout$_apmod_extra_msg" >&6; }
if test "$enable_reqtimeout" != "no"; then
case "$enable_reqtimeout" in
- shared*)
- enable_reqtimeout=`echo $enable_reqtimeout|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES reqtimeout"
- ;;
- *)
+ static*)
MODLIST="$MODLIST reqtimeout"
if test "reqtimeout" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_reqtimeout=`echo $enable_reqtimeout|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES reqtimeout"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},reqtimeout"
+ fi
+ ;;
esac
@@ -10253,6 +14931,29 @@ $as_echo "$enable_reqtimeout$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_REQTIMEOUT_LDADD)
EOF
+ if test ! -z "\$(MOD_REQTIMEOUT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_REQTIMEOUT_LDADD)\""
+ AP_LIBS="\$(MOD_REQTIMEOUT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_REQTIMEOUT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_reqtimeout.la"
@@ -10277,36 +14978,51 @@ EOF
$as_echo_n "checking whether to enable mod_ext_filter... " >&6; }
# Check whether --enable-ext-filter was given.
if test "${enable_ext_filter+set}" = set; then :
- enableval=$enable_ext_filter;
+ enableval=$enable_ext_filter; force_ext_filter=$enableval
else
enable_ext_filter=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_ext_filter" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_ext_filter" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_ext_filter" = "static"; then
- enable_ext_filter=yes
+ enable_ext_filter=static
elif test "$enable_ext_filter" = "yes"; then
enable_ext_filter=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_ext_filter" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_ext_filter=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_ext_filter" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_ext_filter=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_ext_filter" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_ext_filter=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_ext_filter=no
fi
+ elif test "$enable_ext_filter" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_ext_filter" != "no" ; then
+ enable_ext_filter=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_ext_filter" != "no"; then
:
@@ -10315,18 +15031,21 @@ fi
$as_echo "$enable_ext_filter$_apmod_extra_msg" >&6; }
if test "$enable_ext_filter" != "no"; then
case "$enable_ext_filter" in
- shared*)
- enable_ext_filter=`echo $enable_ext_filter|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES ext_filter"
- ;;
- *)
+ static*)
MODLIST="$MODLIST ext_filter"
if test "ext_filter" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_ext_filter=`echo $enable_ext_filter|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES ext_filter"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ext_filter"
+ fi
+ ;;
esac
@@ -10346,6 +15065,29 @@ $as_echo "$enable_ext_filter$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_EXT_FILTER_LDADD)
EOF
+ if test ! -z "\$(MOD_EXT_FILTER_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_EXT_FILTER_LDADD)\""
+ AP_LIBS="\$(MOD_EXT_FILTER_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_EXT_FILTER_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_ext_filter.la"
@@ -10366,40 +15108,189 @@ EOF
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_request" >&5
+$as_echo_n "checking whether to enable mod_request... " >&6; }
+ # Check whether --enable-request was given.
+if test "${enable_request+set}" = set; then :
+ enableval=$enable_request; force_request=$enableval
+else
+ enable_request=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_request" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_request" = "static"; then
+ enable_request=static
+ elif test "$enable_request" = "yes"; then
+ enable_request=$module_default
+ elif test "$enable_request" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_request=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_request=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_request" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_request=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_request=no
+ fi
+ elif test "$enable_request" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_request" != "no" ; then
+ enable_request=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_request" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_request$_apmod_extra_msg" >&5
+$as_echo "$enable_request$_apmod_extra_msg" >&6; }
+ if test "$enable_request" != "no"; then
+ case "$enable_request" in
+ static*)
+ MODLIST="$MODLIST request"
+ if test "request" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_request=`echo $enable_request|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES request"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},request"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_request.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_request.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_REQUEST_LDADD)
+EOF
+ if test ! -z "\$(MOD_REQUEST_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_REQUEST_LDADD)\""
+ AP_LIBS="\$(MOD_REQUEST_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_REQUEST_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_request.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_REQUEST_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_REQUEST_LDADD"
+
+
+
+ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_include" >&5
$as_echo_n "checking whether to enable mod_include... " >&6; }
# Check whether --enable-include was given.
if test "${enable_include+set}" = set; then :
- enableval=$enable_include;
+ enableval=$enable_include; force_include=$enableval
else
- enable_include=yes
+ enable_include=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_include" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_include" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_include" = "static"; then
- enable_include=yes
+ enable_include=static
elif test "$enable_include" = "yes"; then
enable_include=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_include" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_include=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_include" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_include=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_include" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_include=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_include=no
fi
+ elif test "$enable_include" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_include" != "no" ; then
+ enable_include=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_include" != "no"; then
:
@@ -10408,18 +15299,21 @@ fi
$as_echo "$enable_include$_apmod_extra_msg" >&6; }
if test "$enable_include" != "no"; then
case "$enable_include" in
- shared*)
- enable_include=`echo $enable_include|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES include"
- ;;
- *)
+ static*)
MODLIST="$MODLIST include"
if test "include" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_include=`echo $enable_include|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES include"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},include"
+ fi
+ ;;
esac
@@ -10439,6 +15333,29 @@ $as_echo "$enable_include$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_INCLUDE_LDADD)
EOF
+ if test ! -z "\$(MOD_INCLUDE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_INCLUDE_LDADD)\""
+ AP_LIBS="\$(MOD_INCLUDE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_INCLUDE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_include.la"
@@ -10463,36 +15380,51 @@ EOF
$as_echo_n "checking whether to enable mod_filter... " >&6; }
# Check whether --enable-filter was given.
if test "${enable_filter+set}" = set; then :
- enableval=$enable_filter;
+ enableval=$enable_filter; force_filter=$enableval
else
enable_filter=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_filter" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_filter" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_filter" = "static"; then
- enable_filter=yes
+ enable_filter=static
elif test "$enable_filter" = "yes"; then
enable_filter=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_filter" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_filter=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_filter" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_filter=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_filter" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_filter=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_filter=no
fi
+ elif test "$enable_filter" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_filter" != "no" ; then
+ enable_filter=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_filter" != "no"; then
:
@@ -10501,18 +15433,21 @@ fi
$as_echo "$enable_filter$_apmod_extra_msg" >&6; }
if test "$enable_filter" != "no"; then
case "$enable_filter" in
- shared*)
- enable_filter=`echo $enable_filter|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES filter"
- ;;
- *)
+ static*)
MODLIST="$MODLIST filter"
if test "filter" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_filter=`echo $enable_filter|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES filter"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},filter"
+ fi
+ ;;
esac
@@ -10532,6 +15467,29 @@ $as_echo "$enable_filter$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_FILTER_LDADD)
EOF
+ if test ! -z "\$(MOD_FILTER_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_FILTER_LDADD)\""
+ AP_LIBS="\$(MOD_FILTER_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_FILTER_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_filter.la"
@@ -10552,40 +15510,189 @@ EOF
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_reflector" >&5
+$as_echo_n "checking whether to enable mod_reflector... " >&6; }
+ # Check whether --enable-reflector was given.
+if test "${enable_reflector+set}" = set; then :
+ enableval=$enable_reflector; force_reflector=$enableval
+else
+ enable_reflector=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_reflector" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_reflector" = "static"; then
+ enable_reflector=static
+ elif test "$enable_reflector" = "yes"; then
+ enable_reflector=$module_default
+ elif test "$enable_reflector" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_reflector=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_reflector=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_reflector" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_reflector=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_reflector=no
+ fi
+ elif test "$enable_reflector" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_reflector" != "no" ; then
+ enable_reflector=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_reflector" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_reflector$_apmod_extra_msg" >&5
+$as_echo "$enable_reflector$_apmod_extra_msg" >&6; }
+ if test "$enable_reflector" != "no"; then
+ case "$enable_reflector" in
+ static*)
+ MODLIST="$MODLIST reflector"
+ if test "reflector" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_reflector=`echo $enable_reflector|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES reflector"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},reflector"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_reflector.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_reflector.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_REFLECTOR_LDADD)
+EOF
+ if test ! -z "\$(MOD_REFLECTOR_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_REFLECTOR_LDADD)\""
+ AP_LIBS="\$(MOD_REFLECTOR_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_REFLECTOR_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_reflector.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_REFLECTOR_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_REFLECTOR_LDADD"
+
+
+
+ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_substitute" >&5
$as_echo_n "checking whether to enable mod_substitute... " >&6; }
# Check whether --enable-substitute was given.
if test "${enable_substitute+set}" = set; then :
- enableval=$enable_substitute;
+ enableval=$enable_substitute; force_substitute=$enableval
else
enable_substitute=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_substitute" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_substitute" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_substitute" = "static"; then
- enable_substitute=yes
+ enable_substitute=static
elif test "$enable_substitute" = "yes"; then
enable_substitute=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_substitute" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_substitute=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_substitute" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_substitute=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_substitute" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_substitute=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_substitute=no
fi
+ elif test "$enable_substitute" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_substitute" != "no" ; then
+ enable_substitute=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_substitute" != "no"; then
:
@@ -10594,18 +15701,21 @@ fi
$as_echo "$enable_substitute$_apmod_extra_msg" >&6; }
if test "$enable_substitute" != "no"; then
case "$enable_substitute" in
- shared*)
- enable_substitute=`echo $enable_substitute|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES substitute"
- ;;
- *)
+ static*)
MODLIST="$MODLIST substitute"
if test "substitute" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_substitute=`echo $enable_substitute|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES substitute"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},substitute"
+ fi
+ ;;
esac
@@ -10625,6 +15735,29 @@ $as_echo "$enable_substitute$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_SUBSTITUTE_LDADD)
EOF
+ if test ! -z "\$(MOD_SUBSTITUTE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SUBSTITUTE_LDADD)\""
+ AP_LIBS="\$(MOD_SUBSTITUTE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SUBSTITUTE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_substitute.la"
@@ -10645,6 +15778,142 @@ EOF
fi
+sed_obj="mod_sed.lo sed0.lo sed1.lo regexp.lo"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_sed" >&5
+$as_echo_n "checking whether to enable mod_sed... " >&6; }
+ # Check whether --enable-sed was given.
+if test "${enable_sed+set}" = set; then :
+ enableval=$enable_sed; force_sed=$enableval
+else
+ enable_sed=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_sed" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_sed" = "static"; then
+ enable_sed=static
+ elif test "$enable_sed" = "yes"; then
+ enable_sed=$module_default
+ elif test "$enable_sed" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_sed=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_sed=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_sed" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_sed=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_sed=no
+ fi
+ elif test "$enable_sed" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_sed" != "no" ; then
+ enable_sed=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_sed" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_sed$_apmod_extra_msg" >&5
+$as_echo "$enable_sed$_apmod_extra_msg" >&6; }
+ if test "$enable_sed" != "no"; then
+ case "$enable_sed" in
+ static*)
+ MODLIST="$MODLIST sed"
+ if test "sed" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_sed=`echo $enable_sed|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES sed"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},sed"
+ fi
+ ;;
+ esac
+
+
+ if test -z "$sed_obj"; then
+ objects="mod_sed.lo"
+ else
+ objects="$sed_obj"
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_sed.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SED_LDADD)
+EOF
+ if test ! -z "\$(MOD_SED_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SED_LDADD)\""
+ AP_LIBS="\$(MOD_SED_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SED_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_sed.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SED_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SED_LDADD"
+
+
+
+ fi
+
+
if test "$ac_cv_ebcdic" = "yes"; then
# mod_charset_lite can be very useful on an ebcdic system,
# so include it by default
@@ -10653,36 +15922,51 @@ if test "$ac_cv_ebcdic" = "yes"; then
$as_echo_n "checking whether to enable mod_charset_lite... " >&6; }
# Check whether --enable-charset-lite was given.
if test "${enable_charset_lite+set}" = set; then :
- enableval=$enable_charset_lite;
+ enableval=$enable_charset_lite; force_charset_lite=$enableval
else
enable_charset_lite=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_charset_lite" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_charset_lite" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_charset_lite" = "static"; then
- enable_charset_lite=yes
+ enable_charset_lite=static
elif test "$enable_charset_lite" = "yes"; then
enable_charset_lite=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_charset_lite" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_charset_lite=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_charset_lite" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_charset_lite=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_charset_lite" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_charset_lite=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_charset_lite=no
fi
+ elif test "$enable_charset_lite" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_charset_lite" != "no" ; then
+ enable_charset_lite=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_charset_lite" != "no"; then
:
@@ -10691,18 +15975,21 @@ fi
$as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
if test "$enable_charset_lite" != "no"; then
case "$enable_charset_lite" in
- shared*)
- enable_charset_lite=`echo $enable_charset_lite|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES charset_lite"
- ;;
- *)
+ static*)
MODLIST="$MODLIST charset_lite"
if test "charset_lite" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_charset_lite=`echo $enable_charset_lite|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES charset_lite"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},charset_lite"
+ fi
+ ;;
esac
@@ -10722,6 +16009,29 @@ $as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CHARSET_LITE_LDADD)
EOF
+ if test ! -z "\$(MOD_CHARSET_LITE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CHARSET_LITE_LDADD)\""
+ AP_LIBS="\$(MOD_CHARSET_LITE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CHARSET_LITE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_charset_lite.la"
@@ -10747,36 +16057,51 @@ else
$as_echo_n "checking whether to enable mod_charset_lite... " >&6; }
# Check whether --enable-charset-lite was given.
if test "${enable_charset_lite+set}" = set; then :
- enableval=$enable_charset_lite;
+ enableval=$enable_charset_lite; force_charset_lite=$enableval
else
- enable_charset_lite=no
+ enable_charset_lite=maybe-all
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_charset_lite" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_charset_lite" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_charset_lite" = "static"; then
- enable_charset_lite=yes
+ enable_charset_lite=static
elif test "$enable_charset_lite" = "yes"; then
enable_charset_lite=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_charset_lite" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_charset_lite=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_charset_lite" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_charset_lite=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_charset_lite" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_charset_lite=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_charset_lite=no
fi
+ elif test "$enable_charset_lite" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_charset_lite" != "no" ; then
+ enable_charset_lite=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_charset_lite" != "no"; then
:
@@ -10785,18 +16110,21 @@ fi
$as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
if test "$enable_charset_lite" != "no"; then
case "$enable_charset_lite" in
- shared*)
- enable_charset_lite=`echo $enable_charset_lite|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES charset_lite"
- ;;
- *)
+ static*)
MODLIST="$MODLIST charset_lite"
if test "charset_lite" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_charset_lite=`echo $enable_charset_lite|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES charset_lite"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},charset_lite"
+ fi
+ ;;
esac
@@ -10816,6 +16144,29 @@ $as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CHARSET_LITE_LDADD)
EOF
+ if test ! -z "\$(MOD_CHARSET_LITE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CHARSET_LITE_LDADD)\""
+ AP_LIBS="\$(MOD_CHARSET_LITE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CHARSET_LITE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_charset_lite.la"
@@ -10843,36 +16194,51 @@ fi
$as_echo_n "checking whether to enable mod_deflate... " >&6; }
# Check whether --enable-deflate was given.
if test "${enable_deflate+set}" = set; then :
- enableval=$enable_deflate;
+ enableval=$enable_deflate; force_deflate=$enableval
else
enable_deflate=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_deflate" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_deflate" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_deflate" = "static"; then
- enable_deflate=yes
+ enable_deflate=static
elif test "$enable_deflate" = "yes"; then
enable_deflate=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_deflate" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_deflate=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_deflate" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_deflate=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_deflate" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_deflate=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_deflate=no
fi
+ elif test "$enable_deflate" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_deflate" != "no" ; then
+ enable_deflate=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_deflate" != "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -10884,6 +16250,7 @@ if test "${with_z+set}" = set; then :
withval=$with_z;
if test "x$withval" != "xyes" && test "x$withval" != "x"; then
ap_zlib_base="$withval"
+ ap_zlib_with="yes"
fi
fi
@@ -10891,7 +16258,7 @@ fi
if test "x$ap_zlib_base" = "x"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib location" >&5
$as_echo_n "checking for zlib location... " >&6; }
- if test "${ap_cv_zlib+set}" = set; then :
+ if ${ap_cv_zlib+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -10918,6 +16285,7 @@ $as_echo "$ap_zlib_base" >&6; }
ap_save_includes=$INCLUDES
ap_save_ldflags=$LDFLAGS
ap_save_cppflags=$CPPFLAGS
+ ap_zlib_ldflags=""
if test "$ap_zlib_base" != "/usr"; then
if test "x$INCLUDES" = "x"; then
@@ -10962,6 +16330,27 @@ $as_echo "$ap_zlib_base" >&6; }
done
fi
+
+ if test "x$ap_zlib_ldflags" = "x"; then
+ test "x$silent" != "xyes" && echo " setting ap_zlib_ldflags to \"-L${ap_zlib_base}/lib\""
+ ap_zlib_ldflags="-L${ap_zlib_base}/lib"
+ else
+ apr_addto_bugger="-L${ap_zlib_base}/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $ap_zlib_ldflags; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to ap_zlib_ldflags"
+ ap_zlib_ldflags="$ap_zlib_ldflags $i"
+ fi
+ done
+ fi
+
if test "x$ap_platform_runtime_link_flag" != "x"; then
if test "x$LDFLAGS" = "x"; then
@@ -10984,6 +16373,27 @@ $as_echo "$ap_zlib_base" >&6; }
done
fi
+
+ if test "x$ap_zlib_ldflags" = "x"; then
+ test "x$silent" != "xyes" && echo " setting ap_zlib_ldflags to \"$ap_platform_runtime_link_flag${ap_zlib_base}/lib\""
+ ap_zlib_ldflags="$ap_platform_runtime_link_flag${ap_zlib_base}/lib"
+ else
+ apr_addto_bugger="$ap_platform_runtime_link_flag${ap_zlib_base}/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $ap_zlib_ldflags; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to ap_zlib_ldflags"
+ ap_zlib_ldflags="$ap_zlib_ldflags $i"
+ fi
+ done
+ fi
+
fi
fi
@@ -11024,18 +16434,43 @@ if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; }
- test "x$silent" != "xyes" && echo " forcing MOD_DEFLATE_LDADD to \"-lz\""
- MOD_DEFLATE_LDADD="-lz"
+ if test "x$MOD_DEFLATE_LDADD" = "x"; then
+ test "x$silent" != "xyes" && echo " setting MOD_DEFLATE_LDADD to \"$ap_zlib_ldflags -lz\""
+ MOD_DEFLATE_LDADD="$ap_zlib_ldflags -lz"
+ else
+ apr_addto_bugger="$ap_zlib_ldflags -lz"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $MOD_DEFLATE_LDADD; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_DEFLATE_LDADD"
+ MOD_DEFLATE_LDADD="$MOD_DEFLATE_LDADD $i"
+ fi
+ done
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
- enable_deflate=no
- INCLUDES=$ap_save_includes
- LDFLAGS=$ap_save_ldflags
+ enable_deflate=no
+ INCLUDES=$ap_save_includes
+ if test "x$ap_zlib_with" = "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ... Error, zlib was missing or unusable" >&5
+$as_echo "$as_me: WARNING: ... Error, zlib was missing or unusable" >&2;}
+ else
+ as_fn_error $? "... Error, zlib was missing or unusable" "$LINENO" 5
+ fi
+
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$ap_save_ldflags
+ CPPFLAGS=$ap_save_cppflags
if test "x$LIBS" = "x-lz"; then
test "x$silent" != "xyes" && echo " nulling LIBS"
@@ -11056,16 +16491,15 @@ rm -f core conftest.err conftest.$ac_objext \
fi
fi
- CPPFLAGS=$ap_save_cppflags
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_deflate" >&5
$as_echo_n "checking whether to enable mod_deflate... " >&6; }
if test "$enable_deflate" = "no"; then
- if test "$_apmod_error_fatal" = "no"; then
+ if test "$_apmod_required" = "no"; then
_apmod_extra_msg=" (disabled)"
else
- as_fn_error "mod_deflate has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ as_fn_error $? "mod_deflate has been requested but can not be built due to prerequisite failures" "$LINENO" 5
fi
fi
fi
@@ -11073,18 +16507,21 @@ $as_echo_n "checking whether to enable mod_deflate... " >&6; }
$as_echo "$enable_deflate$_apmod_extra_msg" >&6; }
if test "$enable_deflate" != "no"; then
case "$enable_deflate" in
- shared*)
- enable_deflate=`echo $enable_deflate|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES deflate"
- ;;
- *)
+ static*)
MODLIST="$MODLIST deflate"
if test "deflate" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_deflate=`echo $enable_deflate|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES deflate"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},deflate"
+ fi
+ ;;
esac
@@ -11104,6 +16541,29 @@ $as_echo "$enable_deflate$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_DEFLATE_LDADD)
EOF
+ if test ! -z "\$(MOD_DEFLATE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_DEFLATE_LDADD)\""
+ AP_LIBS="\$(MOD_DEFLATE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_DEFLATE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_deflate.la"
@@ -11125,6 +16585,789 @@ EOF
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_xml2enc" >&5
+$as_echo_n "checking whether to enable mod_xml2enc... " >&6; }
+ # Check whether --enable-xml2enc was given.
+if test "${enable_xml2enc+set}" = set; then :
+ enableval=$enable_xml2enc; force_xml2enc=$enableval
+else
+ enable_xml2enc=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_xml2enc" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_xml2enc" = "static"; then
+ enable_xml2enc=static
+ elif test "$enable_xml2enc" = "yes"; then
+ enable_xml2enc=$module_default
+ elif test "$enable_xml2enc" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_xml2enc=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_xml2enc=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_xml2enc" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_xml2enc=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_xml2enc=no
+ fi
+ elif test "$enable_xml2enc" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_xml2enc" != "no" ; then
+ enable_xml2enc=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_xml2enc" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5
+$as_echo_n "checking for libxml2... " >&6; }
+if ${ac_cv_libxml2+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+
+# Check whether --with-libxml2 was given.
+if test "${with_libxml2+set}" = set; then :
+ withval=$with_libxml2; test_paths="${with_libxml2}"
+else
+ test_paths="/usr/include/libxml2 /usr/local/include/libxml2 /usr/include /usr/local/include"
+
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5
+$as_echo_n "checking for libxml2... " >&6; }
+ xml2_path=""
+ for x in ${test_paths}; do
+ if test -f "${x}/libxml/parser.h"; then
+ xml2_path="${x}"
+ break
+ fi
+ done
+ if test -n "${xml2_path}" ; then
+ ac_cv_libxml2=yes
+ XML2_INCLUDES="${xml2_path}"
+ else
+ ac_cv_libxml2=no
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libxml2" >&5
+$as_echo "$ac_cv_libxml2" >&6; }
+
+ if test "$ac_cv_libxml2" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-I${XML2_INCLUDES}\""
+ CFLAGS="-I${XML2_INCLUDES}"
+ else
+ apr_addto_bugger="-I${XML2_INCLUDES}"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$MOD_XML2ENC_LDADD" = "x"; then
+ test "x$silent" != "xyes" && echo " setting MOD_XML2ENC_LDADD to \"-lxml2\""
+ MOD_XML2ENC_LDADD="-lxml2"
+ else
+ apr_addto_bugger="-lxml2"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $MOD_XML2ENC_LDADD; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_XML2ENC_LDADD"
+ MOD_XML2ENC_LDADD="$MOD_XML2ENC_LDADD $i"
+ fi
+ done
+ fi
+
+ else
+ enable_xml2enc=no
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_xml2enc" >&5
+$as_echo_n "checking whether to enable mod_xml2enc... " >&6; }
+ if test "$enable_xml2enc" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ as_fn_error $? "mod_xml2enc has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ fi
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xml2enc$_apmod_extra_msg" >&5
+$as_echo "$enable_xml2enc$_apmod_extra_msg" >&6; }
+ if test "$enable_xml2enc" != "no"; then
+ case "$enable_xml2enc" in
+ static*)
+ MODLIST="$MODLIST xml2enc"
+ if test "xml2enc" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_xml2enc=`echo $enable_xml2enc|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES xml2enc"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},xml2enc"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_xml2enc.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_xml2enc.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_XML2ENC_LDADD)
+EOF
+ if test ! -z "\$(MOD_XML2ENC_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_XML2ENC_LDADD)\""
+ AP_LIBS="\$(MOD_XML2ENC_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_XML2ENC_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_xml2enc.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_XML2ENC_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_XML2ENC_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_html" >&5
+$as_echo_n "checking whether to enable mod_proxy_html... " >&6; }
+ # Check whether --enable-proxy-html was given.
+if test "${enable_proxy_html+set}" = set; then :
+ enableval=$enable_proxy_html; force_proxy_html=$enableval
+else
+ enable_proxy_html=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_proxy_html" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_proxy_html" = "static"; then
+ enable_proxy_html=static
+ elif test "$enable_proxy_html" = "yes"; then
+ enable_proxy_html=$module_default
+ elif test "$enable_proxy_html" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_proxy_html=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_proxy_html=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_proxy_html" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_proxy_html=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_proxy_html=no
+ fi
+ elif test "$enable_proxy_html" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_html" != "no" ; then
+ enable_proxy_html=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_proxy_html" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5
+$as_echo_n "checking for libxml2... " >&6; }
+if ${ac_cv_libxml2+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+
+# Check whether --with-libxml2 was given.
+if test "${with_libxml2+set}" = set; then :
+ withval=$with_libxml2; test_paths="${with_libxml2}"
+else
+ test_paths="/usr/include/libxml2 /usr/local/include/libxml2 /usr/include /usr/local/include"
+
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5
+$as_echo_n "checking for libxml2... " >&6; }
+ xml2_path=""
+ for x in ${test_paths}; do
+ if test -f "${x}/libxml/parser.h"; then
+ xml2_path="${x}"
+ break
+ fi
+ done
+ if test -n "${xml2_path}" ; then
+ ac_cv_libxml2=yes
+ XML2_INCLUDES="${xml2_path}"
+ else
+ ac_cv_libxml2=no
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libxml2" >&5
+$as_echo "$ac_cv_libxml2" >&6; }
+
+ if test "$ac_cv_libxml2" = "yes" ; then
+
+ if test "x$CFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CFLAGS to \"-I${XML2_INCLUDES}\""
+ CFLAGS="-I${XML2_INCLUDES}"
+ else
+ apr_addto_bugger="-I${XML2_INCLUDES}"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
+ CFLAGS="$CFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$MOD_PROXY_HTML_LDADD" = "x"; then
+ test "x$silent" != "xyes" && echo " setting MOD_PROXY_HTML_LDADD to \"-lxml2\""
+ MOD_PROXY_HTML_LDADD="-lxml2"
+ else
+ apr_addto_bugger="-lxml2"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $MOD_PROXY_HTML_LDADD; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_PROXY_HTML_LDADD"
+ MOD_PROXY_HTML_LDADD="$MOD_PROXY_HTML_LDADD $i"
+ fi
+ done
+ fi
+
+ else
+ enable_proxy_html=no
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_html" >&5
+$as_echo_n "checking whether to enable mod_proxy_html... " >&6; }
+ if test "$enable_proxy_html" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ as_fn_error $? "mod_proxy_html has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ fi
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_html$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_html$_apmod_extra_msg" >&6; }
+ if test "$enable_proxy_html" != "no"; then
+ case "$enable_proxy_html" in
+ static*)
+ MODLIST="$MODLIST proxy_html"
+ if test "proxy_html" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_proxy_html=`echo $enable_proxy_html|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_html"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_html"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_proxy_html.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_proxy_html.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_PROXY_HTML_LDADD)
+EOF
+ if test ! -z "\$(MOD_PROXY_HTML_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_HTML_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_HTML_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_HTML_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_proxy_html.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_PROXY_HTML_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_PROXY_HTML_LDADD"
+
+
+
+ fi
+
+
+
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+
+ 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
+ if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+ MODULE_DIRS="$MODULE_DIRS $current_dir"
+ else
+ MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ fi
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+
+
+
+
+
+ current_dir=http
+ modpath_current=modules/http
+ modpath_static=
+ modpath_shared=
+ test -d http || $srcdir/build/mkdir.sh $modpath_current
+ > $modpath_current/modules.mk
+
+
+http_objects="http_core.lo http_protocol.lo http_request.lo http_filters.lo chunk_filter.lo byterange_filter.lo http_etag.lo"
+
+if test "$enable_http" = "yes"; then
+ enable_http="static"
+elif test "$enable_http" = "shared"; then
+ as_fn_error $? "mod_http can not be built as a shared DSO" "$LINENO" 5
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_http" >&5
+$as_echo_n "checking whether to enable mod_http... " >&6; }
+ # Check whether --enable-http was given.
+if test "${enable_http+set}" = set; then :
+ enableval=$enable_http; force_http=$enableval
+else
+ enable_http=static
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_http" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_http" = "static"; then
+ enable_http=static
+ elif test "$enable_http" = "yes"; then
+ enable_http=$module_default
+ elif test "$enable_http" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_http=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_http=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_http" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_http=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_http=no
+ fi
+ elif test "$enable_http" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_http" != "no" ; then
+ enable_http=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_http" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_http$_apmod_extra_msg" >&5
+$as_echo "$enable_http$_apmod_extra_msg" >&6; }
+ if test "$enable_http" != "no"; then
+ case "$enable_http" in
+ static*)
+ MODLIST="$MODLIST http"
+ if test "http" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_http=`echo $enable_http|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES http"
+ if test "static" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},http"
+ fi
+ ;;
+ esac
+
+
+ if test -z "$http_objects"; then
+ objects="mod_http.lo"
+ else
+ objects="$http_objects"
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_http.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_HTTP_LDADD)
+EOF
+ if test ! -z "\$(MOD_HTTP_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_HTTP_LDADD)\""
+ AP_LIBS="\$(MOD_HTTP_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_HTTP_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_http.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_HTTP_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_HTTP_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_mime" >&5
+$as_echo_n "checking whether to enable mod_mime... " >&6; }
+ # Check whether --enable-mime was given.
+if test "${enable_mime+set}" = set; then :
+ enableval=$enable_mime; force_mime=$enableval
+else
+ enable_mime=yes
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_mime" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_mime" = "static"; then
+ enable_mime=static
+ elif test "$enable_mime" = "yes"; then
+ enable_mime=$module_default
+ elif test "$enable_mime" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_mime=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_mime=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_mime" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_mime=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_mime=no
+ fi
+ elif test "$enable_mime" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_mime" != "no" ; then
+ enable_mime=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_mime" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mime$_apmod_extra_msg" >&5
+$as_echo "$enable_mime$_apmod_extra_msg" >&6; }
+ if test "$enable_mime" != "no"; then
+ case "$enable_mime" in
+ static*)
+ MODLIST="$MODLIST mime"
+ if test "mime" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_mime=`echo $enable_mime|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES mime"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mime"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_mime.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_mime.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_MIME_LDADD)
+EOF
+ if test ! -z "\$(MOD_MIME_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_MIME_LDADD)\""
+ AP_LIBS="\$(MOD_MIME_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_MIME_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_mime.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_MIME_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_MIME_LDADD"
+
+
+
+ fi
+
+
+
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
@@ -11155,51 +17398,129 @@ ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"
$as_echo_n "checking whether to enable mod_ldap... " >&6; }
# Check whether --enable-ldap was given.
if test "${enable_ldap+set}" = set; then :
- enableval=$enable_ldap;
+ enableval=$enable_ldap; force_ldap=$enableval
else
- enable_ldap=no
+ enable_ldap=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_ldap" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_ldap" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_ldap" = "static"; then
- enable_ldap=yes
+ enable_ldap=static
elif test "$enable_ldap" = "yes"; then
enable_ldap=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_ldap" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_ldap=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_ldap" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_ldap=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_ldap" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_ldap=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_ldap=no
fi
+ elif test "$enable_ldap" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_ldap" != "no" ; then
+ enable_ldap=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_ldap" != "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
$as_echo "checking dependencies" >&6; }
- MOD_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_LDAP_LDADD=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap support in apr/apr-util" >&5
+$as_echo_n "checking for ldap support in apr/apr-util... " >&6; }
+if ${ac_cv_APR_HAS_LDAP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ apache_old_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCLUDES"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <apr_ldap.h>
+#if APR_HAS_LDAP
+YES_IS_DEFINED
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
+ ac_cv_APR_HAS_LDAP=yes
+else
+ ac_cv_APR_HAS_LDAP=no
+fi
+rm -f conftest*
+
+ CPPFLAGS="$apache_old_cppflags"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_APR_HAS_LDAP" >&5
+$as_echo "$ac_cv_APR_HAS_LDAP" >&6; }
+
+ if test "$ac_cv_APR_HAS_LDAP" = "yes" ; then
+ if test -z "$apu_config" ; then
+ LDAP_LIBS="`$apr_config --ldap-libs`"
+ else
+ LDAP_LIBS="`$apu_config --ldap-libs`"
+ fi
+
+ if test "x$MOD_LDAP_LDADD" = "x"; then
+ test "x$silent" != "xyes" && echo " setting MOD_LDAP_LDADD to \"$LDAP_LIBS\""
+ MOD_LDAP_LDADD="$LDAP_LIBS"
+ else
+ apr_addto_bugger="$LDAP_LIBS"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $MOD_LDAP_LDADD; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDAP_LDADD"
+ MOD_LDAP_LDADD="$MOD_LDAP_LDADD $i"
+ fi
+ done
+ fi
+
+
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: apr/apr-util is compiled without ldap support" >&5
+$as_echo "$as_me: WARNING: apr/apr-util is compiled without ldap support" >&2;}
+ enable_ldap=no
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ldap" >&5
$as_echo_n "checking whether to enable mod_ldap... " >&6; }
if test "$enable_ldap" = "no"; then
- if test "$_apmod_error_fatal" = "no"; then
+ if test "$_apmod_required" = "no"; then
_apmod_extra_msg=" (disabled)"
else
- as_fn_error "mod_ldap has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ as_fn_error $? "mod_ldap has been requested but can not be built due to prerequisite failures" "$LINENO" 5
fi
fi
fi
@@ -11207,18 +17528,21 @@ $as_echo_n "checking whether to enable mod_ldap... " >&6; }
$as_echo "$enable_ldap$_apmod_extra_msg" >&6; }
if test "$enable_ldap" != "no"; then
case "$enable_ldap" in
- shared*)
- enable_ldap=`echo $enable_ldap|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES ldap"
- ;;
- *)
+ static*)
MODLIST="$MODLIST ldap"
if test "ldap" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_ldap=`echo $enable_ldap|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES ldap"
+ if test "most " = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ldap"
+ fi
+ ;;
esac
@@ -11238,6 +17562,29 @@ $as_echo "$enable_ldap$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_LDAP_LDADD)
EOF
+ if test ! -z "\$(MOD_LDAP_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LDAP_LDADD)\""
+ AP_LIBS="\$(MOD_LDAP_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LDAP_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_ldap.la"
@@ -11259,6 +17606,28 @@ EOF
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+
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
@@ -11288,36 +17657,51 @@ EOF
$as_echo_n "checking whether to enable mod_log_config... " >&6; }
# Check whether --enable-log-config was given.
if test "${enable_log_config+set}" = set; then :
- enableval=$enable_log_config;
+ enableval=$enable_log_config; force_log_config=$enableval
else
enable_log_config=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_log_config" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_log_config" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_log_config" = "static"; then
- enable_log_config=yes
+ enable_log_config=static
elif test "$enable_log_config" = "yes"; then
enable_log_config=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_log_config" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_log_config=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_log_config" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_log_config=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_log_config" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_log_config=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_log_config=no
fi
+ elif test "$enable_log_config" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_log_config" != "no" ; then
+ enable_log_config=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_log_config" != "no"; then
:
@@ -11326,18 +17710,21 @@ fi
$as_echo "$enable_log_config$_apmod_extra_msg" >&6; }
if test "$enable_log_config" != "no"; then
case "$enable_log_config" in
- shared*)
- enable_log_config=`echo $enable_log_config|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES log_config"
- ;;
- *)
+ static*)
MODLIST="$MODLIST log_config"
if test "log_config" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_log_config=`echo $enable_log_config|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES log_config"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_config"
+ fi
+ ;;
esac
@@ -11357,6 +17744,29 @@ $as_echo "$enable_log_config$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_LOG_CONFIG_LDADD)
EOF
+ if test ! -z "\$(MOD_LOG_CONFIG_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LOG_CONFIG_LDADD)\""
+ AP_LIBS="\$(MOD_LOG_CONFIG_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LOG_CONFIG_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_log_config.la"
@@ -11377,40 +17787,189 @@ EOF
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_log_debug" >&5
+$as_echo_n "checking whether to enable mod_log_debug... " >&6; }
+ # Check whether --enable-log-debug was given.
+if test "${enable_log_debug+set}" = set; then :
+ enableval=$enable_log_debug; force_log_debug=$enableval
+else
+ enable_log_debug=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_log_debug" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_log_debug" = "static"; then
+ enable_log_debug=static
+ elif test "$enable_log_debug" = "yes"; then
+ enable_log_debug=$module_default
+ elif test "$enable_log_debug" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_log_debug=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_log_debug=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_log_debug" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_log_debug=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_log_debug=no
+ fi
+ elif test "$enable_log_debug" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_log_debug" != "no" ; then
+ enable_log_debug=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_log_debug" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_log_debug$_apmod_extra_msg" >&5
+$as_echo "$enable_log_debug$_apmod_extra_msg" >&6; }
+ if test "$enable_log_debug" != "no"; then
+ case "$enable_log_debug" in
+ static*)
+ MODLIST="$MODLIST log_debug"
+ if test "log_debug" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_log_debug=`echo $enable_log_debug|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES log_debug"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_debug"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_log_debug.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_log_debug.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_LOG_DEBUG_LDADD)
+EOF
+ if test ! -z "\$(MOD_LOG_DEBUG_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LOG_DEBUG_LDADD)\""
+ AP_LIBS="\$(MOD_LOG_DEBUG_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LOG_DEBUG_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_log_debug.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_LOG_DEBUG_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_LOG_DEBUG_LDADD"
+
+
+
+ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_log_forensic" >&5
$as_echo_n "checking whether to enable mod_log_forensic... " >&6; }
# Check whether --enable-log-forensic was given.
if test "${enable_log_forensic+set}" = set; then :
- enableval=$enable_log_forensic;
+ enableval=$enable_log_forensic; force_log_forensic=$enableval
else
enable_log_forensic=maybe-all
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_log_forensic" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_log_forensic" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_log_forensic" = "static"; then
- enable_log_forensic=yes
+ enable_log_forensic=static
elif test "$enable_log_forensic" = "yes"; then
enable_log_forensic=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_log_forensic" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_log_forensic=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_log_forensic" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_log_forensic=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_log_forensic" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_log_forensic=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_log_forensic=no
fi
+ elif test "$enable_log_forensic" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_log_forensic" != "no" ; then
+ enable_log_forensic=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_log_forensic" != "no"; then
:
@@ -11419,18 +17978,21 @@ fi
$as_echo "$enable_log_forensic$_apmod_extra_msg" >&6; }
if test "$enable_log_forensic" != "no"; then
case "$enable_log_forensic" in
- shared*)
- enable_log_forensic=`echo $enable_log_forensic|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES log_forensic"
- ;;
- *)
+ static*)
MODLIST="$MODLIST log_forensic"
if test "log_forensic" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_log_forensic=`echo $enable_log_forensic|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES log_forensic"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_forensic"
+ fi
+ ;;
esac
@@ -11450,6 +18012,29 @@ $as_echo "$enable_log_forensic$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_LOG_FORENSIC_LDADD)
EOF
+ if test ! -z "\$(MOD_LOG_FORENSIC_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LOG_FORENSIC_LDADD)\""
+ AP_LIBS="\$(MOD_LOG_FORENSIC_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LOG_FORENSIC_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_log_forensic.la"
@@ -11500,36 +18085,51 @@ fi
$as_echo_n "checking whether to enable mod_logio... " >&6; }
# Check whether --enable-logio was given.
if test "${enable_logio+set}" = set; then :
- enableval=$enable_logio;
+ enableval=$enable_logio; force_logio=$enableval
else
enable_logio=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_logio" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_logio" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_logio" = "static"; then
- enable_logio=yes
+ enable_logio=static
elif test "$enable_logio" = "yes"; then
enable_logio=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_logio" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_logio=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_logio" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_logio=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_logio" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_logio=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_logio=no
fi
+ elif test "$enable_logio" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_logio" != "no" ; then
+ enable_logio=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_logio" != "no"; then
:
@@ -11538,18 +18138,21 @@ fi
$as_echo "$enable_logio$_apmod_extra_msg" >&6; }
if test "$enable_logio" != "no"; then
case "$enable_logio" in
- shared*)
- enable_logio=`echo $enable_logio|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES logio"
- ;;
- *)
+ static*)
MODLIST="$MODLIST logio"
if test "logio" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_logio=`echo $enable_logio|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES logio"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},logio"
+ fi
+ ;;
esac
@@ -11569,6 +18172,29 @@ $as_echo "$enable_logio$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_LOGIO_LDADD)
EOF
+ if test ! -z "\$(MOD_LOGIO_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LOGIO_LDADD)\""
+ AP_LIBS="\$(MOD_LOGIO_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LOGIO_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_logio.la"
@@ -11590,6 +18216,808 @@ EOF
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+
+ 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
+ if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+ MODULE_DIRS="$MODULE_DIRS $current_dir"
+ else
+ MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ fi
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+
+
+
+
+
+ current_dir=lua
+ modpath_current=modules/lua
+ modpath_static=
+ modpath_shared=
+ test -d lua || $srcdir/build/mkdir.sh $modpath_current
+ > $modpath_current/modules.mk
+
+
+
+
+lua_objects="lua_apr.lo lua_config.lo mod_lua.lo lua_request.lo lua_vmprep.lo"
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lua" >&5
+$as_echo_n "checking whether to enable mod_lua... " >&6; }
+ # Check whether --enable-lua was given.
+if test "${enable_lua+set}" = set; then :
+ enableval=$enable_lua; force_lua=$enableval
+else
+ enable_lua=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_lua" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_lua" = "static"; then
+ enable_lua=static
+ elif test "$enable_lua" = "yes"; then
+ enable_lua=$module_default
+ elif test "$enable_lua" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_lua=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_lua=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_lua" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_lua=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_lua=no
+ fi
+ elif test "$enable_lua" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_lua" != "no" ; then
+ enable_lua=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_lua" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+
+
+# Check whether --with-lua was given.
+if test "${with_lua+set}" = set; then :
+ withval=$with_lua; lua_path="$withval"
+else
+ :
+fi
+
+
+if test -z "$lua_path"; then
+ test_paths=". /usr/local /usr"
+else
+ test_paths="${lua_path}"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
+if ${ac_cv_lib_m_pow+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pow ();
+int
+main ()
+{
+return pow ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_m_pow=yes
+else
+ ac_cv_lib_m_pow=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = xyes; then :
+ lib_m="-lm"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
+$as_echo_n "checking for sqrt in -lm... " >&6; }
+if ${ac_cv_lib_m_sqrt+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqrt ();
+int
+main ()
+{
+return sqrt ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_m_sqrt=yes
+else
+ ac_cv_lib_m_sqrt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
+$as_echo "$ac_cv_lib_m_sqrt" >&6; }
+if test "x$ac_cv_lib_m_sqrt" = xyes; then :
+ lib_m="-lm"
+fi
+
+for x in $test_paths ; do
+ if test "x$x" = "x."; then
+ ac_fn_c_check_header_mongrel "$LINENO" "lua.h" "ac_cv_header_lua_h" "$ac_includes_default"
+if test "x$ac_cv_header_lua_h" = xyes; then :
+
+ save_CFLAGS=$CFLAGS
+ save_LDFLAGS=$LDFLAGS
+ CFLAGS="$CFLAGS"
+ LDFLAGS="$LDFLAGS $lib_m"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5
+$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; }
+if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llua5.1 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char luaL_newstate ();
+int
+main ()
+{
+return luaL_newstate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_lua5_1_luaL_newstate=yes
+else
+ ac_cv_lib_lua5_1_luaL_newstate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1_luaL_newstate" >&5
+$as_echo "$ac_cv_lib_lua5_1_luaL_newstate" >&6; }
+if test "x$ac_cv_lib_lua5_1_luaL_newstate" = xyes; then :
+
+ LUA_LIBS="-llua5.1 $lib_m"
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-5.1" >&5
+$as_echo_n "checking for luaL_newstate in -llua-5.1... " >&6; }
+if ${ac_cv_lib_lua_5_1_luaL_newstate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llua-5.1 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char luaL_newstate ();
+int
+main ()
+{
+return luaL_newstate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_lua_5_1_luaL_newstate=yes
+else
+ ac_cv_lib_lua_5_1_luaL_newstate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_5_1_luaL_newstate" >&5
+$as_echo "$ac_cv_lib_lua_5_1_luaL_newstate" >&6; }
+if test "x$ac_cv_lib_lua_5_1_luaL_newstate" = xyes; then :
+
+ LUA_LIBS="-llua-5.1 $lib_m"
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5
+$as_echo_n "checking for luaL_newstate in -llua... " >&6; }
+if ${ac_cv_lib_lua_luaL_newstate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llua $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char luaL_newstate ();
+int
+main ()
+{
+return luaL_newstate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_lua_luaL_newstate=yes
+else
+ ac_cv_lib_lua_luaL_newstate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5
+$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; }
+if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then :
+
+ LUA_LIBS="-llua $lib_m"
+
+fi
+
+
+fi
+
+
+fi
+
+ LUA_CFLAGS=
+ CFLAGS=$save_CFLAGS
+ LDFLAGS=$save_LDFLAGS
+ break
+
+fi
+
+
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua5.1" >&5
+$as_echo_n "checking for lua.h in ${x}/include/lua5.1... " >&6; }
+ if test -f ${x}/include/lua5.1/lua.h; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ save_CFLAGS=$CFLAGS
+ save_LDFLAGS=$LDFLAGS
+ CFLAGS="$CFLAGS"
+ LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5
+$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; }
+if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llua5.1 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char luaL_newstate ();
+int
+main ()
+{
+return luaL_newstate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_lua5_1_luaL_newstate=yes
+else
+ ac_cv_lib_lua5_1_luaL_newstate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1_luaL_newstate" >&5
+$as_echo "$ac_cv_lib_lua5_1_luaL_newstate" >&6; }
+if test "x$ac_cv_lib_lua5_1_luaL_newstate" = xyes; then :
+
+ LUA_LIBS="-L$x/lib -llua5.1 $lib_m"
+ if test "x$ap_platform_runtime_link_flag" != "x"; then
+
+ if test "x$LUA_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib\""
+ LUA_LIBS="$ap_platform_runtime_link_flag$x/lib"
+ else
+ apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $LUA_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS"
+ LUA_LIBS="$LUA_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ LUA_CFLAGS="-I$x/include/lua5.1"
+
+fi
+
+ CFLAGS=$save_CFLAGS
+ LDFLAGS=$save_LDFLAGS
+ break
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua51" >&5
+$as_echo_n "checking for lua.h in ${x}/include/lua51... " >&6; }
+ if test -f ${x}/include/lua51/lua.h; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ save_CFLAGS=$CFLAGS
+ save_LDFLAGS=$LDFLAGS
+ CFLAGS="$CFLAGS"
+ LDFLAGS="-L$x/lib/lua51 $LDFLAGS $lib_m"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5
+$as_echo_n "checking for luaL_newstate in -llua... " >&6; }
+if ${ac_cv_lib_lua_luaL_newstate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llua $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char luaL_newstate ();
+int
+main ()
+{
+return luaL_newstate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_lua_luaL_newstate=yes
+else
+ ac_cv_lib_lua_luaL_newstate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5
+$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; }
+if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then :
+
+ LUA_LIBS="-L$x/lib/lua51 -llua $lib_m"
+ if test "x$ap_platform_runtime_link_flag" != "x"; then
+
+ if test "x$LUA_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib/lua51\""
+ LUA_LIBS="$ap_platform_runtime_link_flag$x/lib/lua51"
+ else
+ apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib/lua51"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $LUA_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS"
+ LUA_LIBS="$LUA_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ LUA_CFLAGS="-I$x/include/lua51"
+
+fi
+
+ CFLAGS=$save_CFLAGS
+ LDFLAGS=$save_LDFLAGS
+ break
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include" >&5
+$as_echo_n "checking for lua.h in ${x}/include... " >&6; }
+ if test -f ${x}/include/lua.h; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ save_CFLAGS=$CFLAGS
+ save_LDFLAGS=$LDFLAGS
+ CFLAGS="$CFLAGS"
+ LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5
+$as_echo_n "checking for luaL_newstate in -llua... " >&6; }
+if ${ac_cv_lib_lua_luaL_newstate+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-llua $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char luaL_newstate ();
+int
+main ()
+{
+return luaL_newstate ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_lua_luaL_newstate=yes
+else
+ ac_cv_lib_lua_luaL_newstate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5
+$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; }
+if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then :
+
+ LUA_LIBS="-L$x/lib -llua $lib_m"
+ if test "x$ap_platform_runtime_link_flag" != "x"; then
+
+ if test "x$LUA_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib\""
+ LUA_LIBS="$ap_platform_runtime_link_flag$x/lib"
+ else
+ apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $LUA_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS"
+ LUA_LIBS="$LUA_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ LUA_CFLAGS="-I$x/include"
+
+fi
+
+ CFLAGS=$save_CFLAGS
+ LDFLAGS=$save_LDFLAGS
+ break
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ fi
+done
+
+
+
+
+if test -z "${LUA_LIBS}"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Lua 5.1 library not found." >&5
+$as_echo "$as_me: WARNING: *** Lua 5.1 library not found." >&2;}
+ enable_lua="no"
+ if test -z "${lua_path}"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Lua 5.1 library is required" >&5
+$as_echo "$as_me: WARNING: Lua 5.1 library is required" >&2;}
+ else
+ as_fn_error $? "Lua 5.1 library is required" "$LINENO" 5
+ fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: using '${LUA_LIBS}' for Lua Library" >&5
+$as_echo "$as_me: using '${LUA_LIBS}' for Lua Library" >&6;}
+ # Check whether --enable-luajit was given.
+if test "${enable_luajit+set}" = set; then :
+ enableval=$enable_luajit;
+ if test "x$CPPFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \""-DAP_ENABLE_LUAJIT"\""
+ CPPFLAGS=""-DAP_ENABLE_LUAJIT""
+ else
+ apr_addto_bugger=""-DAP_ENABLE_LUAJIT""
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CPPFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $i"
+ fi
+ done
+ fi
+
+fi
+
+
+fi
+
+ if test "x$enable_lua" != "xno" ; then
+
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"$LUA_CFLAGS\""
+ INCLUDES="$LUA_CFLAGS"
+ else
+ apr_addto_bugger="$LUA_CFLAGS"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+ if test "x$MOD_LUA_LDADD" = "x"; then
+ test "x$silent" != "xyes" && echo " setting MOD_LUA_LDADD to \"$LUA_LIBS\""
+ MOD_LUA_LDADD="$LUA_LIBS"
+ else
+ apr_addto_bugger="$LUA_LIBS"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $MOD_LUA_LDADD; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LUA_LDADD"
+ MOD_LUA_LDADD="$MOD_LUA_LDADD $i"
+ fi
+ done
+ fi
+
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lua" >&5
+$as_echo_n "checking whether to enable mod_lua... " >&6; }
+ if test "$enable_lua" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ as_fn_error $? "mod_lua has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ fi
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lua$_apmod_extra_msg" >&5
+$as_echo "$enable_lua$_apmod_extra_msg" >&6; }
+ if test "$enable_lua" != "no"; then
+ case "$enable_lua" in
+ static*)
+ MODLIST="$MODLIST lua"
+ if test "lua" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_lua=`echo $enable_lua|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES lua"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lua"
+ fi
+ ;;
+ esac
+
+
+ if test -z "$lua_objects"; then
+ objects="mod_lua.lo"
+ else
+ objects="$lua_objects"
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_lua.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_LUA_LDADD)
+EOF
+ if test ! -z "\$(MOD_LUA_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LUA_LDADD)\""
+ AP_LIBS="\$(MOD_LUA_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LUA_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_lua.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_LUA_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_LUA_LDADD"
+
+
+
+ fi
+
+
+
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+
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
@@ -11619,36 +19047,51 @@ EOF
$as_echo_n "checking whether to enable mod_env... " >&6; }
# Check whether --enable-env was given.
if test "${enable_env+set}" = set; then :
- enableval=$enable_env;
+ enableval=$enable_env; force_env=$enableval
else
enable_env=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_env" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_env" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_env" = "static"; then
- enable_env=yes
+ enable_env=static
elif test "$enable_env" = "yes"; then
enable_env=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_env" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_env=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_env" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_env=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_env" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_env=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_env=no
fi
+ elif test "$enable_env" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_env" != "no" ; then
+ enable_env=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_env" != "no"; then
:
@@ -11657,18 +19100,21 @@ fi
$as_echo "$enable_env$_apmod_extra_msg" >&6; }
if test "$enable_env" != "no"; then
case "$enable_env" in
- shared*)
- enable_env=`echo $enable_env|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES env"
- ;;
- *)
+ static*)
MODLIST="$MODLIST env"
if test "env" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_env=`echo $enable_env|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES env"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},env"
+ fi
+ ;;
esac
@@ -11688,6 +19134,29 @@ $as_echo "$enable_env$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_ENV_LDADD)
EOF
+ if test ! -z "\$(MOD_ENV_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_ENV_LDADD)\""
+ AP_LIBS="\$(MOD_ENV_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_ENV_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_env.la"
@@ -11712,36 +19181,51 @@ EOF
$as_echo_n "checking whether to enable mod_mime_magic... " >&6; }
# Check whether --enable-mime-magic was given.
if test "${enable_mime_magic+set}" = set; then :
- enableval=$enable_mime_magic;
+ enableval=$enable_mime_magic; force_mime_magic=$enableval
else
enable_mime_magic=maybe-all
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_mime_magic" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_mime_magic" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_mime_magic" = "static"; then
- enable_mime_magic=yes
+ enable_mime_magic=static
elif test "$enable_mime_magic" = "yes"; then
enable_mime_magic=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_mime_magic" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_mime_magic=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_mime_magic" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_mime_magic=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_mime_magic" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_mime_magic=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_mime_magic=no
fi
+ elif test "$enable_mime_magic" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_mime_magic" != "no" ; then
+ enable_mime_magic=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_mime_magic" != "no"; then
:
@@ -11750,18 +19234,21 @@ fi
$as_echo "$enable_mime_magic$_apmod_extra_msg" >&6; }
if test "$enable_mime_magic" != "no"; then
case "$enable_mime_magic" in
- shared*)
- enable_mime_magic=`echo $enable_mime_magic|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES mime_magic"
- ;;
- *)
+ static*)
MODLIST="$MODLIST mime_magic"
if test "mime_magic" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_mime_magic=`echo $enable_mime_magic|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES mime_magic"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mime_magic"
+ fi
+ ;;
esac
@@ -11781,6 +19268,29 @@ $as_echo "$enable_mime_magic$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_MIME_MAGIC_LDADD)
EOF
+ if test ! -z "\$(MOD_MIME_MAGIC_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_MIME_MAGIC_LDADD)\""
+ AP_LIBS="\$(MOD_MIME_MAGIC_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_MIME_MAGIC_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_mime_magic.la"
@@ -11805,36 +19315,51 @@ EOF
$as_echo_n "checking whether to enable mod_cern_meta... " >&6; }
# Check whether --enable-cern-meta was given.
if test "${enable_cern_meta+set}" = set; then :
- enableval=$enable_cern_meta;
+ enableval=$enable_cern_meta; force_cern_meta=$enableval
else
- enable_cern_meta=maybe-all
+ enable_cern_meta=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_cern_meta" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_cern_meta" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_cern_meta" = "static"; then
- enable_cern_meta=yes
+ enable_cern_meta=static
elif test "$enable_cern_meta" = "yes"; then
enable_cern_meta=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cern_meta" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_cern_meta=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_cern_meta" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_cern_meta=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cern_meta" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_cern_meta=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_cern_meta=no
fi
+ elif test "$enable_cern_meta" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_cern_meta" != "no" ; then
+ enable_cern_meta=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_cern_meta" != "no"; then
:
@@ -11843,18 +19368,21 @@ fi
$as_echo "$enable_cern_meta$_apmod_extra_msg" >&6; }
if test "$enable_cern_meta" != "no"; then
case "$enable_cern_meta" in
- shared*)
- enable_cern_meta=`echo $enable_cern_meta|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES cern_meta"
- ;;
- *)
+ static*)
MODLIST="$MODLIST cern_meta"
if test "cern_meta" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_cern_meta=`echo $enable_cern_meta|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES cern_meta"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cern_meta"
+ fi
+ ;;
esac
@@ -11874,6 +19402,29 @@ $as_echo "$enable_cern_meta$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CERN_META_LDADD)
EOF
+ if test ! -z "\$(MOD_CERN_META_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CERN_META_LDADD)\""
+ AP_LIBS="\$(MOD_CERN_META_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CERN_META_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_cern_meta.la"
@@ -11898,36 +19449,51 @@ EOF
$as_echo_n "checking whether to enable mod_expires... " >&6; }
# Check whether --enable-expires was given.
if test "${enable_expires+set}" = set; then :
- enableval=$enable_expires;
+ enableval=$enable_expires; force_expires=$enableval
else
enable_expires=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_expires" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_expires" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_expires" = "static"; then
- enable_expires=yes
+ enable_expires=static
elif test "$enable_expires" = "yes"; then
enable_expires=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_expires" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_expires=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_expires" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_expires=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_expires" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_expires=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_expires=no
fi
+ elif test "$enable_expires" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_expires" != "no" ; then
+ enable_expires=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_expires" != "no"; then
:
@@ -11936,18 +19502,21 @@ fi
$as_echo "$enable_expires$_apmod_extra_msg" >&6; }
if test "$enable_expires" != "no"; then
case "$enable_expires" in
- shared*)
- enable_expires=`echo $enable_expires|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES expires"
- ;;
- *)
+ static*)
MODLIST="$MODLIST expires"
if test "expires" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_expires=`echo $enable_expires|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES expires"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},expires"
+ fi
+ ;;
esac
@@ -11967,6 +19536,29 @@ $as_echo "$enable_expires$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_EXPIRES_LDADD)
EOF
+ if test ! -z "\$(MOD_EXPIRES_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_EXPIRES_LDADD)\""
+ AP_LIBS="\$(MOD_EXPIRES_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_EXPIRES_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_expires.la"
@@ -11991,36 +19583,51 @@ EOF
$as_echo_n "checking whether to enable mod_headers... " >&6; }
# Check whether --enable-headers was given.
if test "${enable_headers+set}" = set; then :
- enableval=$enable_headers;
+ enableval=$enable_headers; force_headers=$enableval
else
- enable_headers=most
+ enable_headers=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_headers" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_headers" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_headers" = "static"; then
- enable_headers=yes
+ enable_headers=static
elif test "$enable_headers" = "yes"; then
enable_headers=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_headers" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_headers=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_headers" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_headers=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_headers" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_headers=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_headers=no
fi
+ elif test "$enable_headers" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_headers" != "no" ; then
+ enable_headers=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_headers" != "no"; then
:
@@ -12029,18 +19636,21 @@ fi
$as_echo "$enable_headers$_apmod_extra_msg" >&6; }
if test "$enable_headers" != "no"; then
case "$enable_headers" in
- shared*)
- enable_headers=`echo $enable_headers|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES headers"
- ;;
- *)
+ static*)
MODLIST="$MODLIST headers"
if test "headers" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_headers=`echo $enable_headers|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES headers"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},headers"
+ fi
+ ;;
esac
@@ -12060,6 +19670,29 @@ $as_echo "$enable_headers$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_HEADERS_LDADD)
EOF
+ if test ! -z "\$(MOD_HEADERS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_HEADERS_LDADD)\""
+ AP_LIBS="\$(MOD_HEADERS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_HEADERS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_headers.la"
@@ -12084,36 +19717,51 @@ EOF
$as_echo_n "checking whether to enable mod_ident... " >&6; }
# Check whether --enable-ident was given.
if test "${enable_ident+set}" = set; then :
- enableval=$enable_ident;
+ enableval=$enable_ident; force_ident=$enableval
else
- enable_ident=most
+ enable_ident=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_ident" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_ident" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_ident" = "static"; then
- enable_ident=yes
+ enable_ident=static
elif test "$enable_ident" = "yes"; then
enable_ident=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_ident" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_ident=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_ident" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_ident=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_ident" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_ident=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_ident=no
fi
+ elif test "$enable_ident" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_ident" != "no" ; then
+ enable_ident=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_ident" != "no"; then
:
@@ -12122,18 +19770,21 @@ fi
$as_echo "$enable_ident$_apmod_extra_msg" >&6; }
if test "$enable_ident" != "no"; then
case "$enable_ident" in
- shared*)
- enable_ident=`echo $enable_ident|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES ident"
- ;;
- *)
+ static*)
MODLIST="$MODLIST ident"
if test "ident" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_ident=`echo $enable_ident|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES ident"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ident"
+ fi
+ ;;
esac
@@ -12153,6 +19804,29 @@ $as_echo "$enable_ident$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_IDENT_LDADD)
EOF
+ if test ! -z "\$(MOD_IDENT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_IDENT_LDADD)\""
+ AP_LIBS="\$(MOD_IDENT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_IDENT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_ident.la"
@@ -12178,36 +19852,51 @@ EOF
$as_echo_n "checking whether to enable mod_usertrack... " >&6; }
# Check whether --enable-usertrack was given.
if test "${enable_usertrack+set}" = set; then :
- enableval=$enable_usertrack;
+ enableval=$enable_usertrack; force_usertrack=$enableval
else
enable_usertrack=maybe-all
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_usertrack" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_usertrack" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_usertrack" = "static"; then
- enable_usertrack=yes
+ enable_usertrack=static
elif test "$enable_usertrack" = "yes"; then
enable_usertrack=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_usertrack" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_usertrack=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_usertrack" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_usertrack=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_usertrack" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_usertrack=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_usertrack=no
fi
+ elif test "$enable_usertrack" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_usertrack" != "no" ; then
+ enable_usertrack=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_usertrack" != "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -12216,7 +19905,7 @@ $as_echo "checking dependencies" >&6; }
for ac_header in sys/times.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_times_h" = x""yes; then :
+if test "x$ac_cv_header_sys_times_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_TIMES_H 1
_ACEOF
@@ -12228,7 +19917,7 @@ done
for ac_func in times
do :
ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times"
-if test "x$ac_cv_func_times" = x""yes; then :
+if test "x$ac_cv_func_times" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_TIMES 1
_ACEOF
@@ -12240,10 +19929,10 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_usertrack" >&5
$as_echo_n "checking whether to enable mod_usertrack... " >&6; }
if test "$enable_usertrack" = "no"; then
- if test "$_apmod_error_fatal" = "no"; then
+ if test "$_apmod_required" = "no"; then
_apmod_extra_msg=" (disabled)"
else
- as_fn_error "mod_usertrack has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ as_fn_error $? "mod_usertrack has been requested but can not be built due to prerequisite failures" "$LINENO" 5
fi
fi
fi
@@ -12251,18 +19940,21 @@ $as_echo_n "checking whether to enable mod_usertrack... " >&6; }
$as_echo "$enable_usertrack$_apmod_extra_msg" >&6; }
if test "$enable_usertrack" != "no"; then
case "$enable_usertrack" in
- shared*)
- enable_usertrack=`echo $enable_usertrack|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES usertrack"
- ;;
- *)
+ static*)
MODLIST="$MODLIST usertrack"
if test "usertrack" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_usertrack=`echo $enable_usertrack|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES usertrack"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},usertrack"
+ fi
+ ;;
esac
@@ -12282,6 +19974,29 @@ $as_echo "$enable_usertrack$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_USERTRACK_LDADD)
EOF
+ if test ! -z "\$(MOD_USERTRACK_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_USERTRACK_LDADD)\""
+ AP_LIBS="\$(MOD_USERTRACK_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_USERTRACK_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_usertrack.la"
@@ -12307,36 +20022,51 @@ EOF
$as_echo_n "checking whether to enable mod_unique_id... " >&6; }
# Check whether --enable-unique-id was given.
if test "${enable_unique_id+set}" = set; then :
- enableval=$enable_unique_id;
+ enableval=$enable_unique_id; force_unique_id=$enableval
else
- enable_unique_id=maybe-all
+ enable_unique_id=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_unique_id" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_unique_id" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_unique_id" = "static"; then
- enable_unique_id=yes
+ enable_unique_id=static
elif test "$enable_unique_id" = "yes"; then
enable_unique_id=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_unique_id" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_unique_id=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_unique_id" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_unique_id=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_unique_id" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_unique_id=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_unique_id=no
fi
+ elif test "$enable_unique_id" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_unique_id" != "no" ; then
+ enable_unique_id=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_unique_id" != "no"; then
:
@@ -12345,18 +20075,21 @@ fi
$as_echo "$enable_unique_id$_apmod_extra_msg" >&6; }
if test "$enable_unique_id" != "no"; then
case "$enable_unique_id" in
- shared*)
- enable_unique_id=`echo $enable_unique_id|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES unique_id"
- ;;
- *)
+ static*)
MODLIST="$MODLIST unique_id"
if test "unique_id" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_unique_id=`echo $enable_unique_id|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES unique_id"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},unique_id"
+ fi
+ ;;
esac
@@ -12376,6 +20109,29 @@ $as_echo "$enable_unique_id$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_UNIQUE_ID_LDADD)
EOF
+ if test ! -z "\$(MOD_UNIQUE_ID_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_UNIQUE_ID_LDADD)\""
+ AP_LIBS="\$(MOD_UNIQUE_ID_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_UNIQUE_ID_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_unique_id.la"
@@ -12400,36 +20156,51 @@ EOF
$as_echo_n "checking whether to enable mod_setenvif... " >&6; }
# Check whether --enable-setenvif was given.
if test "${enable_setenvif+set}" = set; then :
- enableval=$enable_setenvif;
+ enableval=$enable_setenvif; force_setenvif=$enableval
else
enable_setenvif=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_setenvif" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_setenvif" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_setenvif" = "static"; then
- enable_setenvif=yes
+ enable_setenvif=static
elif test "$enable_setenvif" = "yes"; then
enable_setenvif=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_setenvif" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_setenvif=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_setenvif" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_setenvif=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_setenvif" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_setenvif=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_setenvif=no
fi
+ elif test "$enable_setenvif" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_setenvif" != "no" ; then
+ enable_setenvif=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_setenvif" != "no"; then
:
@@ -12438,18 +20209,21 @@ fi
$as_echo "$enable_setenvif$_apmod_extra_msg" >&6; }
if test "$enable_setenvif" != "no"; then
case "$enable_setenvif" in
- shared*)
- enable_setenvif=`echo $enable_setenvif|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES setenvif"
- ;;
- *)
+ static*)
MODLIST="$MODLIST setenvif"
if test "setenvif" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_setenvif=`echo $enable_setenvif|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES setenvif"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},setenvif"
+ fi
+ ;;
esac
@@ -12469,6 +20243,29 @@ $as_echo "$enable_setenvif$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_SETENVIF_LDADD)
EOF
+ if test ! -z "\$(MOD_SETENVIF_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SETENVIF_LDADD)\""
+ AP_LIBS="\$(MOD_SETENVIF_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SETENVIF_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_setenvif.la"
@@ -12493,36 +20290,51 @@ EOF
$as_echo_n "checking whether to enable mod_version... " >&6; }
# Check whether --enable-version was given.
if test "${enable_version+set}" = set; then :
- enableval=$enable_version;
+ enableval=$enable_version; force_version=$enableval
else
enable_version=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_version" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_version" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_version" = "static"; then
- enable_version=yes
+ enable_version=static
elif test "$enable_version" = "yes"; then
enable_version=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_version" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_version=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_version" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_version=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_version" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_version=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_version=no
fi
+ elif test "$enable_version" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_version" != "no" ; then
+ enable_version=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_version" != "no"; then
:
@@ -12531,18 +20343,21 @@ fi
$as_echo "$enable_version$_apmod_extra_msg" >&6; }
if test "$enable_version" != "no"; then
case "$enable_version" in
- shared*)
- enable_version=`echo $enable_version|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES version"
- ;;
- *)
+ static*)
MODLIST="$MODLIST version"
if test "version" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_version=`echo $enable_version|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES version"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},version"
+ fi
+ ;;
esac
@@ -12562,6 +20377,29 @@ $as_echo "$enable_version$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_VERSION_LDADD)
EOF
+ if test ! -z "\$(MOD_VERSION_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_VERSION_LDADD)\""
+ AP_LIBS="\$(MOD_VERSION_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_VERSION_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_version.la"
@@ -12582,6 +20420,140 @@ EOF
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_remoteip" >&5
+$as_echo_n "checking whether to enable mod_remoteip... " >&6; }
+ # Check whether --enable-remoteip was given.
+if test "${enable_remoteip+set}" = set; then :
+ enableval=$enable_remoteip; force_remoteip=$enableval
+else
+ enable_remoteip=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_remoteip" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_remoteip" = "static"; then
+ enable_remoteip=static
+ elif test "$enable_remoteip" = "yes"; then
+ enable_remoteip=$module_default
+ elif test "$enable_remoteip" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_remoteip=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_remoteip=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_remoteip" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_remoteip=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_remoteip=no
+ fi
+ elif test "$enable_remoteip" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_remoteip" != "no" ; then
+ enable_remoteip=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_remoteip" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_remoteip$_apmod_extra_msg" >&5
+$as_echo "$enable_remoteip$_apmod_extra_msg" >&6; }
+ if test "$enable_remoteip" != "no"; then
+ case "$enable_remoteip" in
+ static*)
+ MODLIST="$MODLIST remoteip"
+ if test "remoteip" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_remoteip=`echo $enable_remoteip|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES remoteip"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},remoteip"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_remoteip.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_remoteip.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_REMOTEIP_LDADD)
+EOF
+ if test ! -z "\$(MOD_REMOTEIP_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_REMOTEIP_LDADD)\""
+ AP_LIBS="\$(MOD_REMOTEIP_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_REMOTEIP_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_remoteip.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_REMOTEIP_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_REMOTEIP_LDADD"
+
+
+
+ fi
+
+
echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
echo "static = $modpath_static" >> $modpath_current/modules.mk
@@ -12611,7 +20583,7 @@ if test "$enable_proxy" = "shared"; then
elif test "$enable_proxy" = "yes"; then
proxy_mods_enable=yes
else
- proxy_mods_enable=no
+ proxy_mods_enable=most
fi
proxy_objs="mod_proxy.lo proxy_util.lo"
@@ -12620,36 +20592,51 @@ proxy_objs="mod_proxy.lo proxy_util.lo"
$as_echo_n "checking whether to enable mod_proxy... " >&6; }
# Check whether --enable-proxy was given.
if test "${enable_proxy+set}" = set; then :
- enableval=$enable_proxy;
+ enableval=$enable_proxy; force_proxy=$enableval
else
enable_proxy=$proxy_mods_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_proxy" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_proxy" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_proxy" = "static"; then
- enable_proxy=yes
+ enable_proxy=static
elif test "$enable_proxy" = "yes"; then
enable_proxy=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_proxy=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_proxy" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_proxy=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_proxy=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_proxy=no
fi
+ elif test "$enable_proxy" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy" != "no" ; then
+ enable_proxy=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_proxy" != "no"; then
:
@@ -12658,18 +20645,21 @@ fi
$as_echo "$enable_proxy$_apmod_extra_msg" >&6; }
if test "$enable_proxy" != "no"; then
case "$enable_proxy" in
- shared*)
- enable_proxy=`echo $enable_proxy|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES proxy"
- ;;
- *)
+ static*)
MODLIST="$MODLIST proxy"
if test "proxy" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_proxy=`echo $enable_proxy|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy"
+ fi
+ ;;
esac
@@ -12689,6 +20679,29 @@ $as_echo "$enable_proxy$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_PROXY_LDADD)
EOF
+ if test ! -z "\$(MOD_PROXY_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_proxy.la"
@@ -12712,7 +20725,9 @@ EOF
proxy_connect_objs="mod_proxy_connect.lo"
proxy_ftp_objs="mod_proxy_ftp.lo"
proxy_http_objs="mod_proxy_http.lo"
+proxy_fcgi_objs="mod_proxy_fcgi.lo"
proxy_scgi_objs="mod_proxy_scgi.lo"
+proxy_fdpass_objs="mod_proxy_fdpass.lo"
proxy_ajp_objs="mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo ajp_utils.lo"
proxy_balancer_objs="mod_proxy_balancer.lo"
@@ -12723,7 +20738,9 @@ case "$host" in
proxy_connect_objs="$proxy_connect_objs mod_proxy.la"
proxy_ftp_objs="$proxy_ftp_objs mod_proxy.la"
proxy_http_objs="$proxy_http_objs mod_proxy.la"
+ proxy_fcgi_objs="$proxy_fcgi_objs mod_proxy.la"
proxy_scgi_objs="$proxy_scgi_objs mod_proxy.la"
+ proxy_fdpass_objs="$proxy_fdpass_objs mod_proxy.la"
proxy_ajp_objs="$proxy_ajp_objs mod_proxy.la"
proxy_balancer_objs="$proxy_balancer_objs mod_proxy.la"
;;
@@ -12734,36 +20751,51 @@ esac
$as_echo_n "checking whether to enable mod_proxy_connect... " >&6; }
# Check whether --enable-proxy-connect was given.
if test "${enable_proxy_connect+set}" = set; then :
- enableval=$enable_proxy_connect;
+ enableval=$enable_proxy_connect; force_proxy_connect=$enableval
else
enable_proxy_connect=$proxy_mods_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_proxy_connect" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_proxy_connect" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_proxy_connect" = "static"; then
- enable_proxy_connect=yes
+ enable_proxy_connect=static
elif test "$enable_proxy_connect" = "yes"; then
enable_proxy_connect=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_connect" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_proxy_connect=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_proxy_connect" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_proxy_connect=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_connect" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_proxy_connect=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_proxy_connect=no
fi
+ elif test "$enable_proxy_connect" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_connect" != "no" ; then
+ enable_proxy_connect=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_proxy_connect" != "no"; then
:
@@ -12772,18 +20804,21 @@ fi
$as_echo "$enable_proxy_connect$_apmod_extra_msg" >&6; }
if test "$enable_proxy_connect" != "no"; then
case "$enable_proxy_connect" in
- shared*)
- enable_proxy_connect=`echo $enable_proxy_connect|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES proxy_connect"
- ;;
- *)
+ static*)
MODLIST="$MODLIST proxy_connect"
if test "proxy_connect" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_proxy_connect=`echo $enable_proxy_connect|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_connect"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_connect"
+ fi
+ ;;
esac
@@ -12803,6 +20838,29 @@ $as_echo "$enable_proxy_connect$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_PROXY_CONNECT_LDADD)
EOF
+ if test ! -z "\$(MOD_PROXY_CONNECT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_CONNECT_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_CONNECT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_CONNECT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_proxy_connect.la"
@@ -12827,36 +20885,51 @@ EOF
$as_echo_n "checking whether to enable mod_proxy_ftp... " >&6; }
# Check whether --enable-proxy-ftp was given.
if test "${enable_proxy_ftp+set}" = set; then :
- enableval=$enable_proxy_ftp;
+ enableval=$enable_proxy_ftp; force_proxy_ftp=$enableval
else
enable_proxy_ftp=$proxy_mods_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_proxy_ftp" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_proxy_ftp" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_proxy_ftp" = "static"; then
- enable_proxy_ftp=yes
+ enable_proxy_ftp=static
elif test "$enable_proxy_ftp" = "yes"; then
enable_proxy_ftp=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_ftp" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_proxy_ftp=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_proxy_ftp" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_proxy_ftp=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_ftp" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_proxy_ftp=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_proxy_ftp=no
fi
+ elif test "$enable_proxy_ftp" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_ftp" != "no" ; then
+ enable_proxy_ftp=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_proxy_ftp" != "no"; then
:
@@ -12865,18 +20938,21 @@ fi
$as_echo "$enable_proxy_ftp$_apmod_extra_msg" >&6; }
if test "$enable_proxy_ftp" != "no"; then
case "$enable_proxy_ftp" in
- shared*)
- enable_proxy_ftp=`echo $enable_proxy_ftp|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES proxy_ftp"
- ;;
- *)
+ static*)
MODLIST="$MODLIST proxy_ftp"
if test "proxy_ftp" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_proxy_ftp=`echo $enable_proxy_ftp|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_ftp"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ftp"
+ fi
+ ;;
esac
@@ -12896,6 +20972,29 @@ $as_echo "$enable_proxy_ftp$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_PROXY_FTP_LDADD)
EOF
+ if test ! -z "\$(MOD_PROXY_FTP_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_FTP_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_FTP_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_FTP_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_proxy_ftp.la"
@@ -12920,36 +21019,51 @@ EOF
$as_echo_n "checking whether to enable mod_proxy_http... " >&6; }
# Check whether --enable-proxy-http was given.
if test "${enable_proxy_http+set}" = set; then :
- enableval=$enable_proxy_http;
+ enableval=$enable_proxy_http; force_proxy_http=$enableval
else
enable_proxy_http=$proxy_mods_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_proxy_http" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_proxy_http" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_proxy_http" = "static"; then
- enable_proxy_http=yes
+ enable_proxy_http=static
elif test "$enable_proxy_http" = "yes"; then
enable_proxy_http=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_http" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_proxy_http=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_proxy_http" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_proxy_http=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_http" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_proxy_http=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_proxy_http=no
fi
+ elif test "$enable_proxy_http" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_http" != "no" ; then
+ enable_proxy_http=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_proxy_http" != "no"; then
:
@@ -12958,18 +21072,21 @@ fi
$as_echo "$enable_proxy_http$_apmod_extra_msg" >&6; }
if test "$enable_proxy_http" != "no"; then
case "$enable_proxy_http" in
- shared*)
- enable_proxy_http=`echo $enable_proxy_http|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES proxy_http"
- ;;
- *)
+ static*)
MODLIST="$MODLIST proxy_http"
if test "proxy_http" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_proxy_http=`echo $enable_proxy_http|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_http"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_http"
+ fi
+ ;;
esac
@@ -12989,6 +21106,29 @@ $as_echo "$enable_proxy_http$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_PROXY_HTTP_LDADD)
EOF
+ if test ! -z "\$(MOD_PROXY_HTTP_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_HTTP_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_HTTP_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_HTTP_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_proxy_http.la"
@@ -13009,40 +21149,189 @@ EOF
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_fcgi" >&5
+$as_echo_n "checking whether to enable mod_proxy_fcgi... " >&6; }
+ # Check whether --enable-proxy-fcgi was given.
+if test "${enable_proxy_fcgi+set}" = set; then :
+ enableval=$enable_proxy_fcgi; force_proxy_fcgi=$enableval
+else
+ enable_proxy_fcgi=$proxy_mods_enable
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_proxy_fcgi" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_proxy_fcgi" = "static"; then
+ enable_proxy_fcgi=static
+ elif test "$enable_proxy_fcgi" = "yes"; then
+ enable_proxy_fcgi=$module_default
+ elif test "$enable_proxy_fcgi" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_proxy_fcgi=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_proxy_fcgi=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_proxy_fcgi" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_proxy_fcgi=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_proxy_fcgi=no
+ fi
+ elif test "$enable_proxy_fcgi" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_fcgi" != "no" ; then
+ enable_proxy_fcgi=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_proxy_fcgi" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_fcgi$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_fcgi$_apmod_extra_msg" >&6; }
+ if test "$enable_proxy_fcgi" != "no"; then
+ case "$enable_proxy_fcgi" in
+ static*)
+ MODLIST="$MODLIST proxy_fcgi"
+ if test "proxy_fcgi" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_proxy_fcgi=`echo $enable_proxy_fcgi|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_fcgi"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_fcgi"
+ fi
+ ;;
+ esac
+
+
+ if test -z "$proxy_fcgi_objs"; then
+ objects="mod_proxy_fcgi.lo"
+ else
+ objects="$proxy_fcgi_objs"
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_proxy_fcgi.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_PROXY_FCGI_LDADD)
+EOF
+ if test ! -z "\$(MOD_PROXY_FCGI_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_FCGI_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_FCGI_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_FCGI_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_proxy_fcgi.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_PROXY_FCGI_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_PROXY_FCGI_LDADD"
+
+
+
+ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_scgi" >&5
$as_echo_n "checking whether to enable mod_proxy_scgi... " >&6; }
# Check whether --enable-proxy-scgi was given.
if test "${enable_proxy_scgi+set}" = set; then :
- enableval=$enable_proxy_scgi;
+ enableval=$enable_proxy_scgi; force_proxy_scgi=$enableval
else
enable_proxy_scgi=$proxy_mods_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_proxy_scgi" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_proxy_scgi" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_proxy_scgi" = "static"; then
- enable_proxy_scgi=yes
+ enable_proxy_scgi=static
elif test "$enable_proxy_scgi" = "yes"; then
enable_proxy_scgi=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_scgi" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_proxy_scgi=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_proxy_scgi" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_proxy_scgi=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_scgi" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_proxy_scgi=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_proxy_scgi=no
fi
+ elif test "$enable_proxy_scgi" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_scgi" != "no" ; then
+ enable_proxy_scgi=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_proxy_scgi" != "no"; then
:
@@ -13051,18 +21340,21 @@ fi
$as_echo "$enable_proxy_scgi$_apmod_extra_msg" >&6; }
if test "$enable_proxy_scgi" != "no"; then
case "$enable_proxy_scgi" in
- shared*)
- enable_proxy_scgi=`echo $enable_proxy_scgi|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES proxy_scgi"
- ;;
- *)
+ static*)
MODLIST="$MODLIST proxy_scgi"
if test "proxy_scgi" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_proxy_scgi=`echo $enable_proxy_scgi|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_scgi"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_scgi"
+ fi
+ ;;
esac
@@ -13082,6 +21374,29 @@ $as_echo "$enable_proxy_scgi$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_PROXY_SCGI_LDADD)
EOF
+ if test ! -z "\$(MOD_PROXY_SCGI_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_SCGI_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_SCGI_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_SCGI_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_proxy_scgi.la"
@@ -13102,40 +21417,215 @@ EOF
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_fdpass" >&5
+$as_echo_n "checking whether to enable mod_proxy_fdpass... " >&6; }
+ # Check whether --enable-proxy-fdpass was given.
+if test "${enable_proxy_fdpass+set}" = set; then :
+ enableval=$enable_proxy_fdpass; force_proxy_fdpass=$enableval
+else
+ enable_proxy_fdpass=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_proxy_fdpass" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_proxy_fdpass" = "static"; then
+ enable_proxy_fdpass=static
+ elif test "$enable_proxy_fdpass" = "yes"; then
+ enable_proxy_fdpass=$module_default
+ elif test "$enable_proxy_fdpass" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_proxy_fdpass=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_proxy_fdpass=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_proxy_fdpass" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_proxy_fdpass=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_proxy_fdpass=no
+ fi
+ elif test "$enable_proxy_fdpass" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_fdpass" != "no" ; then
+ enable_proxy_fdpass=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_proxy_fdpass" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+ ac_fn_c_check_decl "$LINENO" "CMSG_DATA" "ac_cv_have_decl_CMSG_DATA" "
+ #include <sys/types.h>
+ #include <sys/socket.h>
+
+"
+if test "x$ac_cv_have_decl_CMSG_DATA" = xyes; then :
+
+fi
+
+ if test $ac_cv_have_decl_CMSG_DATA = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your system does not support CMSG_DATA." >&5
+$as_echo "$as_me: WARNING: Your system does not support CMSG_DATA." >&2;}
+ enable_proxy_fdpass=no
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_fdpass" >&5
+$as_echo_n "checking whether to enable mod_proxy_fdpass... " >&6; }
+ if test "$enable_proxy_fdpass" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ as_fn_error $? "mod_proxy_fdpass has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ fi
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_fdpass$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_fdpass$_apmod_extra_msg" >&6; }
+ if test "$enable_proxy_fdpass" != "no"; then
+ case "$enable_proxy_fdpass" in
+ static*)
+ MODLIST="$MODLIST proxy_fdpass"
+ if test "proxy_fdpass" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_proxy_fdpass=`echo $enable_proxy_fdpass|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_fdpass"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_fdpass"
+ fi
+ ;;
+ esac
+
+
+ if test -z "$proxy_fdpass_objs"; then
+ objects="mod_proxy_fdpass.lo"
+ else
+ objects="$proxy_fdpass_objs"
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_proxy_fdpass.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_PROXY_FDPASS_LDADD)
+EOF
+ if test ! -z "\$(MOD_PROXY_FDPASS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_FDPASS_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_FDPASS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_FDPASS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_proxy_fdpass.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_PROXY_FDPASS_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_PROXY_FDPASS_LDADD"
+
+
+
+ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_ajp" >&5
$as_echo_n "checking whether to enable mod_proxy_ajp... " >&6; }
# Check whether --enable-proxy-ajp was given.
if test "${enable_proxy_ajp+set}" = set; then :
- enableval=$enable_proxy_ajp;
+ enableval=$enable_proxy_ajp; force_proxy_ajp=$enableval
else
enable_proxy_ajp=$proxy_mods_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_proxy_ajp" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_proxy_ajp" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_proxy_ajp" = "static"; then
- enable_proxy_ajp=yes
+ enable_proxy_ajp=static
elif test "$enable_proxy_ajp" = "yes"; then
enable_proxy_ajp=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_ajp" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_proxy_ajp=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_proxy_ajp" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_proxy_ajp=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_ajp" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_proxy_ajp=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_proxy_ajp=no
fi
+ elif test "$enable_proxy_ajp" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_ajp" != "no" ; then
+ enable_proxy_ajp=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_proxy_ajp" != "no"; then
:
@@ -13144,18 +21634,21 @@ fi
$as_echo "$enable_proxy_ajp$_apmod_extra_msg" >&6; }
if test "$enable_proxy_ajp" != "no"; then
case "$enable_proxy_ajp" in
- shared*)
- enable_proxy_ajp=`echo $enable_proxy_ajp|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES proxy_ajp"
- ;;
- *)
+ static*)
MODLIST="$MODLIST proxy_ajp"
if test "proxy_ajp" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_proxy_ajp=`echo $enable_proxy_ajp|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_ajp"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ajp"
+ fi
+ ;;
esac
@@ -13175,6 +21668,29 @@ $as_echo "$enable_proxy_ajp$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_PROXY_AJP_LDADD)
EOF
+ if test ! -z "\$(MOD_PROXY_AJP_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_AJP_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_AJP_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_AJP_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_proxy_ajp.la"
@@ -13199,36 +21715,51 @@ EOF
$as_echo_n "checking whether to enable mod_proxy_balancer... " >&6; }
# Check whether --enable-proxy-balancer was given.
if test "${enable_proxy_balancer+set}" = set; then :
- enableval=$enable_proxy_balancer;
+ enableval=$enable_proxy_balancer; force_proxy_balancer=$enableval
else
enable_proxy_balancer=$proxy_mods_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_proxy_balancer" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_proxy_balancer" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_proxy_balancer" = "static"; then
- enable_proxy_balancer=yes
+ enable_proxy_balancer=static
elif test "$enable_proxy_balancer" = "yes"; then
enable_proxy_balancer=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_balancer" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_proxy_balancer=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_proxy_balancer" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_proxy_balancer=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_proxy_balancer" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_proxy_balancer=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_proxy_balancer=no
fi
+ elif test "$enable_proxy_balancer" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_balancer" != "no" ; then
+ enable_proxy_balancer=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_proxy_balancer" != "no"; then
:
@@ -13237,18 +21768,21 @@ fi
$as_echo "$enable_proxy_balancer$_apmod_extra_msg" >&6; }
if test "$enable_proxy_balancer" != "no"; then
case "$enable_proxy_balancer" in
- shared*)
- enable_proxy_balancer=`echo $enable_proxy_balancer|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES proxy_balancer"
- ;;
- *)
+ static*)
MODLIST="$MODLIST proxy_balancer"
if test "proxy_balancer" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_proxy_balancer=`echo $enable_proxy_balancer|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_balancer"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_balancer"
+ fi
+ ;;
esac
@@ -13268,6 +21802,29 @@ $as_echo "$enable_proxy_balancer$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_PROXY_BALANCER_LDADD)
EOF
+ if test ! -z "\$(MOD_PROXY_BALANCER_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_BALANCER_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_BALANCER_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_BALANCER_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_proxy_balancer.la"
@@ -13289,11 +21846,146 @@ EOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_express" >&5
+$as_echo_n "checking whether to enable mod_proxy_express... " >&6; }
+ # Check whether --enable-proxy-express was given.
+if test "${enable_proxy_express+set}" = set; then :
+ enableval=$enable_proxy_express; force_proxy_express=$enableval
+else
+ enable_proxy_express=$proxy_mods_enable
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_proxy_express" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_proxy_express" = "static"; then
+ enable_proxy_express=static
+ elif test "$enable_proxy_express" = "yes"; then
+ enable_proxy_express=$module_default
+ elif test "$enable_proxy_express" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_proxy_express=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_proxy_express=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_proxy_express" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_proxy_express=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_proxy_express=no
+ fi
+ elif test "$enable_proxy_express" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_proxy_express" != "no" ; then
+ enable_proxy_express=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_proxy_express" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_express$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_express$_apmod_extra_msg" >&6; }
+ if test "$enable_proxy_express" != "no"; then
+ case "$enable_proxy_express" in
+ static*)
+ MODLIST="$MODLIST proxy_express"
+ if test "proxy_express" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_proxy_express=`echo $enable_proxy_express|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES proxy_express"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_express"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_proxy_express.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_proxy_express.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_PROXY_EXPRESS_LDADD)
+EOF
+ if test ! -z "\$(MOD_PROXY_EXPRESS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PROXY_EXPRESS_LDADD)\""
+ AP_LIBS="\$(MOD_PROXY_EXPRESS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PROXY_EXPRESS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_proxy_express.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_PROXY_EXPRESS_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_PROXY_EXPRESS_LDADD"
+
+
+
+ fi
+
+
+
if test "x$INCLUDES" = "x"; then
- test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current/../generators\""
- INCLUDES="-I\$(top_srcdir)/$modpath_current/../generators"
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
else
- apr_addto_bugger="-I\$(top_srcdir)/$modpath_current/../generators"
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $INCLUDES; do
@@ -13326,124 +22018,636 @@ EOF
+if test -z "$enable_session" ; then
+ session_mods_enable=most
+else
+ session_mods_enable=$enable_session
+fi
+
- current_dir=ssl
- modpath_current=modules/ssl
+
+ current_dir=session
+ modpath_current=modules/session
modpath_static=
modpath_shared=
- test -d ssl || $srcdir/build/mkdir.sh $modpath_current
+ test -d session || $srcdir/build/mkdir.sh $modpath_current
> $modpath_current/modules.mk
-ssl_objs="mod_ssl.lo ssl_engine_config.lo ssl_engine_dh.lo ssl_engine_init.lo ssl_engine_io.lo ssl_engine_kernel.lo ssl_engine_log.lo ssl_engine_mutex.lo ssl_engine_pphrase.lo ssl_engine_rand.lo ssl_engine_vars.lo ssl_expr.lo ssl_expr_eval.lo ssl_expr_parse.lo ssl_expr_scan.lo ssl_scache.lo ssl_scache_dbm.lo ssl_scache_shmcb.lo ssl_scache_dc.lo ssl_util.lo ssl_util_ssl.lo "
+session_cookie_objects='mod_session_cookie.lo'
+session_crypto_objects='mod_session_crypto.lo'
+session_dbd_objects='mod_session_dbd.lo'
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ssl" >&5
-$as_echo_n "checking whether to enable mod_ssl... " >&6; }
- # Check whether --enable-ssl was given.
-if test "${enable_ssl+set}" = set; then :
- enableval=$enable_ssl;
+case "$host" in
+ *os2*)
+ # OS/2 DLLs must resolve all symbols at build time
+ # and we need some from main session module
+ session_cookie_objects="$session_cookie_objects mod_session.la"
+ session_crypto_objects="$session_crypto_objects mod_session.la"
+ session_dbd_objects="$session_dbd_objects mod_session.la"
+ ;;
+esac
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session" >&5
+$as_echo_n "checking whether to enable mod_session... " >&6; }
+ # Check whether --enable-session was given.
+if test "${enable_session+set}" = set; then :
+ enableval=$enable_session; force_session=$enableval
else
- enable_ssl=no
+ enable_session=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_ssl" = "most"; then
- _apmod_error_fatal="no"
+ case "$enable_session" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_session" = "static"; then
+ enable_session=static
+ elif test "$enable_session" = "yes"; then
+ enable_session=$module_default
+ elif test "$enable_session" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_session=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_session=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_session" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_session=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_session=no
+ fi
+ elif test "$enable_session" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_session" != "no" ; then
+ enable_session=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_session" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session$_apmod_extra_msg" >&5
+$as_echo "$enable_session$_apmod_extra_msg" >&6; }
+ if test "$enable_session" != "no"; then
+ case "$enable_session" in
+ static*)
+ MODLIST="$MODLIST session"
+ if test "session" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_session=`echo $enable_session|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES session"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_session.lo"
else
- _apmod_error_fatal="yes"
+ objects=""
fi
- if test "$enable_ssl" = "static"; then
- enable_ssl=yes
- elif test "$enable_ssl" = "yes"; then
- enable_ssl=$module_default
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_session.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SESSION_LDADD)
+EOF
+ if test ! -z "\$(MOD_SESSION_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SESSION_LDADD)\""
+ AP_LIBS="\$(MOD_SESSION_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SESSION_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_session.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SESSION_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SESSION_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_cookie" >&5
+$as_echo_n "checking whether to enable mod_session_cookie... " >&6; }
+ # Check whether --enable-session-cookie was given.
+if test "${enable_session_cookie+set}" = set; then :
+ enableval=$enable_session_cookie; force_session_cookie=$enableval
+else
+ enable_session_cookie=$session_mods_enable
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_session_cookie" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_session_cookie" = "static"; then
+ enable_session_cookie=static
+ elif test "$enable_session_cookie" = "yes"; then
+ enable_session_cookie=$module_default
+ elif test "$enable_session_cookie" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_session_cookie=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_session_cookie=no
+ fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_ssl" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_ssl=$module_default
+ elif test "$enable_session_cookie" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_session_cookie=$module_default
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_ssl" != "yes"; then
- enable_ssl=no
+ else
+ enable_session_cookie=no
fi
- elif test "$enable_ssl" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_ssl=$module_default
- _apmod_extra_msg=" (all)"
+ elif test "$enable_session_cookie" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_session_cookie" != "no" ; then
+ enable_session_cookie=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_session_cookie" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session_cookie$_apmod_extra_msg" >&5
+$as_echo "$enable_session_cookie$_apmod_extra_msg" >&6; }
+ if test "$enable_session_cookie" != "no"; then
+ case "$enable_session_cookie" in
+ static*)
+ MODLIST="$MODLIST session_cookie"
+ if test "session_cookie" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_session_cookie=`echo $enable_session_cookie|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES session_cookie"
+ if test "$session_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session_cookie"
+ fi
+ ;;
+ esac
+
+
+ if test -z "$session_cookie_objects"; then
+ objects="mod_session_cookie.lo"
+ else
+ objects="$session_cookie_objects"
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_session_cookie.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SESSION_COOKIE_LDADD)
+EOF
+ if test ! -z "\$(MOD_SESSION_COOKIE_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SESSION_COOKIE_LDADD)\""
+ AP_LIBS="\$(MOD_SESSION_COOKIE_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SESSION_COOKIE_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
- enable_ssl=no
+ apache_need_shared=yes
+ libname="mod_session_cookie.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SESSION_COOKIE_LDADD)
+EOF
fi
fi
- if test "$enable_ssl" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
-$as_echo "checking dependencies" >&6; }
-if test "x$ap_ssltk_configured" = "x"; then
- ap_ssltk_base=""
- ap_ssltk_libs=""
- ap_ssltk_type=""
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SESSION_COOKIE_LDADD"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL/TLS toolkit base" >&5
-$as_echo_n "checking for SSL/TLS toolkit base... " >&6; }
-# Check whether --with-sslc was given.
-if test "${with_sslc+set}" = set; then :
- withval=$with_sslc;
- if test "x$withval" != "xyes" -a "x$withval" != "x"; then
- ap_ssltk_base="`cd $withval ; pwd`"
+
+ fi
+
+
+if test "$enable_session_crypto" != ""; then
+ session_mods_enable_crypto=$enable_session_crypto
+else
+ session_mods_enable_crypto=$session_mods_enable
+fi
+if test "$session_mods_enable_crypto" != "no"; then
+ saved_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <apr_crypto.h>
+int
+main ()
+{
+
+#if APU_HAVE_CRYPTO == 0
+#error no crypto support
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ap_HAVE_APR_CRYPTO="yes"
+else
+ ap_HAVE_APR_CRYPTO="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS="$saved_CPPFLAGS"
+ if test $ap_HAVE_APR_CRYPTO = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your APR does not include SSL/EVP support." >&5
+$as_echo "$as_me: WARNING: Your APR does not include SSL/EVP support." >&2;}
+ if test "$enable_session_crypto" != "" -a "$enable_session_crypto" != "no"; then
+ as_fn_error $? "mod_session_crypto cannot be enabled" "$LINENO" 5
+ fi
+ session_mods_enable_crypto="no"
+ fi
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_crypto" >&5
+$as_echo_n "checking whether to enable mod_session_crypto... " >&6; }
+ # Check whether --enable-session-crypto was given.
+if test "${enable_session_crypto+set}" = set; then :
+ enableval=$enable_session_crypto; force_session_crypto=$enableval
+else
+ enable_session_crypto=$session_mods_enable_crypto
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_session_crypto" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_session_crypto" = "static"; then
+ enable_session_crypto=static
+ elif test "$enable_session_crypto" = "yes"; then
+ enable_session_crypto=$module_default
+ elif test "$enable_session_crypto" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_session_crypto=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_session_crypto=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_session_crypto" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_session_crypto=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_session_crypto=no
fi
- ap_ssltk_type="sslc"
+ elif test "$enable_session_crypto" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_session_crypto" != "no" ; then
+ enable_session_crypto=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_session_crypto" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+if test "$session_mods_enable_crypto" = "no" ; then
+ enable_session_crypto=no
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_crypto" >&5
+$as_echo_n "checking whether to enable mod_session_crypto... " >&6; }
+ if test "$enable_session_crypto" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ as_fn_error $? "mod_session_crypto has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ fi
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session_crypto$_apmod_extra_msg" >&5
+$as_echo "$enable_session_crypto$_apmod_extra_msg" >&6; }
+ if test "$enable_session_crypto" != "no"; then
+ case "$enable_session_crypto" in
+ static*)
+ MODLIST="$MODLIST session_crypto"
+ if test "session_crypto" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_session_crypto=`echo $enable_session_crypto|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES session_crypto"
+ if test "$session_mods_enable_crypto" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session_crypto"
+ fi
+ ;;
+ esac
-# Check whether --with-ssl was given.
-if test "${with_ssl+set}" = set; then :
- withval=$with_ssl;
- if test "x$withval" != "xyes" -a "x$withval" != "x"; then
- ap_ssltk_base="`cd $withval ; pwd`"
+
+ if test -z "$session_crypto_objects"; then
+ objects="mod_session_crypto.lo"
+ else
+ objects="$session_crypto_objects"
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_session_crypto.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SESSION_CRYPTO_LDADD)
+EOF
+ if test ! -z "\$(MOD_SESSION_CRYPTO_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SESSION_CRYPTO_LDADD)\""
+ AP_LIBS="\$(MOD_SESSION_CRYPTO_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SESSION_CRYPTO_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_session_crypto.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SESSION_CRYPTO_LDADD)
+EOF
fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SESSION_CRYPTO_LDADD"
+
+
+ fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_dbd" >&5
+$as_echo_n "checking whether to enable mod_session_dbd... " >&6; }
+ # Check whether --enable-session-dbd was given.
+if test "${enable_session_dbd+set}" = set; then :
+ enableval=$enable_session_dbd; force_session_dbd=$enableval
+else
+ enable_session_dbd=$session_mods_enable
fi
- if test "x$ap_ssltk_base" = "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+ _apmod_extra_msg=""
+ case "$enable_session_dbd" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_session_dbd" = "static"; then
+ enable_session_dbd=static
+ elif test "$enable_session_dbd" = "yes"; then
+ enable_session_dbd=$module_default
+ elif test "$enable_session_dbd" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_session_dbd=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_session_dbd=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_session_dbd" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_session_dbd=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_session_dbd=no
+ fi
+ elif test "$enable_session_dbd" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_session_dbd" != "no" ; then
+ enable_session_dbd=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_session_dbd" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session_dbd$_apmod_extra_msg" >&5
+$as_echo "$enable_session_dbd$_apmod_extra_msg" >&6; }
+ if test "$enable_session_dbd" != "no"; then
+ case "$enable_session_dbd" in
+ static*)
+ MODLIST="$MODLIST session_dbd"
+ if test "session_dbd" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_session_dbd=`echo $enable_session_dbd|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES session_dbd"
+ if test "$session_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session_dbd"
+ fi
+ ;;
+ esac
+
+
+ if test -z "$session_dbd_objects"; then
+ objects="mod_session_dbd.lo"
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_base" >&5
-$as_echo "$ap_ssltk_base" >&6; }
+ objects="$session_dbd_objects"
fi
- saved_CPPFLAGS="$CPPFLAGS"
- saved_LIBS="$LIBS"
- if test "x$ap_ssltk_base" != "x"; then
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_session_dbd.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SESSION_DBD_LDADD)
+EOF
+ if test ! -z "\$(MOD_SESSION_DBD_LDADD)"; then
- if test "x$CPPFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-I$ap_ssltk_base/include\""
- CPPFLAGS="-I$ap_ssltk_base/include"
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SESSION_DBD_LDADD)\""
+ AP_LIBS="\$(MOD_SESSION_DBD_LDADD)"
else
- apr_addto_bugger="-I$ap_ssltk_base/include"
+ apr_addto_bugger="\$(MOD_SESSION_DBD_LDADD)"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
- for j in $CPPFLAGS; do
+ for j in $AP_LIBS; do
if test "x$i" = "x$j"; then
apr_addto_duplicate="1"
break
fi
done
if test $apr_addto_duplicate = "0"; then
- test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $i"
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
fi
done
fi
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_session_dbd.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SESSION_DBD_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SESSION_DBD_LDADD"
+
+
+
+ fi
+
+
if test "x$INCLUDES" = "x"; then
- test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I$ap_ssltk_base/include\""
- INCLUDES="-I$ap_ssltk_base/include"
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
else
- apr_addto_bugger="-I$ap_ssltk_base/include"
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $INCLUDES; do
@@ -13460,170 +22664,428 @@ $as_echo "$ap_ssltk_base" >&6; }
fi
- if test "x$LDFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting LDFLAGS to \"-L$ap_ssltk_base/lib\""
- LDFLAGS="-L$ap_ssltk_base/lib"
+
+ 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
+ if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+ MODULE_DIRS="$MODULE_DIRS $current_dir"
else
- apr_addto_bugger="-L$ap_ssltk_base/lib"
+ MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ fi
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+
+
+
+
+
+
+
+ current_dir=slotmem
+ modpath_current=modules/slotmem
+ modpath_static=
+ modpath_shared=
+ test -d slotmem || $srcdir/build/mkdir.sh $modpath_current
+ > $modpath_current/modules.mk
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_slotmem_shm" >&5
+$as_echo_n "checking whether to enable mod_slotmem_shm... " >&6; }
+ # Check whether --enable-slotmem-shm was given.
+if test "${enable_slotmem_shm+set}" = set; then :
+ enableval=$enable_slotmem_shm; force_slotmem_shm=$enableval
+else
+ enable_slotmem_shm=most
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_slotmem_shm" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_slotmem_shm" = "static"; then
+ enable_slotmem_shm=static
+ elif test "$enable_slotmem_shm" = "yes"; then
+ enable_slotmem_shm=$module_default
+ elif test "$enable_slotmem_shm" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_slotmem_shm=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_slotmem_shm=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_slotmem_shm" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_slotmem_shm=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_slotmem_shm=no
+ fi
+ elif test "$enable_slotmem_shm" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_slotmem_shm" != "no" ; then
+ enable_slotmem_shm=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_slotmem_shm" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_slotmem_shm$_apmod_extra_msg" >&5
+$as_echo "$enable_slotmem_shm$_apmod_extra_msg" >&6; }
+ if test "$enable_slotmem_shm" != "no"; then
+ case "$enable_slotmem_shm" in
+ static*)
+ MODLIST="$MODLIST slotmem_shm"
+ if test "slotmem_shm" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_slotmem_shm=`echo $enable_slotmem_shm|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES slotmem_shm"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},slotmem_shm"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_slotmem_shm.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_slotmem_shm.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SLOTMEM_SHM_LDADD)
+EOF
+ if test ! -z "\$(MOD_SLOTMEM_SHM_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SLOTMEM_SHM_LDADD)\""
+ AP_LIBS="\$(MOD_SLOTMEM_SHM_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SLOTMEM_SHM_LDADD)"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
- for j in $LDFLAGS; do
+ for j in $AP_LIBS; do
if test "x$i" = "x$j"; then
apr_addto_duplicate="1"
break
fi
done
if test $apr_addto_duplicate = "0"; then
- test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS"
- LDFLAGS="$LDFLAGS $i"
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
fi
done
fi
- if test "x$ap_platform_runtime_link_flag" != "x"; then
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_slotmem_shm.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SLOTMEM_SHM_LDADD)
+EOF
+ fi
+ fi
- if test "x$LDFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_ssltk_base/lib\""
- LDFLAGS="$ap_platform_runtime_link_flag$ap_ssltk_base/lib"
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SLOTMEM_SHM_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_slotmem_plain" >&5
+$as_echo_n "checking whether to enable mod_slotmem_plain... " >&6; }
+ # Check whether --enable-slotmem-plain was given.
+if test "${enable_slotmem_plain+set}" = set; then :
+ enableval=$enable_slotmem_plain; force_slotmem_plain=$enableval
+else
+ enable_slotmem_plain=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_slotmem_plain" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_slotmem_plain" = "static"; then
+ enable_slotmem_plain=static
+ elif test "$enable_slotmem_plain" = "yes"; then
+ enable_slotmem_plain=$module_default
+ elif test "$enable_slotmem_plain" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_slotmem_plain=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_slotmem_plain=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_slotmem_plain" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_slotmem_plain=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_slotmem_plain=no
+ fi
+ elif test "$enable_slotmem_plain" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_slotmem_plain" != "no" ; then
+ enable_slotmem_plain=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_slotmem_plain" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_slotmem_plain$_apmod_extra_msg" >&5
+$as_echo "$enable_slotmem_plain$_apmod_extra_msg" >&6; }
+ if test "$enable_slotmem_plain" != "no"; then
+ case "$enable_slotmem_plain" in
+ static*)
+ MODLIST="$MODLIST slotmem_plain"
+ if test "slotmem_plain" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_slotmem_plain=`echo $enable_slotmem_plain|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES slotmem_plain"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},slotmem_plain"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_slotmem_plain.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_slotmem_plain.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_SLOTMEM_PLAIN_LDADD)
+EOF
+ if test ! -z "\$(MOD_SLOTMEM_PLAIN_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SLOTMEM_PLAIN_LDADD)\""
+ AP_LIBS="\$(MOD_SLOTMEM_PLAIN_LDADD)"
else
- apr_addto_bugger="$ap_platform_runtime_link_flag$ap_ssltk_base/lib"
+ apr_addto_bugger="\$(MOD_SLOTMEM_PLAIN_LDADD)"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
- for j in $LDFLAGS; do
+ for j in $AP_LIBS; do
if test "x$i" = "x$j"; then
apr_addto_duplicate="1"
break
fi
done
if test $apr_addto_duplicate = "0"; then
- test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS"
- LDFLAGS="$LDFLAGS $i"
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
fi
done
fi
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_slotmem_plain.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SLOTMEM_PLAIN_LDADD)
+EOF
fi
fi
- if test "x$ap_ssltk_type" = "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version" >&5
-$as_echo_n "checking for OpenSSL version... " >&6; }
- for ac_header in openssl/opensslv.h openssl/ssl.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- ap_ssltk_type="openssl"
-fi
-done
- if test "$ap_ssltk_type" = "openssl"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <openssl/opensslv.h>
-int
-main ()
-{
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SLOTMEM_PLAIN_LDADD"
+
+
+
+ fi
+
+
+
+ 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
+ if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+ MODULE_DIRS="$MODULE_DIRS $current_dir"
+ else
+ MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ fi
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+
+
+
-#if !defined(OPENSSL_VERSION_NUMBER)
-#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
-#endif
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not encouraging" >&5
-$as_echo "not encouraging" >&6; }
- echo "WARNING: OpenSSL version may contain security vulnerabilities!"
- echo " Ensure the latest security patches have been applied!"
+ current_dir=ssl
+ modpath_current=modules/ssl
+ modpath_static=
+ modpath_shared=
+ test -d ssl || $srcdir/build/mkdir.sh $modpath_current
+ > $modpath_current/modules.mk
+
+
+ssl_objs="mod_ssl.lo ssl_engine_config.lo ssl_engine_dh.lo ssl_engine_init.lo ssl_engine_io.lo ssl_engine_kernel.lo ssl_engine_log.lo ssl_engine_mutex.lo ssl_engine_pphrase.lo ssl_engine_rand.lo ssl_engine_vars.lo ssl_scache.lo ssl_util_stapling.lo ssl_util.lo ssl_util_ssl.lo ssl_engine_ocsp.lo ssl_util_ocsp.lo "
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ssl" >&5
+$as_echo_n "checking whether to enable mod_ssl... " >&6; }
+ # Check whether --enable-ssl was given.
+if test "${enable_ssl+set}" = set; then :
+ enableval=$enable_ssl; force_ssl=$enableval
+else
+ enable_ssl=most
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ _apmod_extra_msg=""
+ case "$enable_ssl" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_ssl" = "static"; then
+ enable_ssl=static
+ elif test "$enable_ssl" = "yes"; then
+ enable_ssl=$module_default
+ elif test "$enable_ssl" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_ssl=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_ssl=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_ssl" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_ssl=$module_default
+ _apmod_extra_msg=" ($module_selection)"
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no OpenSSL headers found" >&5
-$as_echo "no OpenSSL headers found" >&6; }
+ enable_ssl=no
fi
+ elif test "$enable_ssl" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_ssl" != "no" ; then
+ enable_ssl=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
- if test "$ap_ssltk_type" != "openssl"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL-C version" >&5
-$as_echo_n "checking for SSL-C version... " >&6; }
- for ac_header in sslc.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sslc.h" "ac_cv_header_sslc_h" "$ac_includes_default"
-if test "x$ac_cv_header_sslc_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SSLC_H 1
-_ACEOF
- ap_ssltk_type="sslc"
+ if test "$enable_ssl" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5
+$as_echo_n "checking for OpenSSL... " >&6; }
+if ${ac_cv_openssl+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- ap_ssltk_type=""
-fi
-done
+ ac_cv_openssl=no
+ ap_openssl_found=""
+ ap_openssl_base=""
+ ap_openssl_libs=""
- if test "$ap_ssltk_type" = "sslc"; then
- ap_ssltk_libs="-lsslc"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL-C version" >&5
-$as_echo_n "checking for SSL-C version... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sslc.h>
-int
-main ()
-{
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for user-provided OpenSSL base directory" >&5
+$as_echo_n "checking for user-provided OpenSSL base directory... " >&6; }
-#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
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not encouraging" >&5
-$as_echo "not encouraging" >&6; }
- echo "WARNING: SSL-C version may contain security vulnerabilities!"
- echo " Ensure the latest security patches have been applied!"
+# Check whether --with-ssl was given.
+if test "${with_ssl+set}" = set; then :
+ withval=$with_ssl;
+ if test "x$withval" != "xyes" -a "x$withval" != "x"; then
+ ap_openssl_base="`cd $withval ; pwd`"
+ fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test "x$ap_openssl_base" = "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no SSL-C headers found" >&5
-$as_echo "no SSL-C headers found" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_openssl_base" >&5
+$as_echo "$ap_openssl_base" >&6; }
fi
- fi
- if test "x$ap_ssltk_type" = "x"; then
- as_fn_error "...No recognized SSL/TLS toolkit detected" "$LINENO" 5
- 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
- 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`"
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LIBS="$LIBS"
+ saved_LDFLAGS="$LDFLAGS"
+ SSL_LIBS=""
+
+ 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
+ PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
+ export PKG_CONFIG_PATH
+ fi
+ ap_openssl_libs="`$PKGCONFIG --libs-only-l openssl 2>&1`"
if test $? -eq 0; then
+ ap_openssl_found="yes"
pkglookup="`$PKGCONFIG --cflags-only-I openssl`"
if test "x$CPPFLAGS" = "x"; then
@@ -13689,23 +23151,220 @@ $as_echo "no SSL-C headers found" >&6; }
done
fi
- else
- ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
+
+ if test "x$SSL_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting SSL_LIBS to \"$pkglookup\""
+ SSL_LIBS="$pkglookup"
+ else
+ apr_addto_bugger="$pkglookup"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $SSL_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to SSL_LIBS"
+ SSL_LIBS="$SSL_LIBS $i"
fi
- else
- ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
+ done
+ fi
+
+ fi
+ PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH"
fi
+
+ if test "x$ap_openssl_base" != "x" -a "x$ap_openssl_found" = "x"; then
+
+ if test "x$CPPFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-I$ap_openssl_base/include\""
+ CPPFLAGS="-I$ap_openssl_base/include"
+ else
+ apr_addto_bugger="-I$ap_openssl_base/include"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $CPPFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I$ap_openssl_base/include\""
+ INCLUDES="-I$ap_openssl_base/include"
+ else
+ apr_addto_bugger="-I$ap_openssl_base/include"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+ if test "x$LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting LDFLAGS to \"-L$ap_openssl_base/lib\""
+ LDFLAGS="-L$ap_openssl_base/lib"
+ else
+ apr_addto_bugger="-L$ap_openssl_base/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS"
+ LDFLAGS="$LDFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$SSL_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting SSL_LIBS to \"-L$ap_openssl_base/lib\""
+ SSL_LIBS="-L$ap_openssl_base/lib"
+ else
+ apr_addto_bugger="-L$ap_openssl_base/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $SSL_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to SSL_LIBS"
+ SSL_LIBS="$SSL_LIBS $i"
+ fi
+ done
+ fi
+
+ if test "x$ap_platform_runtime_link_flag" != "x"; then
+
+ if test "x$LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_openssl_base/lib\""
+ LDFLAGS="$ap_platform_runtime_link_flag$ap_openssl_base/lib"
+ else
+ apr_addto_bugger="$ap_platform_runtime_link_flag$ap_openssl_base/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS"
+ LDFLAGS="$LDFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$SSL_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting SSL_LIBS to \"$ap_platform_runtime_link_flag$ap_openssl_base/lib\""
+ SSL_LIBS="$ap_platform_runtime_link_flag$ap_openssl_base/lib"
+ else
+ apr_addto_bugger="$ap_platform_runtime_link_flag$ap_openssl_base/lib"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $SSL_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to SSL_LIBS"
+ SSL_LIBS="$SSL_LIBS $i"
+ fi
+ done
fi
- test "x$silent" != "xyes" && echo " forcing SSL_LIBS to \"$ap_ssltk_libs\""
- SSL_LIBS="$ap_ssltk_libs"
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version >= 0.9.7" >&5
+$as_echo_n "checking for OpenSSL version >= 0.9.7... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <openssl/opensslv.h>
+int
+main ()
+{
+
+#if !defined(OPENSSL_VERSION_NUMBER)
+#error "Missing OpenSSL version"
+#endif
+#if OPENSSL_VERSION_NUMBER < 0x0090700f
+#error "Unsupported OpenSSL version " OPENSSL_VERSION_TEXT
+#endif
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
+$as_echo "OK" >&6; }
+ ac_cv_openssl=yes
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5
+$as_echo "FAILED" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test "x$ac_cv_openssl" = "xyes"; then
+ ap_openssl_libs="-lssl -lcrypto `$apr_config --libs`"
+
+ if test "x$SSL_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting SSL_LIBS to \"$ap_openssl_libs\""
+ SSL_LIBS="$ap_openssl_libs"
+ else
+ apr_addto_bugger="$ap_openssl_libs"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $SSL_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to SSL_LIBS"
+ SSL_LIBS="$SSL_LIBS $i"
+ fi
+ done
+ fi
if test "x$LIBS" = "x"; then
- test "x$silent" != "xyes" && echo " setting LIBS to \"$ap_ssltk_libs\""
- LIBS="$ap_ssltk_libs"
+ test "x$silent" != "xyes" && echo " setting LIBS to \"$ap_openssl_libs\""
+ LIBS="$ap_openssl_libs"
else
- apr_addto_bugger="$ap_ssltk_libs"
+ apr_addto_bugger="$ap_openssl_libs"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $LIBS; do
@@ -13726,12 +23385,11 @@ $as_echo "no SSL-C headers found" >&6; }
- liberrors=""
- if test "$ap_ssltk_type" = "openssl"; then
- for ac_header in openssl/engine.h
+ liberrors=""
+ for ac_header in openssl/engine.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "openssl/engine.h" "ac_cv_header_openssl_engine_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_engine_h" = x""yes; then :
+if test "x$ac_cv_header_openssl_engine_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL_ENGINE_H 1
_ACEOF
@@ -13740,12 +23398,11 @@ fi
done
- for ac_func in SSLeay_version SSL_CTX_new
+ for ac_func in SSLeay_version SSL_CTX_new
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -13755,189 +23412,47 @@ else
fi
done
- for ac_func in ENGINE_init ENGINE_load_builtin_engines
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
- else
- for ac_func in SSLC_library_version SSL_CTX_new
+ for ac_func in ENGINE_init ENGINE_load_builtin_engines
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-else
- liberrors="yes"
-fi
-done
-
- for ac_func in SSL_set_state
-do :
- ac_fn_c_check_func "$LINENO" "SSL_set_state" "ac_cv_func_SSL_set_state"
-if test "x$ac_cv_func_SSL_set_state" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SSL_SET_STATE 1
-_ACEOF
-
-fi
-done
-
- fi
- for ac_func in SSL_set_cert_store
-do :
- ac_fn_c_check_func "$LINENO" "SSL_set_cert_store" "ac_cv_func_SSL_set_cert_store"
-if test "x$ac_cv_func_SSL_set_cert_store" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SSL_SET_CERT_STORE 1
-_ACEOF
-
fi
done
- CPPFLAGS="$saved_CPPFLAGS"
- LIBS="$saved_LIBS"
- if test "x$liberrors" != "x"; then
- as_fn_error "... Error, SSL/TLS libraries were missing or unusable" "$LINENO" 5
- fi
-
- if test "$ap_ssltk_type" = "openssl"; then
-
-$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
-
- else
-
-$as_echo "#define HAVE_SSLC 1" >>confdefs.h
-
- fi
-fi
-
-
- test "x$silent" != "xyes" && echo " forcing MOD_SSL_LDADD to \"\$(SSL_LIBS)\""
- MOD_SSL_LDADD="\$(SSL_LIBS)"
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Distcache is required" >&5
-$as_echo_n "checking whether Distcache is required... " >&6; }
- ap_ssltk_dc="no"
- tmp_nomessage=""
- tmp_forced="no"
- # Check whether --enable-distcache was given.
-if test "${enable_distcache+set}" = set; then :
- enableval=$enable_distcache; ap_ssltk_dc="$enableval"
- tmp_nomessage=""
- tmp_forced="yes"
- if test "x$ap_ssltk_dc" = "x"; then
- ap_ssltk_dc="yes"
- tmp_forced="no"
- fi
- if test "$ap_ssltk_dc" != "yes" -a "$ap_ssltk_dc" != "no"; then
- tmp_nomessage="--enable-distcache had illegal syntax - disabling"
- ap_ssltk_dc="no"
+ if test "x$liberrors" != "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL libraries are unusable" >&5
+$as_echo "$as_me: WARNING: OpenSSL libraries are unusable" >&2;}
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL version is too old" >&5
+$as_echo "$as_me: WARNING: OpenSSL version is too old" >&2;}
fi
-fi
- if test "$tmp_forced" = "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_dc (default)" >&5
-$as_echo "$ap_ssltk_dc (default)" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_dc (specified)" >&5
-$as_echo "$ap_ssltk_dc (specified)" >&6; }
- fi
- if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno" -a "x$tmp_nomessage" != "x"; then
- as_fn_error "distcache support failed: $tmp_nomessage" "$LINENO" 5
- fi
- if test "$ap_ssltk_dc" = "yes"; then
- ac_fn_c_check_header_mongrel "$LINENO" "distcache/dc_client.h" "ac_cv_header_distcache_dc_client_h" "$ac_includes_default"
-if test "x$ac_cv_header_distcache_dc_client_h" = x""yes; then :
+ CPPFLAGS="$saved_CPPFLAGS"
+ LIBS="$saved_LIBS"
+ LDFLAGS="$saved_LDFLAGS"
-else
- tmp_nomessage="can't include distcache headers"
- ap_ssltk_dc="no"
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_openssl" >&5
+$as_echo "$ac_cv_openssl" >&6; }
+ if test "x$ac_cv_openssl" = "xyes"; then
+$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
- if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
- as_fn_error "distcache support failed: $tmp_nomessage" "$LINENO" 5
- fi
- fi
- if test "$ap_ssltk_dc" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Distcache version" >&5
-$as_echo_n "checking for Distcache version... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <distcache/dc_client.h>
-int
-main ()
-{
-#if DISTCACHE_CLIENT_API != 0x0001
-#error "distcache API version is unrecognised"
-#endif
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- tmp_nomessage="distcache has an unsupported API version"
-ap_ssltk_dc="no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_dc" >&5
-$as_echo "$ap_ssltk_dc" >&6; }
- if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
- as_fn_error "distcache support failed: $tmp_nomessage" "$LINENO" 5
- fi
fi
- if test "$ap_ssltk_dc" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Distcache libraries" >&5
-$as_echo_n "checking for Distcache libraries... " >&6; }
- save_libs=$LIBS
- LIBS="$LIBS -ldistcache -lnal"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <distcache/dc_client.h>
-int
-main ()
-{
-DC_CTX *foo = DC_CTX_new((const char *)0,0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-else
- tmp_no_message="failed to link with distcache libraries"
- ap_ssltk_dc="no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$save_libs
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_ssltk_dc" >&5
-$as_echo "$ap_ssltk_dc" >&6; }
- if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
- as_fn_error "distcache support failed: $tmp_nomessage" "$LINENO" 5
- else
+ if test "$ac_cv_openssl" = "yes" ; then
if test "x$MOD_SSL_LDADD" = "x"; then
- test "x$silent" != "xyes" && echo " setting MOD_SSL_LDADD to \"-ldistcache -lnal\""
- MOD_SSL_LDADD="-ldistcache -lnal"
+ test "x$silent" != "xyes" && echo " setting MOD_SSL_LDADD to \"\$(SSL_LIBS)\""
+ MOD_SSL_LDADD="\$(SSL_LIBS)"
else
- apr_addto_bugger="-ldistcache -lnal"
+ apr_addto_bugger="\$(SSL_LIBS)"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $MOD_SSL_LDADD; do
@@ -13953,15 +23468,9 @@ $as_echo "$ap_ssltk_dc" >&6; }
done
fi
-
-$as_echo "#define HAVE_DISTCACHE 1" >>confdefs.h
-
- fi
- fi
-
- if test "x$enable_ssl" = "xshared"; then
- # The only symbol which needs to be exported is the module
- # structure, so ask libtool to hide everything else:
+ if test "x$enable_ssl" = "xshared"; then
+ # The only symbol which needs to be exported is the module
+ # structure, so ask libtool to hide everything else:
if test "x$MOD_SSL_LDADD" = "x"; then
test "x$silent" != "xyes" && echo " setting MOD_SSL_LDADD to \"-export-symbols-regex ssl_module\""
@@ -13983,15 +23492,18 @@ $as_echo "#define HAVE_DISTCACHE 1" >>confdefs.h
done
fi
+ fi
+ else
+ enable_ssl=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ssl" >&5
$as_echo_n "checking whether to enable mod_ssl... " >&6; }
if test "$enable_ssl" = "no"; then
- if test "$_apmod_error_fatal" = "no"; then
+ if test "$_apmod_required" = "no"; then
_apmod_extra_msg=" (disabled)"
else
- as_fn_error "mod_ssl has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ as_fn_error $? "mod_ssl has been requested but can not be built due to prerequisite failures" "$LINENO" 5
fi
fi
fi
@@ -13999,18 +23511,21 @@ $as_echo_n "checking whether to enable mod_ssl... " >&6; }
$as_echo "$enable_ssl$_apmod_extra_msg" >&6; }
if test "$enable_ssl" != "no"; then
case "$enable_ssl" in
- shared*)
- enable_ssl=`echo $enable_ssl|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES ssl"
- ;;
- *)
+ static*)
MODLIST="$MODLIST ssl"
if test "ssl" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_ssl=`echo $enable_ssl|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES ssl"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ssl"
+ fi
+ ;;
esac
@@ -14030,6 +23545,29 @@ $as_echo "$enable_ssl$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_SSL_LDADD)
EOF
+ if test ! -z "\$(MOD_SSL_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SSL_LDADD)\""
+ AP_LIBS="\$(MOD_SSL_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SSL_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_ssl.la"
@@ -14103,36 +23641,51 @@ EOF
$as_echo_n "checking whether to enable mod_optional_hook_export... " >&6; }
# Check whether --enable-optional-hook-export was given.
if test "${enable_optional_hook_export+set}" = set; then :
- enableval=$enable_optional_hook_export;
+ enableval=$enable_optional_hook_export; force_optional_hook_export=$enableval
else
enable_optional_hook_export=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_optional_hook_export" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_optional_hook_export" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_optional_hook_export" = "static"; then
- enable_optional_hook_export=yes
+ enable_optional_hook_export=static
elif test "$enable_optional_hook_export" = "yes"; then
enable_optional_hook_export=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_optional_hook_export" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_optional_hook_export=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_optional_hook_export" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_optional_hook_export=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_optional_hook_export" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_optional_hook_export=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_optional_hook_export=no
fi
+ elif test "$enable_optional_hook_export" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_optional_hook_export" != "no" ; then
+ enable_optional_hook_export=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_optional_hook_export" != "no"; then
:
@@ -14141,18 +23694,21 @@ fi
$as_echo "$enable_optional_hook_export$_apmod_extra_msg" >&6; }
if test "$enable_optional_hook_export" != "no"; then
case "$enable_optional_hook_export" in
- shared*)
- enable_optional_hook_export=`echo $enable_optional_hook_export|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES optional_hook_export"
- ;;
- *)
+ static*)
MODLIST="$MODLIST optional_hook_export"
if test "optional_hook_export" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_optional_hook_export=`echo $enable_optional_hook_export|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES optional_hook_export"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_hook_export"
+ fi
+ ;;
esac
@@ -14172,6 +23728,29 @@ $as_echo "$enable_optional_hook_export$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_OPTIONAL_HOOK_EXPORT_LDADD)
EOF
+ if test ! -z "\$(MOD_OPTIONAL_HOOK_EXPORT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_OPTIONAL_HOOK_EXPORT_LDADD)\""
+ AP_LIBS="\$(MOD_OPTIONAL_HOOK_EXPORT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_OPTIONAL_HOOK_EXPORT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_optional_hook_export.la"
@@ -14196,36 +23775,51 @@ EOF
$as_echo_n "checking whether to enable mod_optional_hook_import... " >&6; }
# Check whether --enable-optional-hook-import was given.
if test "${enable_optional_hook_import+set}" = set; then :
- enableval=$enable_optional_hook_import;
+ enableval=$enable_optional_hook_import; force_optional_hook_import=$enableval
else
enable_optional_hook_import=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_optional_hook_import" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_optional_hook_import" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_optional_hook_import" = "static"; then
- enable_optional_hook_import=yes
+ enable_optional_hook_import=static
elif test "$enable_optional_hook_import" = "yes"; then
enable_optional_hook_import=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_optional_hook_import" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_optional_hook_import=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_optional_hook_import" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_optional_hook_import=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_optional_hook_import" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_optional_hook_import=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_optional_hook_import=no
fi
+ elif test "$enable_optional_hook_import" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_optional_hook_import" != "no" ; then
+ enable_optional_hook_import=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_optional_hook_import" != "no"; then
:
@@ -14234,18 +23828,21 @@ fi
$as_echo "$enable_optional_hook_import$_apmod_extra_msg" >&6; }
if test "$enable_optional_hook_import" != "no"; then
case "$enable_optional_hook_import" in
- shared*)
- enable_optional_hook_import=`echo $enable_optional_hook_import|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES optional_hook_import"
- ;;
- *)
+ static*)
MODLIST="$MODLIST optional_hook_import"
if test "optional_hook_import" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_optional_hook_import=`echo $enable_optional_hook_import|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES optional_hook_import"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_hook_import"
+ fi
+ ;;
esac
@@ -14265,6 +23862,29 @@ $as_echo "$enable_optional_hook_import$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_OPTIONAL_HOOK_IMPORT_LDADD)
EOF
+ if test ! -z "\$(MOD_OPTIONAL_HOOK_IMPORT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_OPTIONAL_HOOK_IMPORT_LDADD)\""
+ AP_LIBS="\$(MOD_OPTIONAL_HOOK_IMPORT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_OPTIONAL_HOOK_IMPORT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_optional_hook_import.la"
@@ -14289,36 +23909,51 @@ EOF
$as_echo_n "checking whether to enable mod_optional_fn_import... " >&6; }
# Check whether --enable-optional-fn-import was given.
if test "${enable_optional_fn_import+set}" = set; then :
- enableval=$enable_optional_fn_import;
+ enableval=$enable_optional_fn_import; force_optional_fn_import=$enableval
else
enable_optional_fn_import=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_optional_fn_import" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_optional_fn_import" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_optional_fn_import" = "static"; then
- enable_optional_fn_import=yes
+ enable_optional_fn_import=static
elif test "$enable_optional_fn_import" = "yes"; then
enable_optional_fn_import=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_optional_fn_import" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_optional_fn_import=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_optional_fn_import" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_optional_fn_import=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_optional_fn_import" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_optional_fn_import=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_optional_fn_import=no
fi
+ elif test "$enable_optional_fn_import" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_optional_fn_import" != "no" ; then
+ enable_optional_fn_import=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_optional_fn_import" != "no"; then
:
@@ -14327,18 +23962,21 @@ fi
$as_echo "$enable_optional_fn_import$_apmod_extra_msg" >&6; }
if test "$enable_optional_fn_import" != "no"; then
case "$enable_optional_fn_import" in
- shared*)
- enable_optional_fn_import=`echo $enable_optional_fn_import|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES optional_fn_import"
- ;;
- *)
+ static*)
MODLIST="$MODLIST optional_fn_import"
if test "optional_fn_import" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_optional_fn_import=`echo $enable_optional_fn_import|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES optional_fn_import"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_fn_import"
+ fi
+ ;;
esac
@@ -14358,6 +23996,29 @@ $as_echo "$enable_optional_fn_import$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_OPTIONAL_FN_IMPORT_LDADD)
EOF
+ if test ! -z "\$(MOD_OPTIONAL_FN_IMPORT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_OPTIONAL_FN_IMPORT_LDADD)\""
+ AP_LIBS="\$(MOD_OPTIONAL_FN_IMPORT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_OPTIONAL_FN_IMPORT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_optional_fn_import.la"
@@ -14382,36 +24043,51 @@ EOF
$as_echo_n "checking whether to enable mod_optional_fn_export... " >&6; }
# Check whether --enable-optional-fn-export was given.
if test "${enable_optional_fn_export+set}" = set; then :
- enableval=$enable_optional_fn_export;
+ enableval=$enable_optional_fn_export; force_optional_fn_export=$enableval
else
enable_optional_fn_export=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_optional_fn_export" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_optional_fn_export" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_optional_fn_export" = "static"; then
- enable_optional_fn_export=yes
+ enable_optional_fn_export=static
elif test "$enable_optional_fn_export" = "yes"; then
enable_optional_fn_export=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_optional_fn_export" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_optional_fn_export=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_optional_fn_export" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_optional_fn_export=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_optional_fn_export" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_optional_fn_export=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_optional_fn_export=no
fi
+ elif test "$enable_optional_fn_export" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_optional_fn_export" != "no" ; then
+ enable_optional_fn_export=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_optional_fn_export" != "no"; then
:
@@ -14420,18 +24096,21 @@ fi
$as_echo "$enable_optional_fn_export$_apmod_extra_msg" >&6; }
if test "$enable_optional_fn_export" != "no"; then
case "$enable_optional_fn_export" in
- shared*)
- enable_optional_fn_export=`echo $enable_optional_fn_export|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES optional_fn_export"
- ;;
- *)
+ static*)
MODLIST="$MODLIST optional_fn_export"
if test "optional_fn_export" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_optional_fn_export=`echo $enable_optional_fn_export|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES optional_fn_export"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_fn_export"
+ fi
+ ;;
esac
@@ -14451,6 +24130,29 @@ $as_echo "$enable_optional_fn_export$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_OPTIONAL_FN_EXPORT_LDADD)
EOF
+ if test ! -z "\$(MOD_OPTIONAL_FN_EXPORT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_OPTIONAL_FN_EXPORT_LDADD)\""
+ AP_LIBS="\$(MOD_OPTIONAL_FN_EXPORT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_OPTIONAL_FN_EXPORT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_optional_fn_export.la"
@@ -14472,51 +24174,180 @@ EOF
- 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
- if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
- MODULE_DIRS="$MODULE_DIRS $current_dir"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_dialup" >&5
+$as_echo_n "checking whether to enable mod_dialup... " >&6; }
+ # Check whether --enable-dialup was given.
+if test "${enable_dialup+set}" = set; then :
+ enableval=$enable_dialup; force_dialup=$enableval
+else
+ enable_dialup=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_dialup" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_dialup" = "static"; then
+ enable_dialup=static
+ elif test "$enable_dialup" = "yes"; then
+ enable_dialup=$module_default
+ elif test "$enable_dialup" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_dialup=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_dialup=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_dialup" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_dialup=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_dialup=no
+ fi
+ elif test "$enable_dialup" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_dialup" != "no" ; then
+ enable_dialup=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_dialup" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dialup$_apmod_extra_msg" >&5
+$as_echo "$enable_dialup$_apmod_extra_msg" >&6; }
+ if test "$enable_dialup" != "no"; then
+ case "$enable_dialup" in
+ static*)
+ MODLIST="$MODLIST dialup"
+ if test "dialup" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_dialup=`echo $enable_dialup|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES dialup"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dialup"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_dialup.lo"
else
- MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ objects=""
fi
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_dialup.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_DIALUP_LDADD)
+EOF
+ if test ! -z "\$(MOD_DIALUP_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_DIALUP_LDADD)\""
+ AP_LIBS="\$(MOD_DIALUP_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_DIALUP_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_dialup.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_DIALUP_LDADD)
+EOF
+ fi
+ fi
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_DIALUP_LDADD"
-if test "$OS" = "beos" ; then
- if test "x$CFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting CFLAGS to \"-DBEOS\""
- CFLAGS="-DBEOS"
+
+ fi
+
+
+
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
else
- apr_addto_bugger="-DBEOS"
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
- for j in $CFLAGS; do
+ for j in $INCLUDES; do
if test "x$i" = "x$j"; then
apr_addto_duplicate="1"
break
fi
done
if test $apr_addto_duplicate = "0"; then
- test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS"
- CFLAGS="$CFLAGS $i"
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
fi
done
fi
-fi
+
+
+ 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
+ if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+ MODULE_DIRS="$MODULE_DIRS $current_dir"
+ else
+ MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ fi
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for target platform" >&5
$as_echo_n "checking for target platform... " >&6; }
case $host in
-*beos*)
- OS="beos"
- OS_DIR=$OS
- ;;
*pc-os2-emx*)
OS="os2"
OS_DIR=$OS
@@ -14572,7 +24403,7 @@ if test "$OS" = "unix" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rlim_t" >&5
$as_echo_n "checking for rlim_t... " >&6; }
-if test "${ac_cv_type_rlim_t+set}" = set; then :
+if ${ac_cv_type_rlim_t+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -14615,8 +24446,7 @@ $as_echo "#define rlim_t int" >>confdefs.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14630,8 +24460,7 @@ done
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -14647,8 +24476,7 @@ for ac_header in bstring.h unistd.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14663,7 +24491,7 @@ done
for ac_func in syslog
do :
ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
-if test "x$ac_cv_func_syslog" = x""yes; then :
+if test "x$ac_cv_func_syslog" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYSLOG 1
_ACEOF
@@ -14675,7 +24503,7 @@ done
for ac_header in sys/times.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_times_h" = x""yes; then :
+if test "x$ac_cv_header_sys_times_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SYS_TIMES_H 1
_ACEOF
@@ -14687,7 +24515,7 @@ done
for ac_func in times
do :
ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times"
-if test "x$ac_cv_func_times" = x""yes; then :
+if test "x$ac_cv_func_times" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_TIMES 1
_ACEOF
@@ -14696,46 +24524,30 @@ fi
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which MPM to use" >&5
-$as_echo_n "checking which MPM to use... " >&6; }
-
-# Check whether --with-mpm was given.
-if test "${with_mpm+set}" = set; then :
- withval=$with_mpm;
- APACHE_MPM=$withval
-
-else
+# util_expr needs header files in server source dir
- if test "x$APACHE_MPM" = "x"; then
- APACHE_MPM=prefork
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/server\""
+ INCLUDES="-I\$(top_srcdir)/server"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/server"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
fi
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $APACHE_MPM" >&5
-$as_echo "$APACHE_MPM" >&6; }
-
-apache_cv_mpm=$APACHE_MPM
-
-ap_mpm_is_threaded ()
-{
- if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "event" -o "$apache_cv_mpm" = "winnt" ; then
- return 0
- else
- return 1
- fi
-}
-ap_mpm_is_experimental ()
-{
- if test "$apache_cv_mpm" = "event" ; then
- return 0
- else
- return 1
- fi
-}
-if ap_mpm_is_threaded; then
apr_old_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $INCLUDES"
@@ -14759,71 +24571,235 @@ rm -f conftest*
CPPFLAGS=$apr_old_cppflags
- if test "x$ac_cv_define_APR_HAS_THREADS" = "xno"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: The currently selected MPM requires threads which your system seems to lack" >&5
-$as_echo "The currently selected MPM requires threads which your system seems to lack" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking for replacement" >&5
-$as_echo_n "checking checking for replacement... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: prefork selected" >&5
-$as_echo "prefork selected" >&6; }
- apache_cv_mpm=prefork
- else
- case $host in
- *-linux-*)
+have_threaded_sig_graceful=yes
+case $host in
+ *-linux-*)
case `uname -r` in
2.0* )
- echo "Threaded MPM's are not supported on this platform"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking for replacement" >&5
-$as_echo_n "checking checking for replacement... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: prefork selected" >&5
-$as_echo "prefork selected" >&6; }
- apache_cv_mpm=prefork
+ have_threaded_sig_graceful=no
;;
esac
- ;;
- esac
- fi
-fi
+ ;;
+esac
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES server/mpm/Makefile"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether APR supports thread-safe pollsets" >&5
+$as_echo_n "checking whether APR supports thread-safe pollsets... " >&6; }
+if ${ac_cv_have_threadsafe_pollset+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $host in
+ *-apple-darwin[1-9].*)
+
+ if test -z "$ac_cv_func_kqueue"; then
+ test "x$silent" != "xyes" && echo " setting ac_cv_func_kqueue to \"no\""
+ ac_cv_func_kqueue="no"
+ fi
+
+ ;;
+ esac
+ for ac_func in kqueue port_create epoll_create
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-MPM_NAME=$apache_cv_mpm
-if ap_mpm_is_experimental; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have selected an EXPERIMENTAL MPM. Be warned!" >&5
-$as_echo "$as_me: WARNING: You have selected an EXPERIMENTAL MPM. Be warned!" >&2;}
- MPM_SUBDIR_NAME=experimental/$MPM_NAME
-else
- MPM_SUBDIR_NAME=$MPM_NAME
fi
-MPM_DIR=server/mpm/$MPM_SUBDIR_NAME
-MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
+done
+
+ if test "$ac_cv_func_kqueue$ac_cv_func_port_create$ac_cv_func_epoll_create" != "nonono"; then
+ ac_cv_have_threadsafe_pollset=yes
+ else
+ ac_cv_have_threadsafe_pollset=no
+ fi
-if test ! -f "$abs_srcdir/$MPM_DIR/mpm.h"; then
- as_fn_error "the selected mpm -- $apache_cv_mpm -- is not supported" "$LINENO" 5
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_threadsafe_pollset" >&5
+$as_echo "$ac_cv_have_threadsafe_pollset" >&6; }
+
+case $host in
+ *mingw32* | *os2-emx*)
+ forking_mpms_supported=no
+ ;;
+ *)
+ forking_mpms_supported=yes
+ ;;
+esac
+
+
+
+ap_mpm_is_supported ()
+{
+ eval "tmp=\$ap_supported_mpm_$1"
+ if test -z "$tmp"; then
+ return 1
+ else
+ return 0
+ fi
+}
+
+ap_mpm_supports_shared ()
+{
+ eval "tmp=\$ap_supported_mpm_$1"
+ if test "$tmp" = "shared"; then
+ return 0
+ else
+ return 1
+ fi
+}
+
+ap_mpm_is_threaded ()
+{
+ if test "$mpm_build" = "shared" -a ac_cv_define_APR_HAS_THREADS = "yes"; then
+ return 0
+ fi
+ for mpm in $ap_enabled_mpms; do
+ eval "tmp=\$ap_threaded_mpm_$mpm"
+ if test "$tmp" = "yes"; then
+ return 0
+ fi
+ done
+ return 1
+}
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MPM_NAME"
+ap_mpm_is_enabled ()
+{
+ eval "tmp=\$ap_enabled_mpm_$1"
+ if test "$tmp" = "yes"; then
+ return 0
+ else
+ return 1
+ fi
+}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if event MPM supports this platform" >&5
+$as_echo_n "checking if event MPM supports this platform... " >&6; }
+if test $forking_mpms_supported != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - This is not a forking platform" >&5
+$as_echo "no - This is not a forking platform" >&6; }
+elif test $ac_cv_define_APR_HAS_THREADS != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR does not support threads" >&5
+$as_echo "no - APR does not support threads" >&6; }
+elif test $have_threaded_sig_graceful != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - SIG_GRACEFUL cannot be used with a threaded MPM" >&5
+$as_echo "no - SIG_GRACEFUL cannot be used with a threaded MPM" >&6; }
+elif test $ac_cv_have_threadsafe_pollset != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR_POLLSET_THREADSAFE is not supported" >&5
+$as_echo "no - APR_POLLSET_THREADSAFE is not supported" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ if test "yes" = "yes"; then
+ eval "ap_supported_mpm_event=shared"
+ ap_supported_shared_mpms="$ap_supported_shared_mpms event "
+ else
+ eval "ap_supported_mpm_event=static"
+ fi
+ if test "yes" = "yes"; then
+ eval "ap_threaded_mpm_event=yes"
+ fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MPM_SUBDIR_NAME"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if mpmt_os2 MPM supports this platform" >&5
+$as_echo_n "checking if mpmt_os2 MPM supports this platform... " >&6; }
+case $host in
+ *os2-emx*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-MODLIST="$MODLIST mpm_${MPM_NAME}"
+ if test "no" = "yes"; then
+ eval "ap_supported_mpm_mpmt_os2=shared"
+ ap_supported_shared_mpms="$ap_supported_shared_mpms mpmt_os2 "
+ else
+ eval "ap_supported_mpm_mpmt_os2=static"
+ fi
+ if test "yes" = "yes"; then
+ eval "ap_threaded_mpm_mpmt_os2=yes"
+ fi
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ ;;
+esac
-if test "$MPM_NAME" = "prefork" ; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if prefork MPM supports this platform" >&5
+$as_echo_n "checking if prefork MPM supports this platform... " >&6; }
+if test $forking_mpms_supported != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - This is not a forking platform" >&5
+$as_echo "no - This is not a forking platform" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES server/mpm/$MPM_NAME/Makefile"
+ if test "yes" = "yes"; then
+ eval "ap_supported_mpm_prefork=shared"
+ ap_supported_shared_mpms="$ap_supported_shared_mpms prefork "
+ else
+ eval "ap_supported_mpm_prefork=static"
+ fi
+ if test "no" = "yes"; then
+ eval "ap_threaded_mpm_prefork=yes"
+ fi
fi
-if test "$MPM_NAME" = "winnt" ; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if WinNT MPM supports this platform" >&5
+$as_echo_n "checking if WinNT MPM supports this platform... " >&6; }
+case $host in
+ *mingw32*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+ if test "no" = "yes"; then
+ eval "ap_supported_mpm_winnt=shared"
+ ap_supported_shared_mpms="$ap_supported_shared_mpms winnt "
+ else
+ eval "ap_supported_mpm_winnt=static"
+ fi
+ if test "yes" = "yes"; then
+ eval "ap_threaded_mpm_winnt=yes"
+ fi
+
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if worker MPM supports this platform" >&5
+$as_echo_n "checking if worker MPM supports this platform... " >&6; }
+if test $forking_mpms_supported != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - This is not a forking platform" >&5
+$as_echo "no - This is not a forking platform" >&6; }
+elif test $ac_cv_define_APR_HAS_THREADS != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR does not support threads" >&5
+$as_echo "no - APR does not support threads" >&6; }
+elif test $have_threaded_sig_graceful != yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - SIG_GRACEFUL cannot be used with a threaded MPM" >&5
+$as_echo "no - SIG_GRACEFUL cannot be used with a threaded MPM" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES server/mpm/$MPM_NAME/Makefile"
+ if test "yes" = "yes"; then
+ eval "ap_supported_mpm_worker=shared"
+ ap_supported_shared_mpms="$ap_supported_shared_mpms worker "
+ else
+ eval "ap_supported_mpm_worker=static"
+ fi
+ if test "yes" = "yes"; then
+ eval "ap_threaded_mpm_worker=yes"
+ fi
fi
@@ -14836,6 +24812,7 @@ ab_LTFLAGS=""
checkgid_LTFLAGS=""
htcacheclean_LTFLAGS=""
httxt2dbm_LTFLAGS=""
+fcgistarter_LTFLAGS=""
# Check whether --enable-static-support was given.
if test "${enable_static_support+set}" = set; then :
@@ -15030,6 +25007,27 @@ if test "$enableval" = "yes" ; then
done
fi
+
+ if test "x$fcgistarter_LTFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting fcgistarter_LTFLAGS to \"-static\""
+ fcgistarter_LTFLAGS="-static"
+ else
+ apr_addto_bugger="-static"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $fcgistarter_LTFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to fcgistarter_LTFLAGS"
+ fcgistarter_LTFLAGS="$fcgistarter_LTFLAGS $i"
+ fi
+ done
+ fi
+
fi
fi
@@ -15530,6 +25528,61 @@ fi
+# Check whether --enable-static-fcgistarter was given.
+if test "${enable_static_fcgistarter+set}" = set; then :
+ enableval=$enable_static_fcgistarter;
+if test "$enableval" = "yes" ; then
+
+ if test "x$fcgistarter_LTFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting fcgistarter_LTFLAGS to \"-static\""
+ fcgistarter_LTFLAGS="-static"
+ else
+ apr_addto_bugger="-static"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $fcgistarter_LTFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to fcgistarter_LTFLAGS"
+ fcgistarter_LTFLAGS="$fcgistarter_LTFLAGS $i"
+ fi
+ done
+ fi
+
+else
+
+ if test "x$fcgistarter" = "x-static"; then
+ test "x$silent" != "xyes" && echo " nulling fcgistarter"
+ fcgistarter=""
+ else
+ apr_new_bugger=""
+ apr_removed=0
+ for i in $fcgistarter; do
+ if test "x$i" != "x-static"; then
+ apr_new_bugger="$apr_new_bugger $i"
+ else
+ apr_removed=1
+ fi
+ done
+ if test $apr_removed = "1"; then
+ test "x$silent" != "xyes" && echo " removed \"-static\" from fcgistarter"
+ fcgistarter=$apr_new_bugger
+ fi
+ fi
+
+fi
+
+fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST fcgistarter_LTFLAGS"
+
+
+
# Configure or check which of the non-portable support programs can be enabled.
NONPORTABLE_SUPPORT=""
@@ -15537,7 +25590,7 @@ case $host in
*mingw*)
;;
*)
- NONPORTABLE_SUPPORT="checkgid"
+ NONPORTABLE_SUPPORT="checkgid fcgistarter"
;;
esac
@@ -15560,7 +25613,7 @@ case $host in
APACHECTL_ULIMIT="ulimit -S -n \`ulimit -h -n\`"
;;
*)
- if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT ; then
+ if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT >/dev/null 2>&1; then
APACHECTL_ULIMIT="ulimit -S -n \`ulimit -H -n\`"
else
APACHECTL_ULIMIT=""
@@ -15573,176 +25626,1597 @@ esac
-
- current_dir=http
- modpath_current=modules/http
+ current_dir=proxy/balancers
+ modpath_current=modules/proxy/balancers
modpath_static=
modpath_shared=
- test -d http || $srcdir/build/mkdir.sh $modpath_current
+ test -d proxy/balancers || $srcdir/build/mkdir.sh $modpath_current
> $modpath_current/modules.mk
-http_objects="http_core.lo http_protocol.lo http_request.lo http_filters.lo chunk_filter.lo byterange_filter.lo http_etag.lo"
-if test "$enable_http" = "yes"; then
- enable_http="static"
-elif test "$enable_http" = "shared"; then
- as_fn_error "mod_http can not be built as a shared DSO" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lbmethod_byrequests" >&5
+$as_echo_n "checking whether to enable mod_lbmethod_byrequests... " >&6; }
+ # Check whether --enable-lbmethod-byrequests was given.
+if test "${enable_lbmethod_byrequests+set}" = set; then :
+ enableval=$enable_lbmethod_byrequests; force_lbmethod_byrequests=$enableval
+else
+ enable_lbmethod_byrequests=$proxy_mods_enable
fi
+ _apmod_extra_msg=""
+ case "$enable_lbmethod_byrequests" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_lbmethod_byrequests" = "static"; then
+ enable_lbmethod_byrequests=static
+ elif test "$enable_lbmethod_byrequests" = "yes"; then
+ enable_lbmethod_byrequests=$module_default
+ elif test "$enable_lbmethod_byrequests" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_lbmethod_byrequests=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_lbmethod_byrequests=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_lbmethod_byrequests" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_lbmethod_byrequests=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_lbmethod_byrequests=no
+ fi
+ elif test "$enable_lbmethod_byrequests" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_lbmethod_byrequests" != "no" ; then
+ enable_lbmethod_byrequests=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_lbmethod_byrequests" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lbmethod_byrequests$_apmod_extra_msg" >&5
+$as_echo "$enable_lbmethod_byrequests$_apmod_extra_msg" >&6; }
+ if test "$enable_lbmethod_byrequests" != "no"; then
+ case "$enable_lbmethod_byrequests" in
+ static*)
+ MODLIST="$MODLIST lbmethod_byrequests"
+ if test "lbmethod_byrequests" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_lbmethod_byrequests=`echo $enable_lbmethod_byrequests|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES lbmethod_byrequests"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_byrequests"
+ fi
+ ;;
+ esac
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_http" >&5
-$as_echo_n "checking whether to enable mod_http... " >&6; }
- # Check whether --enable-http was given.
-if test "${enable_http+set}" = set; then :
- enableval=$enable_http;
+ if test -z ""; then
+ objects="mod_lbmethod_byrequests.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_lbmethod_byrequests.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_LBMETHOD_BYREQUESTS_LDADD)
+EOF
+ if test ! -z "\$(MOD_LBMETHOD_BYREQUESTS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LBMETHOD_BYREQUESTS_LDADD)\""
+ AP_LIBS="\$(MOD_LBMETHOD_BYREQUESTS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LBMETHOD_BYREQUESTS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_lbmethod_byrequests.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_LBMETHOD_BYREQUESTS_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_LBMETHOD_BYREQUESTS_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lbmethod_bytraffic" >&5
+$as_echo_n "checking whether to enable mod_lbmethod_bytraffic... " >&6; }
+ # Check whether --enable-lbmethod-bytraffic was given.
+if test "${enable_lbmethod_bytraffic+set}" = set; then :
+ enableval=$enable_lbmethod_bytraffic; force_lbmethod_bytraffic=$enableval
else
- enable_http=static
+ enable_lbmethod_bytraffic=$proxy_mods_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_http" = "most"; then
- _apmod_error_fatal="no"
+ case "$enable_lbmethod_bytraffic" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_lbmethod_bytraffic" = "static"; then
+ enable_lbmethod_bytraffic=static
+ elif test "$enable_lbmethod_bytraffic" = "yes"; then
+ enable_lbmethod_bytraffic=$module_default
+ elif test "$enable_lbmethod_bytraffic" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_lbmethod_bytraffic=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_lbmethod_bytraffic=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_lbmethod_bytraffic" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_lbmethod_bytraffic=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_lbmethod_bytraffic=no
+ fi
+ elif test "$enable_lbmethod_bytraffic" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_lbmethod_bytraffic" != "no" ; then
+ enable_lbmethod_bytraffic=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_lbmethod_bytraffic" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lbmethod_bytraffic$_apmod_extra_msg" >&5
+$as_echo "$enable_lbmethod_bytraffic$_apmod_extra_msg" >&6; }
+ if test "$enable_lbmethod_bytraffic" != "no"; then
+ case "$enable_lbmethod_bytraffic" in
+ static*)
+ MODLIST="$MODLIST lbmethod_bytraffic"
+ if test "lbmethod_bytraffic" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_lbmethod_bytraffic=`echo $enable_lbmethod_bytraffic|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES lbmethod_bytraffic"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_bytraffic"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_lbmethod_bytraffic.lo"
else
- _apmod_error_fatal="yes"
+ objects=""
fi
- if test "$enable_http" = "static"; then
- enable_http=yes
- elif test "$enable_http" = "yes"; then
- enable_http=$module_default
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_lbmethod_bytraffic.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_LBMETHOD_BYTRAFFIC_LDADD)
+EOF
+ if test ! -z "\$(MOD_LBMETHOD_BYTRAFFIC_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LBMETHOD_BYTRAFFIC_LDADD)\""
+ AP_LIBS="\$(MOD_LBMETHOD_BYTRAFFIC_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LBMETHOD_BYTRAFFIC_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_lbmethod_bytraffic.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_LBMETHOD_BYTRAFFIC_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_LBMETHOD_BYTRAFFIC_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lbmethod_bybusyness" >&5
+$as_echo_n "checking whether to enable mod_lbmethod_bybusyness... " >&6; }
+ # Check whether --enable-lbmethod-bybusyness was given.
+if test "${enable_lbmethod_bybusyness+set}" = set; then :
+ enableval=$enable_lbmethod_bybusyness; force_lbmethod_bybusyness=$enableval
+else
+ enable_lbmethod_bybusyness=$proxy_mods_enable
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_lbmethod_bybusyness" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_lbmethod_bybusyness" = "static"; then
+ enable_lbmethod_bybusyness=static
+ elif test "$enable_lbmethod_bybusyness" = "yes"; then
+ enable_lbmethod_bybusyness=$module_default
+ elif test "$enable_lbmethod_bybusyness" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_lbmethod_bybusyness=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_lbmethod_bybusyness=no
+ fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_http" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_http=$module_default
+ elif test "$enable_lbmethod_bybusyness" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_lbmethod_bybusyness=$module_default
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_http" != "yes"; then
- enable_http=no
- fi
- elif test "$enable_http" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_http=$module_default
- _apmod_extra_msg=" (all)"
else
- enable_http=no
+ enable_lbmethod_bybusyness=no
fi
+ elif test "$enable_lbmethod_bybusyness" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_lbmethod_bybusyness" != "no" ; then
+ enable_lbmethod_bybusyness=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
- if test "$enable_http" != "no"; then
+ if test "$enable_lbmethod_bybusyness" != "no"; then
:
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_http$_apmod_extra_msg" >&5
-$as_echo "$enable_http$_apmod_extra_msg" >&6; }
- if test "$enable_http" != "no"; then
- case "$enable_http" in
- shared*)
- enable_http=`echo $enable_http|sed 's/shared,*//'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lbmethod_bybusyness$_apmod_extra_msg" >&5
+$as_echo "$enable_lbmethod_bybusyness$_apmod_extra_msg" >&6; }
+ if test "$enable_lbmethod_bybusyness" != "no"; then
+ case "$enable_lbmethod_bybusyness" in
+ static*)
+ MODLIST="$MODLIST lbmethod_bybusyness"
+ if test "lbmethod_bybusyness" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_lbmethod_bybusyness=`echo $enable_lbmethod_bybusyness|sed 's/shared,*//'`
sharedobjs=yes
shared=yes
- DSO_MODULES="$DSO_MODULES http"
+ DSO_MODULES="$DSO_MODULES lbmethod_bybusyness"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_bybusyness"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_lbmethod_bybusyness.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_lbmethod_bybusyness.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_LBMETHOD_BYBUSYNESS_LDADD)
+EOF
+ if test ! -z "\$(MOD_LBMETHOD_BYBUSYNESS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LBMETHOD_BYBUSYNESS_LDADD)\""
+ AP_LIBS="\$(MOD_LBMETHOD_BYBUSYNESS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LBMETHOD_BYBUSYNESS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_lbmethod_bybusyness.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_LBMETHOD_BYBUSYNESS_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_LBMETHOD_BYBUSYNESS_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lbmethod_heartbeat" >&5
+$as_echo_n "checking whether to enable mod_lbmethod_heartbeat... " >&6; }
+ # Check whether --enable-lbmethod-heartbeat was given.
+if test "${enable_lbmethod_heartbeat+set}" = set; then :
+ enableval=$enable_lbmethod_heartbeat; force_lbmethod_heartbeat=$enableval
+else
+ enable_lbmethod_heartbeat=$proxy_mods_enable
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_lbmethod_heartbeat" in
+ yes|static|shared)
+ _apmod_required="yes"
;;
*)
- MODLIST="$MODLIST http"
- if test "http" = "so"; then
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_lbmethod_heartbeat" = "static"; then
+ enable_lbmethod_heartbeat=static
+ elif test "$enable_lbmethod_heartbeat" = "yes"; then
+ enable_lbmethod_heartbeat=$module_default
+ elif test "$enable_lbmethod_heartbeat" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_lbmethod_heartbeat=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_lbmethod_heartbeat=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_lbmethod_heartbeat" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_lbmethod_heartbeat=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_lbmethod_heartbeat=no
+ fi
+ elif test "$enable_lbmethod_heartbeat" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_lbmethod_heartbeat" != "no" ; then
+ enable_lbmethod_heartbeat=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_lbmethod_heartbeat" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lbmethod_heartbeat$_apmod_extra_msg" >&5
+$as_echo "$enable_lbmethod_heartbeat$_apmod_extra_msg" >&6; }
+ if test "$enable_lbmethod_heartbeat" != "no"; then
+ case "$enable_lbmethod_heartbeat" in
+ static*)
+ MODLIST="$MODLIST lbmethod_heartbeat"
+ if test "lbmethod_heartbeat" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_lbmethod_heartbeat=`echo $enable_lbmethod_heartbeat|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES lbmethod_heartbeat"
+ if test "$proxy_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lbmethod_heartbeat"
+ fi
+ ;;
esac
- if test -z "$http_objects"; then
- objects="mod_http.lo"
+ if test -z ""; then
+ objects="mod_lbmethod_heartbeat.lo"
else
- objects="$http_objects"
+ objects=""
fi
if test -z "$module_standalone"; then
if test -z "$shared"; then
# The filename of a convenience library must have a "lib" prefix:
- libname="libmod_http.la"
+ libname="libmod_lbmethod_heartbeat.la"
BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
modpath_static="$modpath_static $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $objects
- \$(MOD_LINK) $objects \$(MOD_HTTP_LDADD)
+ \$(MOD_LINK) $objects \$(MOD_LBMETHOD_HEARTBEAT_LDADD)
EOF
+ if test ! -z "\$(MOD_LBMETHOD_HEARTBEAT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_LBMETHOD_HEARTBEAT_LDADD)\""
+ AP_LIBS="\$(MOD_LBMETHOD_HEARTBEAT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_LBMETHOD_HEARTBEAT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
- libname="mod_http.la"
+ libname="mod_lbmethod_heartbeat.la"
shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
modpath_shared="$modpath_shared $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_HTTP_LDADD)
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_LBMETHOD_HEARTBEAT_LDADD)
EOF
fi
fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_HTTP_LDADD"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_LBMETHOD_HEARTBEAT_LDADD"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_mime" >&5
-$as_echo_n "checking whether to enable mod_mime... " >&6; }
- # Check whether --enable-mime was given.
-if test "${enable_mime+set}" = set; then :
- enableval=$enable_mime;
+
+ 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
+ if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+ MODULE_DIRS="$MODULE_DIRS $current_dir"
+ else
+ MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ fi
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which MPM to use by default" >&5
+$as_echo_n "checking which MPM to use by default... " >&6; }
+
+# Check whether --with-mpm was given.
+if test "${with_mpm+set}" = set; then :
+ withval=$with_mpm;
+ default_mpm=$withval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+$as_echo "$withval" >&6; };
+
+else
+
+ if ap_mpm_is_supported "winnt"; then
+ default_mpm=winnt
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: winnt" >&5
+$as_echo "winnt" >&6; }
+ elif ap_mpm_is_supported "mpmt_os2"; then
+ default_mpm=mpmt_os2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: mpmt_os2" >&5
+$as_echo "mpmt_os2" >&6; }
+ elif ap_mpm_is_supported "event"; then
+ default_mpm=event
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: event" >&5
+$as_echo "event" >&6; }
+ elif ap_mpm_is_supported "worker"; then
+ default_mpm=worker
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: worker - event is not supported" >&5
+$as_echo "worker - event is not supported" >&6; }
+ else
+ default_mpm=prefork
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: prefork - event and worker are not supported" >&5
+$as_echo "prefork - event and worker are not supported" >&6; }
+ fi
+
+fi
+
+
+
+ if ap_mpm_is_enabled $default_mpm; then
+ :
+ else
+ eval "ap_enabled_mpm_$default_mpm=yes"
+ ap_enabled_mpms="$ap_enabled_mpms $default_mpm "
+ fi
+
+
+# Check whether --enable-mpms-shared was given.
+if test "${enable_mpms_shared+set}" = set; then :
+ enableval=$enable_mpms_shared;
+ if test "$enableval" = "no"; then
+ mpm_build=static
+ else
+ mpm_build=shared
+ if test "$enableval" = "yes"; then
+ enableval=$default_mpm
+ fi
+ for i in $enableval; do
+ if test "$i" = "all"; then
+ for j in $ap_supported_shared_mpms; do
+ eval "enable_mpm_$j=shared"
+
+ if ap_mpm_is_enabled $j; then
+ :
+ else
+ eval "ap_enabled_mpm_$j=yes"
+ ap_enabled_mpms="$ap_enabled_mpms $j "
+ fi
+
+ done
+ else
+ i=`echo $i | sed 's/-/_/g'`
+ if ap_mpm_supports_shared $i; then
+ eval "enable_mpm_$i=shared"
+
+ if ap_mpm_is_enabled $i; then
+ :
+ else
+ eval "ap_enabled_mpm_$i=yes"
+ ap_enabled_mpms="$ap_enabled_mpms $i "
+ fi
+
+ else
+ as_fn_error $? "MPM $i does not support dynamic loading." "$LINENO" 5
+ fi
+ fi
+ done
+ fi
+
else
- enable_mime=yes
+ mpm_build=static
+fi
+
+
+for i in $ap_enabled_mpms; do
+ if ap_mpm_is_supported $i; then
+ :
+ else
+ as_fn_error $? "MPM $i is not supported on this platform." "$LINENO" 5
+ fi
+done
+
+if test $mpm_build = "shared"; then
+ eval "tmp=\$enable_mpm_$default_mpm"
+ if test "$tmp" != "shared"; then
+ as_fn_error $? "The default MPM ($default_mpm) must be included in --enable-mpms-shared. Use --with-mpm to change the default MPM." "$LINENO" 5
+ fi
+fi
+
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES server/mpm/Makefile"
+
+
+if test $mpm_build = "shared"; then
+ MPM_LIB=""
+else
+ MPM_LIB=server/mpm/$default_mpm/lib${default_mpm}.la
+ MODLIST="$MODLIST mpm_${default_mpm}"
+fi
+
+MPM_SUBDIRS=$ap_enabled_mpms
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MPM_SUBDIRS"
+
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MPM_LIB"
+
+
+
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_MPM_EVENT_LDADD"
+
+
+
+
+ if ap_mpm_is_enabled event; then
+ if test -z "event.lo fdqueue.lo pod.lo"; then
+ objects="event.lo"
+ else
+ objects="event.lo fdqueue.lo pod.lo"
+ fi
+
+ if test -z ""; then
+ mpmpath="server/mpm/event"
+ else
+ mpmpath=
+ fi
+
+ test -d $mpmpath || $srcdir/build/mkdir.sh $mpmpath
+
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $mpmpath/Makefile"
+
+
+ if test -z "$enable_mpm_event"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_MPM_EVENT_LDADD)\""
+ AP_LIBS="\$(MOD_MPM_EVENT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_MPM_EVENT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ libname="libevent.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_event.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ cat >$mpmpath/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_MPM_EVENT_LDADD)
+DISTCLEAN_TARGETS = modules.mk
+static =
+shared = $libname
+EOF
+ # add default MPM to LoadModule list
+ if test event = $default_mpm; then
+ DSO_MODULES="$DSO_MODULES mpm_event"
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_event"
+ fi
+ fi
+
+ for ac_func in pthread_kill
+do :
+ ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill"
+if test "x$ac_cv_func_pthread_kill" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_KILL 1
+_ACEOF
+
+fi
+done
+
+
+ fi
+
+
+
+ if ap_mpm_is_enabled prefork; then
+ if test -z ""; then
+ objects="prefork.lo"
+ else
+ objects=""
+ fi
+
+ if test -z ""; then
+ mpmpath="server/mpm/prefork"
+ else
+ mpmpath=
+ fi
+
+ test -d $mpmpath || $srcdir/build/mkdir.sh $mpmpath
+
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $mpmpath/Makefile"
+
+
+ if test -z "$enable_mpm_prefork"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\""
+ AP_LIBS=""
+ else
+ apr_addto_bugger=""
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ libname="libprefork.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_prefork.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 prefork = $default_mpm; then
+ DSO_MODULES="$DSO_MODULES mpm_prefork"
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_prefork"
+ fi
+ fi
+
+ fi
+
+
+winnt_objects="child.lo mpm_winnt.lo nt_eventlog.lo service.lo"
+
+ if ap_mpm_is_enabled winnt; then
+ if test -z "$winnt_objects"; then
+ objects="winnt.lo"
+ else
+ objects="$winnt_objects"
+ fi
+
+ if test -z ""; then
+ mpmpath="server/mpm/winnt"
+ else
+ mpmpath=
+ fi
+
+ test -d $mpmpath || $srcdir/build/mkdir.sh $mpmpath
+
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $mpmpath/Makefile"
+
+
+ if test -z "$enable_mpm_winnt"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\""
+ AP_LIBS=""
+ else
+ apr_addto_bugger=""
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ libname="libwinnt.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_winnt.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 winnt = $default_mpm; then
+ DSO_MODULES="$DSO_MODULES mpm_winnt"
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_winnt"
+ fi
+ fi
+
+ fi
+
+
+
+
+ if ap_mpm_is_enabled worker; then
+ if test -z "worker.lo fdqueue.lo pod.lo"; then
+ objects="worker.lo"
+ else
+ objects="worker.lo fdqueue.lo pod.lo"
+ fi
+
+ if test -z ""; then
+ mpmpath="server/mpm/worker"
+ else
+ mpmpath=
+ fi
+
+ test -d $mpmpath || $srcdir/build/mkdir.sh $mpmpath
+
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $mpmpath/Makefile"
+
+
+ if test -z "$enable_mpm_worker"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\""
+ AP_LIBS=""
+ else
+ apr_addto_bugger=""
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ libname="libworker.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_worker.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 worker = $default_mpm; then
+ DSO_MODULES="$DSO_MODULES mpm_worker"
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_worker"
+ fi
+ fi
+
+ for ac_func in pthread_kill
+do :
+ ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill"
+if test "x$ac_cv_func_pthread_kill" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_KILL 1
+_ACEOF
+
+fi
+done
+
+
+ fi
+
+
+
+
+ current_dir=arch/unix
+ modpath_current=modules/arch/unix
+ modpath_static=
+ modpath_shared=
+ test -d arch/unix || $srcdir/build/mkdir.sh $modpath_current
+ > $modpath_current/modules.mk
+
+
+if ap_mpm_is_enabled "worker" \
+ || ap_mpm_is_enabled "event" \
+ || ap_mpm_is_enabled "prefork"; then
+ unixd_mods_enable=yes
+else
+ unixd_mods_enable=no
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_unixd" >&5
+$as_echo_n "checking whether to enable mod_unixd... " >&6; }
+ # Check whether --enable-unixd was given.
+if test "${enable_unixd+set}" = set; then :
+ enableval=$enable_unixd; force_unixd=$enableval
+else
+ enable_unixd=$unixd_mods_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_mime" = "most"; then
- _apmod_error_fatal="no"
+ case "$enable_unixd" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_unixd" = "static"; then
+ enable_unixd=static
+ elif test "$enable_unixd" = "yes"; then
+ enable_unixd=$module_default
+ elif test "$enable_unixd" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_unixd=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_unixd=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_unixd" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_unixd=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_unixd=no
+ fi
+ elif test "$enable_unixd" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_unixd" != "no" ; then
+ enable_unixd=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_unixd" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_unixd$_apmod_extra_msg" >&5
+$as_echo "$enable_unixd$_apmod_extra_msg" >&6; }
+ if test "$enable_unixd" != "no"; then
+ case "$enable_unixd" in
+ static*)
+ MODLIST="$MODLIST unixd"
+ if test "unixd" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_unixd=`echo $enable_unixd|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES unixd"
+ if test "$unixd_mods_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},unixd"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_unixd.lo"
else
- _apmod_error_fatal="yes"
+ objects=""
fi
- if test "$enable_mime" = "static"; then
- enable_mime=yes
- elif test "$enable_mime" = "yes"; then
- enable_mime=$module_default
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_unixd.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_UNIXD_LDADD)
+EOF
+ if test ! -z "\$(MOD_UNIXD_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_UNIXD_LDADD)\""
+ AP_LIBS="\$(MOD_UNIXD_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_UNIXD_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_unixd.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_UNIXD_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_UNIXD_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_privileges" >&5
+$as_echo_n "checking whether to enable mod_privileges... " >&6; }
+ # Check whether --enable-privileges was given.
+if test "${enable_privileges+set}" = set; then :
+ enableval=$enable_privileges; force_privileges=$enableval
+else
+ enable_privileges=no
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_privileges" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_privileges" = "static"; then
+ enable_privileges=static
+ elif test "$enable_privileges" = "yes"; then
+ enable_privileges=$module_default
+ elif test "$enable_privileges" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_privileges=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_privileges=no
+ fi
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_mime" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_mime=$module_default
+ elif test "$enable_privileges" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_privileges=$module_default
_apmod_extra_msg=" ($module_selection)"
- elif test "$enable_mime" != "yes"; then
- enable_mime=no
+ else
+ enable_privileges=no
fi
- elif test "$enable_mime" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_mime=$module_default
- _apmod_extra_msg=" (all)"
+ elif test "$enable_privileges" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_privileges" != "no" ; then
+ enable_privileges=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_privileges" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+ for ac_header in priv.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "priv.h" "ac_cv_header_priv_h" "$ac_includes_default"
+if test "x$ac_cv_header_priv_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_PRIV_H 1
+_ACEOF
+ ap_HAVE_PRIV_H="yes"
+else
+ ap_HAVE_PRIV_H="no"
+fi
+
+done
+
+ if test $ap_HAVE_PRIV_H = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your system does not support privileges." >&5
+$as_echo "$as_me: WARNING: Your system does not support privileges." >&2;}
+ enable_privileges="no"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_privileges" >&5
+$as_echo_n "checking whether to enable mod_privileges... " >&6; }
+ if test "$enable_privileges" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ as_fn_error $? "mod_privileges has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ fi
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_privileges$_apmod_extra_msg" >&5
+$as_echo "$enable_privileges$_apmod_extra_msg" >&6; }
+ if test "$enable_privileges" != "no"; then
+ case "$enable_privileges" in
+ static*)
+ MODLIST="$MODLIST privileges"
+ if test "privileges" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_privileges=`echo $enable_privileges|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES privileges"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},privileges"
+ fi
+ ;;
+ esac
+
+
+ if test -z ""; then
+ objects="mod_privileges.lo"
+ else
+ objects=""
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_privileges.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_PRIVILEGES_LDADD)
+EOF
+ if test ! -z "\$(MOD_PRIVILEGES_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_PRIVILEGES_LDADD)\""
+ AP_LIBS="\$(MOD_PRIVILEGES_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_PRIVILEGES_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
- enable_mime=no
+ apache_need_shared=yes
+ libname="mod_privileges.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_PRIVILEGES_LDADD)
+EOF
fi
fi
- if test "$enable_mime" != "no"; then
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_PRIVILEGES_LDADD"
+
+
+
+ fi
+
+
+
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+
+ 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
+ if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
+ MODULE_DIRS="$MODULE_DIRS $current_dir"
+ else
+ MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
+ fi
+
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile"
+
+
+
+
+
+
+ current_dir=cluster
+ modpath_current=modules/cluster
+ modpath_static=
+ modpath_shared=
+ test -d cluster || $srcdir/build/mkdir.sh $modpath_current
+ > $modpath_current/modules.mk
+
+
+heartbeat_objects='mod_heartbeat.lo'
+
+case "$host" in
+ *os2*)
+ # OS/2 DLLs must resolve all symbols at build time
+ # and we need some from the watchdog module
+ heartbeat_objects="$heartbeat_objects ../core/mod_watchdog.la"
+ ;;
+esac
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_heartbeat" >&5
+$as_echo_n "checking whether to enable mod_heartbeat... " >&6; }
+ # Check whether --enable-heartbeat was given.
+if test "${enable_heartbeat+set}" = set; then :
+ enableval=$enable_heartbeat; force_heartbeat=$enableval
+else
+ enable_heartbeat=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_heartbeat" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_heartbeat" = "static"; then
+ enable_heartbeat=static
+ elif test "$enable_heartbeat" = "yes"; then
+ enable_heartbeat=$module_default
+ elif test "$enable_heartbeat" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_heartbeat=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_heartbeat=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_heartbeat" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_heartbeat=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_heartbeat=no
+ fi
+ elif test "$enable_heartbeat" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_heartbeat" != "no" ; then
+ enable_heartbeat=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_heartbeat" != "no"; then
:
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mime$_apmod_extra_msg" >&5
-$as_echo "$enable_mime$_apmod_extra_msg" >&6; }
- if test "$enable_mime" != "no"; then
- case "$enable_mime" in
- shared*)
- enable_mime=`echo $enable_mime|sed 's/shared,*//'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_heartbeat$_apmod_extra_msg" >&5
+$as_echo "$enable_heartbeat$_apmod_extra_msg" >&6; }
+ if test "$enable_heartbeat" != "no"; then
+ case "$enable_heartbeat" in
+ static*)
+ MODLIST="$MODLIST heartbeat"
+ if test "heartbeat" = "so"; then
+ sharedobjs=yes
+ fi
+ shared="";;
+ *)
+ enable_heartbeat=`echo $enable_heartbeat|sed 's/shared,*//'`
sharedobjs=yes
shared=yes
- DSO_MODULES="$DSO_MODULES mime"
+ DSO_MODULES="$DSO_MODULES heartbeat"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},heartbeat"
+ fi
+ ;;
+ esac
+
+
+ if test -z "$heartbeat_objects"; then
+ objects="mod_heartbeat.lo"
+ else
+ objects="$heartbeat_objects"
+ fi
+
+ if test -z "$module_standalone"; then
+ if test -z "$shared"; then
+ # The filename of a convenience library must have a "lib" prefix:
+ libname="libmod_heartbeat.la"
+ BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
+ modpath_static="$modpath_static $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $objects
+ \$(MOD_LINK) $objects \$(MOD_HEARTBEAT_LDADD)
+EOF
+ if test ! -z "\$(MOD_HEARTBEAT_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_HEARTBEAT_LDADD)\""
+ AP_LIBS="\$(MOD_HEARTBEAT_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_HEARTBEAT_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
+ else
+ apache_need_shared=yes
+ libname="mod_heartbeat.la"
+ shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
+ modpath_shared="$modpath_shared $libname"
+ cat >>$modpath_current/modules.mk<<EOF
+$libname: $shobjects
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_HEARTBEAT_LDADD)
+EOF
+ fi
+ fi
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_HEARTBEAT_LDADD"
+
+
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_heartmonitor" >&5
+$as_echo_n "checking whether to enable mod_heartmonitor... " >&6; }
+ # Check whether --enable-heartmonitor was given.
+if test "${enable_heartmonitor+set}" = set; then :
+ enableval=$enable_heartmonitor; force_heartmonitor=$enableval
+else
+ enable_heartmonitor=maybe-all
+fi
+
+ _apmod_extra_msg=""
+ case "$enable_heartmonitor" in
+ yes|static|shared)
+ _apmod_required="yes"
;;
*)
- MODLIST="$MODLIST mime"
- if test "mime" = "so"; then
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
+ if test "$enable_heartmonitor" = "static"; then
+ enable_heartmonitor=static
+ elif test "$enable_heartmonitor" = "yes"; then
+ enable_heartmonitor=$module_default
+ elif test "$enable_heartmonitor" = "most"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
+ enable_heartmonitor=$module_default
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
+ enable_heartmonitor=no
+ fi
+ _apmod_extra_msg=" ($module_selection)"
+ elif test "$enable_heartmonitor" = "maybe-all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
+ enable_heartmonitor=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ else
+ enable_heartmonitor=no
+ fi
+ elif test "$enable_heartmonitor" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_heartmonitor" != "no" ; then
+ enable_heartmonitor=$module_default
+ _apmod_extra_msg=" ($module_selection)"
+ fi
+ if test "$enable_heartmonitor" != "no"; then
+ :
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_heartmonitor$_apmod_extra_msg" >&5
+$as_echo "$enable_heartmonitor$_apmod_extra_msg" >&6; }
+ if test "$enable_heartmonitor" != "no"; then
+ case "$enable_heartmonitor" in
+ static*)
+ MODLIST="$MODLIST heartmonitor"
+ if test "heartmonitor" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_heartmonitor=`echo $enable_heartmonitor|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES heartmonitor"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},heartmonitor"
+ fi
+ ;;
esac
if test -z ""; then
- objects="mod_mime.lo"
+ objects="mod_heartmonitor.lo"
else
objects=""
fi
@@ -15750,27 +27224,50 @@ $as_echo "$enable_mime$_apmod_extra_msg" >&6; }
if test -z "$module_standalone"; then
if test -z "$shared"; then
# The filename of a convenience library must have a "lib" prefix:
- libname="libmod_mime.la"
+ libname="libmod_heartmonitor.la"
BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
modpath_static="$modpath_static $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $objects
- \$(MOD_LINK) $objects \$(MOD_MIME_LDADD)
+ \$(MOD_LINK) $objects \$(MOD_HEARTMONITOR_LDADD)
EOF
+ if test ! -z "\$(MOD_HEARTMONITOR_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_HEARTMONITOR_LDADD)\""
+ AP_LIBS="\$(MOD_HEARTMONITOR_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_HEARTMONITOR_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
- libname="mod_mime.la"
+ libname="mod_heartmonitor.la"
shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
modpath_shared="$modpath_shared $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_MIME_LDADD)
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_HEARTMONITOR_LDADD)
EOF
fi
fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_MIME_LDADD"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_HEARTMONITOR_LDADD"
@@ -15880,36 +27377,51 @@ fi
$as_echo_n "checking whether to enable mod_dav... " >&6; }
# Check whether --enable-dav was given.
if test "${enable_dav+set}" = set; then :
- enableval=$enable_dav;
+ enableval=$enable_dav; force_dav=$enableval
else
enable_dav=$dav_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_dav" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_dav" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_dav" = "static"; then
- enable_dav=yes
+ enable_dav=static
elif test "$enable_dav" = "yes"; then
enable_dav=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dav" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_dav=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_dav" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_dav=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dav" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_dav=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_dav=no
fi
+ elif test "$enable_dav" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_dav" != "no" ; then
+ enable_dav=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_dav" != "no"; then
:
@@ -15918,18 +27430,21 @@ fi
$as_echo "$enable_dav$_apmod_extra_msg" >&6; }
if test "$enable_dav" != "no"; then
case "$enable_dav" in
- shared*)
- enable_dav=`echo $enable_dav|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES dav"
- ;;
- *)
+ static*)
MODLIST="$MODLIST dav"
if test "dav" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_dav=`echo $enable_dav|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES dav"
+ if test "$dav_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dav"
+ fi
+ ;;
esac
@@ -15949,6 +27464,29 @@ $as_echo "$enable_dav$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_DAV_LDADD)
EOF
+ if test ! -z "\$(MOD_DAV_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_DAV_LDADD)\""
+ AP_LIBS="\$(MOD_DAV_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_DAV_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_dav.la"
@@ -15971,6 +27509,7 @@ EOF
if test "$dav_enable" != "no" -o "$enable_dav" != "no"; then
apache_need_expat=yes
+fi
if test "x$INCLUDES" = "x"; then
@@ -15993,8 +27532,6 @@ if test "$dav_enable" != "no" -o "$enable_dav" != "no"; then
done
fi
-fi
-
echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
@@ -16026,36 +27563,51 @@ fi
$as_echo_n "checking whether to enable mod_status... " >&6; }
# Check whether --enable-status was given.
if test "${enable_status+set}" = set; then :
- enableval=$enable_status;
+ enableval=$enable_status; force_status=$enableval
else
enable_status=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_status" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_status" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_status" = "static"; then
- enable_status=yes
+ enable_status=static
elif test "$enable_status" = "yes"; then
enable_status=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_status" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_status=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_status" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_status=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_status" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_status=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_status=no
fi
+ elif test "$enable_status" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_status" != "no" ; then
+ enable_status=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_status" != "no"; then
:
@@ -16064,18 +27616,21 @@ fi
$as_echo "$enable_status$_apmod_extra_msg" >&6; }
if test "$enable_status" != "no"; then
case "$enable_status" in
- shared*)
- enable_status=`echo $enable_status|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES status"
- ;;
- *)
+ static*)
MODLIST="$MODLIST status"
if test "status" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_status=`echo $enable_status|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES status"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},status"
+ fi
+ ;;
esac
@@ -16095,6 +27650,29 @@ $as_echo "$enable_status$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_STATUS_LDADD)
EOF
+ if test ! -z "\$(MOD_STATUS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_STATUS_LDADD)\""
+ AP_LIBS="\$(MOD_STATUS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_STATUS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_status.la"
@@ -16119,36 +27697,51 @@ EOF
$as_echo_n "checking whether to enable mod_autoindex... " >&6; }
# Check whether --enable-autoindex was given.
if test "${enable_autoindex+set}" = set; then :
- enableval=$enable_autoindex;
+ enableval=$enable_autoindex; force_autoindex=$enableval
else
enable_autoindex=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_autoindex" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_autoindex" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_autoindex" = "static"; then
- enable_autoindex=yes
+ enable_autoindex=static
elif test "$enable_autoindex" = "yes"; then
enable_autoindex=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_autoindex" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_autoindex=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_autoindex" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_autoindex=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_autoindex" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_autoindex=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_autoindex=no
fi
+ elif test "$enable_autoindex" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_autoindex" != "no" ; then
+ enable_autoindex=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_autoindex" != "no"; then
:
@@ -16157,18 +27750,21 @@ fi
$as_echo "$enable_autoindex$_apmod_extra_msg" >&6; }
if test "$enable_autoindex" != "no"; then
case "$enable_autoindex" in
- shared*)
- enable_autoindex=`echo $enable_autoindex|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES autoindex"
- ;;
- *)
+ static*)
MODLIST="$MODLIST autoindex"
if test "autoindex" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_autoindex=`echo $enable_autoindex|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES autoindex"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},autoindex"
+ fi
+ ;;
esac
@@ -16188,6 +27784,29 @@ $as_echo "$enable_autoindex$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_AUTOINDEX_LDADD)
EOF
+ if test ! -z "\$(MOD_AUTOINDEX_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_AUTOINDEX_LDADD)\""
+ AP_LIBS="\$(MOD_AUTOINDEX_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_AUTOINDEX_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_autoindex.la"
@@ -16212,36 +27831,51 @@ EOF
$as_echo_n "checking whether to enable mod_asis... " >&6; }
# Check whether --enable-asis was given.
if test "${enable_asis+set}" = set; then :
- enableval=$enable_asis;
+ enableval=$enable_asis; force_asis=$enableval
else
- enable_asis=yes
+ enable_asis=maybe-all
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_asis" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_asis" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_asis" = "static"; then
- enable_asis=yes
+ enable_asis=static
elif test "$enable_asis" = "yes"; then
enable_asis=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_asis" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_asis=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_asis" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_asis=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_asis" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_asis=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_asis=no
fi
+ elif test "$enable_asis" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_asis" != "no" ; then
+ enable_asis=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_asis" != "no"; then
:
@@ -16250,18 +27884,21 @@ fi
$as_echo "$enable_asis$_apmod_extra_msg" >&6; }
if test "$enable_asis" != "no"; then
case "$enable_asis" in
- shared*)
- enable_asis=`echo $enable_asis|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES asis"
- ;;
- *)
+ static*)
MODLIST="$MODLIST asis"
if test "asis" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_asis=`echo $enable_asis|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES asis"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},asis"
+ fi
+ ;;
esac
@@ -16281,6 +27918,29 @@ $as_echo "$enable_asis$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_ASIS_LDADD)
EOF
+ if test ! -z "\$(MOD_ASIS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_ASIS_LDADD)\""
+ AP_LIBS="\$(MOD_ASIS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_ASIS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_asis.la"
@@ -16305,36 +27965,51 @@ EOF
$as_echo_n "checking whether to enable mod_info... " >&6; }
# Check whether --enable-info was given.
if test "${enable_info+set}" = set; then :
- enableval=$enable_info;
+ enableval=$enable_info; force_info=$enableval
else
enable_info=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_info" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_info" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_info" = "static"; then
- enable_info=yes
+ enable_info=static
elif test "$enable_info" = "yes"; then
enable_info=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_info" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_info=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_info" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_info=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_info" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_info=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_info=no
fi
+ elif test "$enable_info" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_info" != "no" ; then
+ enable_info=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_info" != "no"; then
:
@@ -16343,18 +28018,21 @@ fi
$as_echo "$enable_info$_apmod_extra_msg" >&6; }
if test "$enable_info" != "no"; then
case "$enable_info" in
- shared*)
- enable_info=`echo $enable_info|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES info"
- ;;
- *)
+ static*)
MODLIST="$MODLIST info"
if test "info" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_info=`echo $enable_info|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES info"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},info"
+ fi
+ ;;
esac
@@ -16374,6 +28052,29 @@ $as_echo "$enable_info$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_INFO_LDADD)
EOF
+ if test ! -z "\$(MOD_INFO_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_INFO_LDADD)\""
+ AP_LIBS="\$(MOD_INFO_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_INFO_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_info.la"
@@ -16398,36 +28099,51 @@ EOF
$as_echo_n "checking whether to enable mod_suexec... " >&6; }
# Check whether --enable-suexec was given.
if test "${enable_suexec+set}" = set; then :
- enableval=$enable_suexec;
+ enableval=$enable_suexec; force_suexec=$enableval
else
enable_suexec=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_suexec" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_suexec" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_suexec" = "static"; then
- enable_suexec=yes
+ enable_suexec=static
elif test "$enable_suexec" = "yes"; then
enable_suexec=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_suexec" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_suexec=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_suexec" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_suexec=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_suexec" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_suexec=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_suexec=no
fi
+ elif test "$enable_suexec" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_suexec" != "no" ; then
+ enable_suexec=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_suexec" != "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
@@ -16437,10 +28153,10 @@ $as_echo "checking dependencies" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_suexec" >&5
$as_echo_n "checking whether to enable mod_suexec... " >&6; }
if test "$enable_suexec" = "no"; then
- if test "$_apmod_error_fatal" = "no"; then
+ if test "$_apmod_required" = "no"; then
_apmod_extra_msg=" (disabled)"
else
- as_fn_error "mod_suexec has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ as_fn_error $? "mod_suexec has been requested but can not be built due to prerequisite failures" "$LINENO" 5
fi
fi
fi
@@ -16448,18 +28164,21 @@ $as_echo_n "checking whether to enable mod_suexec... " >&6; }
$as_echo "$enable_suexec$_apmod_extra_msg" >&6; }
if test "$enable_suexec" != "no"; then
case "$enable_suexec" in
- shared*)
- enable_suexec=`echo $enable_suexec|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES suexec"
- ;;
- *)
+ static*)
MODLIST="$MODLIST suexec"
if test "suexec" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_suexec=`echo $enable_suexec|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES suexec"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},suexec"
+ fi
+ ;;
esac
@@ -16479,6 +28198,29 @@ $as_echo "$enable_suexec$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_SUEXEC_LDADD)
EOF
+ if test ! -z "\$(MOD_SUEXEC_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SUEXEC_LDADD)\""
+ AP_LIBS="\$(MOD_SUEXEC_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SUEXEC_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_suexec.la"
@@ -16519,56 +28261,122 @@ if test $cgid_needed = "yes"; then
$as_echo_n "checking whether to enable mod_cgid... " >&6; }
# Check whether --enable-cgid was given.
if test "${enable_cgid+set}" = set; then :
- enableval=$enable_cgid;
+ enableval=$enable_cgid; force_cgid=$enableval
else
- enable_cgid=yes
+ enable_cgid=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_cgid" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_cgid" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_cgid" = "static"; then
- enable_cgid=yes
+ enable_cgid=static
elif test "$enable_cgid" = "yes"; then
enable_cgid=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cgid" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_cgid=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_cgid" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_cgid=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cgid" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_cgid=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_cgid=no
fi
+ elif test "$enable_cgid" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_cgid" != "no" ; then
+ enable_cgid=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_cgid" != "no"; then
- :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+ case $host in
+ *-solaris2*)
+ case `uname -r` in
+ 5.10)
+ case `uname -p` in
+ i386)
+ patch_id="120665"
+ ;;
+ sparc)
+ patch_id="120664"
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown platform" >&5
+$as_echo "$as_me: WARNING: Unknown platform" >&2;}
+ patch_id="120664"
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris patch $patch_id" >&5
+$as_echo_n "checking for Solaris patch $patch_id... " >&6; }
+ showrev -p | grep "$patch_id" >/dev/null 2>&1
+ if test $? -eq 1; then
+ as_fn_error $? "Please apply either patch # 120664 (Sparc) or # 120665 (x86).
+Without these patches, mod_cgid is non-functional on Solaris 10 due to an OS
+bug with AF_UNIX sockets.
+If you can not apply these patches, you can do one of the following:
+ - run configure with --disable-cgid
+ - switch to the prefork MPM
+For more info: <http://issues.apache.org/bugzilla/show_bug.cgi?id=34264>" "$LINENO" 5
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ fi
+ ;;
+ esac
+ ;;
+ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_cgid" >&5
+$as_echo_n "checking whether to enable mod_cgid... " >&6; }
+ if test "$enable_cgid" = "no"; then
+ if test "$_apmod_required" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ as_fn_error $? "mod_cgid has been requested but can not be built due to prerequisite failures" "$LINENO" 5
+ fi
+ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cgid$_apmod_extra_msg" >&5
$as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
if test "$enable_cgid" != "no"; then
case "$enable_cgid" in
- shared*)
- enable_cgid=`echo $enable_cgid|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES cgid"
- ;;
- *)
+ static*)
MODLIST="$MODLIST cgid"
if test "cgid" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_cgid=`echo $enable_cgid|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES cgid"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cgid"
+ fi
+ ;;
esac
@@ -16588,6 +28396,29 @@ $as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CGID_LDADD)
EOF
+ if test ! -z "\$(MOD_CGID_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CGID_LDADD)\""
+ AP_LIBS="\$(MOD_CGID_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CGID_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_cgid.la"
@@ -16612,36 +28443,51 @@ EOF
$as_echo_n "checking whether to enable mod_cgi... " >&6; }
# Check whether --enable-cgi was given.
if test "${enable_cgi+set}" = set; then :
- enableval=$enable_cgi;
+ enableval=$enable_cgi; force_cgi=$enableval
else
enable_cgi=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_cgi" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_cgi" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_cgi" = "static"; then
- enable_cgi=yes
+ enable_cgi=static
elif test "$enable_cgi" = "yes"; then
enable_cgi=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cgi" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_cgi=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_cgi" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_cgi=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cgi" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_cgi=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_cgi=no
fi
+ elif test "$enable_cgi" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_cgi" != "no" ; then
+ enable_cgi=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_cgi" != "no"; then
:
@@ -16650,18 +28496,21 @@ fi
$as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
if test "$enable_cgi" != "no"; then
case "$enable_cgi" in
- shared*)
- enable_cgi=`echo $enable_cgi|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES cgi"
- ;;
- *)
+ static*)
MODLIST="$MODLIST cgi"
if test "cgi" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_cgi=`echo $enable_cgi|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES cgi"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cgi"
+ fi
+ ;;
esac
@@ -16681,6 +28530,29 @@ $as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CGI_LDADD)
EOF
+ if test ! -z "\$(MOD_CGI_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CGI_LDADD)\""
+ AP_LIBS="\$(MOD_CGI_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CGI_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_cgi.la"
@@ -16706,36 +28578,51 @@ else
$as_echo_n "checking whether to enable mod_cgi... " >&6; }
# Check whether --enable-cgi was given.
if test "${enable_cgi+set}" = set; then :
- enableval=$enable_cgi;
+ enableval=$enable_cgi; force_cgi=$enableval
else
- enable_cgi=yes
+ enable_cgi=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_cgi" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_cgi" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_cgi" = "static"; then
- enable_cgi=yes
+ enable_cgi=static
elif test "$enable_cgi" = "yes"; then
enable_cgi=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cgi" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_cgi=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_cgi" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_cgi=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cgi" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_cgi=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_cgi=no
fi
+ elif test "$enable_cgi" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_cgi" != "no" ; then
+ enable_cgi=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_cgi" != "no"; then
:
@@ -16744,18 +28631,21 @@ fi
$as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
if test "$enable_cgi" != "no"; then
case "$enable_cgi" in
- shared*)
- enable_cgi=`echo $enable_cgi|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES cgi"
- ;;
- *)
+ static*)
MODLIST="$MODLIST cgi"
if test "cgi" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_cgi=`echo $enable_cgi|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES cgi"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cgi"
+ fi
+ ;;
esac
@@ -16775,6 +28665,29 @@ $as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CGI_LDADD)
EOF
+ if test ! -z "\$(MOD_CGI_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CGI_LDADD)\""
+ AP_LIBS="\$(MOD_CGI_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CGI_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_cgi.la"
@@ -16799,36 +28712,51 @@ EOF
$as_echo_n "checking whether to enable mod_cgid... " >&6; }
# Check whether --enable-cgid was given.
if test "${enable_cgid+set}" = set; then :
- enableval=$enable_cgid;
+ enableval=$enable_cgid; force_cgid=$enableval
else
enable_cgid=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_cgid" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_cgid" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_cgid" = "static"; then
- enable_cgid=yes
+ enable_cgid=static
elif test "$enable_cgid" = "yes"; then
enable_cgid=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cgid" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_cgid=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_cgid" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_cgid=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_cgid" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_cgid=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_cgid=no
fi
+ elif test "$enable_cgid" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_cgid" != "no" ; then
+ enable_cgid=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_cgid" != "no"; then
:
@@ -16837,18 +28765,21 @@ fi
$as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
if test "$enable_cgid" != "no"; then
case "$enable_cgid" in
- shared*)
- enable_cgid=`echo $enable_cgid|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES cgid"
- ;;
- *)
+ static*)
MODLIST="$MODLIST cgid"
if test "cgid" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_cgid=`echo $enable_cgid|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES cgid"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cgid"
+ fi
+ ;;
esac
@@ -16868,6 +28799,29 @@ $as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_CGID_LDADD)
EOF
+ if test ! -z "\$(MOD_CGID_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_CGID_LDADD)\""
+ AP_LIBS="\$(MOD_CGID_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_CGID_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_cgid.la"
@@ -16890,6 +28844,28 @@ EOF
fi
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
+ else
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
+ fi
+
+
+
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
@@ -16904,109 +28880,72 @@ fi
-if test "$MPM_NAME" = "beos" ; then
- apache_apr_flags="--enable-threads"
-
-
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES server/mpm/$MPM_NAME/Makefile"
-
-fi
-
-
-if test "$MPM_NAME" = "event" ; then
- for ac_func in pthread_kill
-do :
- ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill"
-if test "x$ac_cv_func_pthread_kill" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_KILL 1
-_ACEOF
-
-fi
-done
+ if ap_mpm_is_enabled mpmt_os2; then
+ if test -z "mpmt_os2.lo mpmt_os2_child.lo"; then
+ objects="mpmt_os2.lo"
+ else
+ objects="mpmt_os2.lo mpmt_os2_child.lo"
+ fi
+ if test -z ""; then
+ mpmpath="server/mpm/mpmt_os2"
+ else
+ mpmpath=
+ fi
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES server/mpm/$MPM_SUBDIR_NAME/Makefile"
+ test -d $mpmpath || $srcdir/build/mkdir.sh $mpmpath
-fi
-if test "$MPM_NAME" = "mpmt_os2" ; then
- cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $mpmpath/Makefile"
-_ACEOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
+ if test -z "$enable_mpm_mpmt_os2"; then
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\""
+ AP_LIBS=""
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ apr_addto_bugger=""
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
fi
-fi
-rm -f confcache
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES server/mpm/$MPM_NAME/Makefile"
+ libname="libmpmt_os2.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_mpmt_os2.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 mpmt_os2 = $default_mpm; then
+ DSO_MODULES="$DSO_MODULES mpm_mpmt_os2"
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_mpmt_os2"
+ fi
+ fi
if test "x$CFLAGS" = "x"; then
@@ -17029,25 +28968,9 @@ rm -f confcache
done
fi
-fi
-
-
-if test "$MPM_NAME" = "worker" ; then
- for ac_func in pthread_kill
-do :
- ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill"
-if test "x$ac_cv_func_pthread_kill" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_KILL 1
-_ACEOF
-
-fi
-done
-
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES server/mpm/$MPM_NAME/Makefile"
+ fi
-fi
@@ -17080,36 +29003,51 @@ esac
$as_echo_n "checking whether to enable mod_dav_fs... " >&6; }
# Check whether --enable-dav-fs was given.
if test "${enable_dav_fs+set}" = set; then :
- enableval=$enable_dav_fs;
+ enableval=$enable_dav_fs; force_dav_fs=$enableval
else
enable_dav_fs=$dav_fs_enable
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_dav_fs" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_dav_fs" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_dav_fs" = "static"; then
- enable_dav_fs=yes
+ enable_dav_fs=static
elif test "$enable_dav_fs" = "yes"; then
enable_dav_fs=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dav_fs" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_dav_fs=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_dav_fs" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_dav_fs=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dav_fs" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_dav_fs=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_dav_fs=no
fi
+ elif test "$enable_dav_fs" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_dav_fs" != "no" ; then
+ enable_dav_fs=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_dav_fs" != "no"; then
:
@@ -17118,18 +29056,21 @@ fi
$as_echo "$enable_dav_fs$_apmod_extra_msg" >&6; }
if test "$enable_dav_fs" != "no"; then
case "$enable_dav_fs" in
- shared*)
- enable_dav_fs=`echo $enable_dav_fs|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES dav_fs"
- ;;
- *)
+ static*)
MODLIST="$MODLIST dav_fs"
if test "dav_fs" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_dav_fs=`echo $enable_dav_fs|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES dav_fs"
+ if test "$dav_fs_enable" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dav_fs"
+ fi
+ ;;
esac
@@ -17149,6 +29090,29 @@ $as_echo "$enable_dav_fs$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_DAV_FS_LDADD)
EOF
+ if test ! -z "\$(MOD_DAV_FS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_DAV_FS_LDADD)\""
+ AP_LIBS="\$(MOD_DAV_FS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_DAV_FS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_dav_fs.la"
@@ -17208,36 +29172,51 @@ esac
$as_echo_n "checking whether to enable mod_dav_lock... " >&6; }
# Check whether --enable-dav-lock was given.
if test "${enable_dav_lock+set}" = set; then :
- enableval=$enable_dav_lock;
+ enableval=$enable_dav_lock; force_dav_lock=$enableval
else
- enable_dav_lock=no
+ enable_dav_lock=maybe-all
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_dav_lock" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_dav_lock" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_dav_lock" = "static"; then
- enable_dav_lock=yes
+ enable_dav_lock=static
elif test "$enable_dav_lock" = "yes"; then
enable_dav_lock=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dav_lock" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_dav_lock=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_dav_lock" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_dav_lock=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dav_lock" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_dav_lock=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_dav_lock=no
fi
+ elif test "$enable_dav_lock" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_dav_lock" != "no" ; then
+ enable_dav_lock=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_dav_lock" != "no"; then
:
@@ -17246,18 +29225,21 @@ fi
$as_echo "$enable_dav_lock$_apmod_extra_msg" >&6; }
if test "$enable_dav_lock" != "no"; then
case "$enable_dav_lock" in
- shared*)
- enable_dav_lock=`echo $enable_dav_lock|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES dav_lock"
- ;;
- *)
+ static*)
MODLIST="$MODLIST dav_lock"
if test "dav_lock" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_dav_lock=`echo $enable_dav_lock|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES dav_lock"
+ if test "" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dav_lock"
+ fi
+ ;;
esac
@@ -17277,6 +29259,29 @@ $as_echo "$enable_dav_lock$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_DAV_LOCK_LDADD)
EOF
+ if test ! -z "\$(MOD_DAV_LOCK_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_DAV_LOCK_LDADD)\""
+ AP_LIBS="\$(MOD_DAV_LOCK_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_DAV_LOCK_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_dav_lock.la"
@@ -17327,36 +29332,51 @@ EOF
$as_echo_n "checking whether to enable mod_vhost_alias... " >&6; }
# Check whether --enable-vhost-alias was given.
if test "${enable_vhost_alias+set}" = set; then :
- enableval=$enable_vhost_alias;
+ enableval=$enable_vhost_alias; force_vhost_alias=$enableval
else
enable_vhost_alias=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_vhost_alias" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_vhost_alias" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_vhost_alias" = "static"; then
- enable_vhost_alias=yes
+ enable_vhost_alias=static
elif test "$enable_vhost_alias" = "yes"; then
enable_vhost_alias=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_vhost_alias" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_vhost_alias=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_vhost_alias" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_vhost_alias=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_vhost_alias" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_vhost_alias=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_vhost_alias=no
fi
+ elif test "$enable_vhost_alias" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_vhost_alias" != "no" ; then
+ enable_vhost_alias=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_vhost_alias" != "no"; then
:
@@ -17365,18 +29385,21 @@ fi
$as_echo "$enable_vhost_alias$_apmod_extra_msg" >&6; }
if test "$enable_vhost_alias" != "no"; then
case "$enable_vhost_alias" in
- shared*)
- enable_vhost_alias=`echo $enable_vhost_alias|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES vhost_alias"
- ;;
- *)
+ static*)
MODLIST="$MODLIST vhost_alias"
if test "vhost_alias" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_vhost_alias=`echo $enable_vhost_alias|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES vhost_alias"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},vhost_alias"
+ fi
+ ;;
esac
@@ -17396,6 +29419,29 @@ $as_echo "$enable_vhost_alias$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_VHOST_ALIAS_LDADD)
EOF
+ if test ! -z "\$(MOD_VHOST_ALIAS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_VHOST_ALIAS_LDADD)\""
+ AP_LIBS="\$(MOD_VHOST_ALIAS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_VHOST_ALIAS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_vhost_alias.la"
@@ -17420,36 +29466,51 @@ EOF
$as_echo_n "checking whether to enable mod_negotiation... " >&6; }
# Check whether --enable-negotiation was given.
if test "${enable_negotiation+set}" = set; then :
- enableval=$enable_negotiation;
+ enableval=$enable_negotiation; force_negotiation=$enableval
else
- enable_negotiation=yes
+ enable_negotiation=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_negotiation" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_negotiation" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_negotiation" = "static"; then
- enable_negotiation=yes
+ enable_negotiation=static
elif test "$enable_negotiation" = "yes"; then
enable_negotiation=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_negotiation" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_negotiation=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_negotiation" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_negotiation=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_negotiation" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_negotiation=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_negotiation=no
fi
+ elif test "$enable_negotiation" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_negotiation" != "no" ; then
+ enable_negotiation=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_negotiation" != "no"; then
:
@@ -17458,18 +29519,21 @@ fi
$as_echo "$enable_negotiation$_apmod_extra_msg" >&6; }
if test "$enable_negotiation" != "no"; then
case "$enable_negotiation" in
- shared*)
- enable_negotiation=`echo $enable_negotiation|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES negotiation"
- ;;
- *)
+ static*)
MODLIST="$MODLIST negotiation"
if test "negotiation" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_negotiation=`echo $enable_negotiation|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES negotiation"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},negotiation"
+ fi
+ ;;
esac
@@ -17489,6 +29553,29 @@ $as_echo "$enable_negotiation$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_NEGOTIATION_LDADD)
EOF
+ if test ! -z "\$(MOD_NEGOTIATION_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_NEGOTIATION_LDADD)\""
+ AP_LIBS="\$(MOD_NEGOTIATION_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_NEGOTIATION_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_negotiation.la"
@@ -17513,36 +29600,51 @@ EOF
$as_echo_n "checking whether to enable mod_dir... " >&6; }
# Check whether --enable-dir was given.
if test "${enable_dir+set}" = set; then :
- enableval=$enable_dir;
+ enableval=$enable_dir; force_dir=$enableval
else
enable_dir=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_dir" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_dir" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_dir" = "static"; then
- enable_dir=yes
+ enable_dir=static
elif test "$enable_dir" = "yes"; then
enable_dir=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dir" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_dir=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_dir" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_dir=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_dir" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_dir=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_dir=no
fi
+ elif test "$enable_dir" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_dir" != "no" ; then
+ enable_dir=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_dir" != "no"; then
:
@@ -17551,18 +29653,21 @@ fi
$as_echo "$enable_dir$_apmod_extra_msg" >&6; }
if test "$enable_dir" != "no"; then
case "$enable_dir" in
- shared*)
- enable_dir=`echo $enable_dir|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES dir"
- ;;
- *)
+ static*)
MODLIST="$MODLIST dir"
if test "dir" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_dir=`echo $enable_dir|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES dir"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dir"
+ fi
+ ;;
esac
@@ -17582,6 +29687,29 @@ $as_echo "$enable_dir$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_DIR_LDADD)
EOF
+ if test ! -z "\$(MOD_DIR_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_DIR_LDADD)\""
+ AP_LIBS="\$(MOD_DIR_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_DIR_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_dir.la"
@@ -17606,36 +29734,51 @@ EOF
$as_echo_n "checking whether to enable mod_imagemap... " >&6; }
# Check whether --enable-imagemap was given.
if test "${enable_imagemap+set}" = set; then :
- enableval=$enable_imagemap;
+ enableval=$enable_imagemap; force_imagemap=$enableval
else
- enable_imagemap=most
+ enable_imagemap=no
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_imagemap" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_imagemap" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_imagemap" = "static"; then
- enable_imagemap=yes
+ enable_imagemap=static
elif test "$enable_imagemap" = "yes"; then
enable_imagemap=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_imagemap" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_imagemap=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_imagemap" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_imagemap=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_imagemap" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_imagemap=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_imagemap=no
fi
+ elif test "$enable_imagemap" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_imagemap" != "no" ; then
+ enable_imagemap=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_imagemap" != "no"; then
:
@@ -17644,18 +29787,21 @@ fi
$as_echo "$enable_imagemap$_apmod_extra_msg" >&6; }
if test "$enable_imagemap" != "no"; then
case "$enable_imagemap" in
- shared*)
- enable_imagemap=`echo $enable_imagemap|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES imagemap"
- ;;
- *)
+ static*)
MODLIST="$MODLIST imagemap"
if test "imagemap" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_imagemap=`echo $enable_imagemap|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES imagemap"
+ if test "no" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},imagemap"
+ fi
+ ;;
esac
@@ -17675,6 +29821,29 @@ $as_echo "$enable_imagemap$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_IMAGEMAP_LDADD)
EOF
+ if test ! -z "\$(MOD_IMAGEMAP_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_IMAGEMAP_LDADD)\""
+ AP_LIBS="\$(MOD_IMAGEMAP_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_IMAGEMAP_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_imagemap.la"
@@ -17699,36 +29868,51 @@ EOF
$as_echo_n "checking whether to enable mod_actions... " >&6; }
# Check whether --enable-actions was given.
if test "${enable_actions+set}" = set; then :
- enableval=$enable_actions;
+ enableval=$enable_actions; force_actions=$enableval
else
- enable_actions=yes
+ enable_actions=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_actions" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_actions" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_actions" = "static"; then
- enable_actions=yes
+ enable_actions=static
elif test "$enable_actions" = "yes"; then
enable_actions=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_actions" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_actions=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_actions" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_actions=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_actions" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_actions=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_actions=no
fi
+ elif test "$enable_actions" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_actions" != "no" ; then
+ enable_actions=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_actions" != "no"; then
:
@@ -17737,18 +29921,21 @@ fi
$as_echo "$enable_actions$_apmod_extra_msg" >&6; }
if test "$enable_actions" != "no"; then
case "$enable_actions" in
- shared*)
- enable_actions=`echo $enable_actions|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES actions"
- ;;
- *)
+ static*)
MODLIST="$MODLIST actions"
if test "actions" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_actions=`echo $enable_actions|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES actions"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},actions"
+ fi
+ ;;
esac
@@ -17768,6 +29955,29 @@ $as_echo "$enable_actions$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_ACTIONS_LDADD)
EOF
+ if test ! -z "\$(MOD_ACTIONS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_ACTIONS_LDADD)\""
+ AP_LIBS="\$(MOD_ACTIONS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_ACTIONS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_actions.la"
@@ -17792,36 +30002,51 @@ EOF
$as_echo_n "checking whether to enable mod_speling... " >&6; }
# Check whether --enable-speling was given.
if test "${enable_speling+set}" = set; then :
- enableval=$enable_speling;
+ enableval=$enable_speling; force_speling=$enableval
else
enable_speling=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_speling" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_speling" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_speling" = "static"; then
- enable_speling=yes
+ enable_speling=static
elif test "$enable_speling" = "yes"; then
enable_speling=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_speling" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_speling=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_speling" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_speling=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_speling" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_speling=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_speling=no
fi
+ elif test "$enable_speling" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_speling" != "no" ; then
+ enable_speling=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_speling" != "no"; then
:
@@ -17830,18 +30055,21 @@ fi
$as_echo "$enable_speling$_apmod_extra_msg" >&6; }
if test "$enable_speling" != "no"; then
case "$enable_speling" in
- shared*)
- enable_speling=`echo $enable_speling|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES speling"
- ;;
- *)
+ static*)
MODLIST="$MODLIST speling"
if test "speling" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_speling=`echo $enable_speling|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES speling"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},speling"
+ fi
+ ;;
esac
@@ -17861,6 +30089,29 @@ $as_echo "$enable_speling$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_SPELING_LDADD)
EOF
+ if test ! -z "\$(MOD_SPELING_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_SPELING_LDADD)\""
+ AP_LIBS="\$(MOD_SPELING_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_SPELING_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_speling.la"
@@ -17885,36 +30136,51 @@ EOF
$as_echo_n "checking whether to enable mod_userdir... " >&6; }
# Check whether --enable-userdir was given.
if test "${enable_userdir+set}" = set; then :
- enableval=$enable_userdir;
+ enableval=$enable_userdir; force_userdir=$enableval
else
- enable_userdir=yes
+ enable_userdir=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_userdir" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_userdir" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_userdir" = "static"; then
- enable_userdir=yes
+ enable_userdir=static
elif test "$enable_userdir" = "yes"; then
enable_userdir=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_userdir" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_userdir=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_userdir" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_userdir=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_userdir" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_userdir=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_userdir=no
fi
+ elif test "$enable_userdir" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_userdir" != "no" ; then
+ enable_userdir=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_userdir" != "no"; then
:
@@ -17923,18 +30189,21 @@ fi
$as_echo "$enable_userdir$_apmod_extra_msg" >&6; }
if test "$enable_userdir" != "no"; then
case "$enable_userdir" in
- shared*)
- enable_userdir=`echo $enable_userdir|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES userdir"
- ;;
- *)
+ static*)
MODLIST="$MODLIST userdir"
if test "userdir" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_userdir=`echo $enable_userdir|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES userdir"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},userdir"
+ fi
+ ;;
esac
@@ -17954,6 +30223,29 @@ $as_echo "$enable_userdir$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_USERDIR_LDADD)
EOF
+ if test ! -z "\$(MOD_USERDIR_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_USERDIR_LDADD)\""
+ AP_LIBS="\$(MOD_USERDIR_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_USERDIR_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_userdir.la"
@@ -17978,36 +30270,51 @@ EOF
$as_echo_n "checking whether to enable mod_alias... " >&6; }
# Check whether --enable-alias was given.
if test "${enable_alias+set}" = set; then :
- enableval=$enable_alias;
+ enableval=$enable_alias; force_alias=$enableval
else
enable_alias=yes
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_alias" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_alias" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_alias" = "static"; then
- enable_alias=yes
+ enable_alias=static
elif test "$enable_alias" = "yes"; then
enable_alias=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_alias" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_alias=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_alias" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_alias=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_alias" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_alias=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_alias=no
fi
+ elif test "$enable_alias" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_alias" != "no" ; then
+ enable_alias=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_alias" != "no"; then
:
@@ -18016,18 +30323,21 @@ fi
$as_echo "$enable_alias$_apmod_extra_msg" >&6; }
if test "$enable_alias" != "no"; then
case "$enable_alias" in
- shared*)
- enable_alias=`echo $enable_alias|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES alias"
- ;;
- *)
+ static*)
MODLIST="$MODLIST alias"
if test "alias" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_alias=`echo $enable_alias|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES alias"
+ if test "yes" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},alias"
+ fi
+ ;;
esac
@@ -18047,6 +30357,29 @@ $as_echo "$enable_alias$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_ALIAS_LDADD)
EOF
+ if test ! -z "\$(MOD_ALIAS_LDADD)"; then
+
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_ALIAS_LDADD)\""
+ AP_LIBS="\$(MOD_ALIAS_LDADD)"
+ else
+ apr_addto_bugger="\$(MOD_ALIAS_LDADD)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $AP_LIBS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
+ fi
+ done
+ fi
+
+ fi
else
apache_need_shared=yes
libname="mod_alias.la"
@@ -18067,41 +30400,55 @@ EOF
fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_rewrite" >&5
$as_echo_n "checking whether to enable mod_rewrite... " >&6; }
# Check whether --enable-rewrite was given.
if test "${enable_rewrite+set}" = set; then :
- enableval=$enable_rewrite;
+ enableval=$enable_rewrite; force_rewrite=$enableval
else
enable_rewrite=most
fi
_apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_rewrite" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
+ case "$enable_rewrite" in
+ yes|static|shared)
+ _apmod_required="yes"
+ ;;
+ *)
+ case "$module_selection" in
+ reallyall|all|most)
+ _apmod_required="no"
+ ;;
+ *)
+ _apmod_required="yes"
+ ;;
+ esac
+ esac
if test "$enable_rewrite" = "static"; then
- enable_rewrite=yes
+ enable_rewrite=static
elif test "$enable_rewrite" = "yes"; then
enable_rewrite=$module_default
- _apmod_extra_msg=" ($module_selection)"
elif test "$enable_rewrite" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
+ if test "$module_selection" = "most" -o "$module_selection" = "all" -o \
+ "$module_selection" = "reallyall"
+ then
enable_rewrite=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_rewrite" != "yes"; then
+ elif test "$module_selection" = "few" -o "$module_selection" = "none"; then
enable_rewrite=no
fi
+ _apmod_extra_msg=" ($module_selection)"
elif test "$enable_rewrite" = "maybe-all"; then
- if test "$module_selection" = "all"; then
+ if test "$module_selection" = "all" -o "$module_selection" = "reallyall"
+ then
enable_rewrite=$module_default
- _apmod_extra_msg=" (all)"
+ _apmod_extra_msg=" ($module_selection)"
else
enable_rewrite=no
fi
+ elif test "$enable_rewrite" = "no" -a "$module_selection" = "reallyall" -a \
+ "$force_rewrite" != "no" ; then
+ enable_rewrite=$module_default
+ _apmod_extra_msg=" ($module_selection)"
fi
if test "$enable_rewrite" != "no"; then
:
@@ -18110,18 +30457,21 @@ fi
$as_echo "$enable_rewrite$_apmod_extra_msg" >&6; }
if test "$enable_rewrite" != "no"; then
case "$enable_rewrite" in
- shared*)
- enable_rewrite=`echo $enable_rewrite|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES rewrite"
- ;;
- *)
+ static*)
MODLIST="$MODLIST rewrite"
if test "rewrite" = "so"; then
sharedobjs=yes
fi
shared="";;
+ *)
+ enable_rewrite=`echo $enable_rewrite|sed 's/shared,*//'`
+ sharedobjs=yes
+ shared=yes
+ DSO_MODULES="$DSO_MODULES rewrite"
+ if test "most" = "yes" ; then
+ ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},rewrite"
+ fi
+ ;;
esac
@@ -18141,277 +30491,70 @@ $as_echo "$enable_rewrite$_apmod_extra_msg" >&6; }
$libname: $objects
\$(MOD_LINK) $objects \$(MOD_REWRITE_LDADD)
EOF
- else
- apache_need_shared=yes
- libname="mod_rewrite.la"
- shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
- modpath_shared="$modpath_shared $libname"
- cat >>$modpath_current/modules.mk<<EOF
-$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_REWRITE_LDADD)
-EOF
- fi
- fi
-
-
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_REWRITE_LDADD"
-
-
-
- fi
-
-
-
-
-apr_old_cppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $INCLUDES"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <apr.h>
-#if APR_HAS_DSO
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
- ac_cv_define_APR_HAS_DSO=yes
-else
- ac_cv_define_APR_HAS_DSO=no
-fi
-rm -f conftest*
-
-CPPFLAGS=$apr_old_cppflags
-
-
-case "x$enable_so" in
- "xyes")
- if test $ac_cv_define_APR_HAS_DSO = "no"; then
- as_fn_error "mod_so has been requested but cannot be built on your system" "$LINENO" 5
- fi
- ;;
- "xshared")
- as_fn_error "mod_so can not be built as a shared DSO" "$LINENO" 5
- ;;
- "xno")
- ;;
- "x")
- enable_so=$ac_cv_define_APR_HAS_DSO
- ;;
-esac
-
-if test "x$enable_so" = "xyes"; then
- enable_so="static"
-fi
+ if test ! -z "\$(MOD_REWRITE_LDADD)"; then
-if test "x$enable_so" = "xstatic"; then
-
- if test "x$HTTPD_LDFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting HTTPD_LDFLAGS to \"-export-dynamic\""
- HTTPD_LDFLAGS="-export-dynamic"
+ if test "x$AP_LIBS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting AP_LIBS to \"\$(MOD_REWRITE_LDADD)\""
+ AP_LIBS="\$(MOD_REWRITE_LDADD)"
else
- apr_addto_bugger="-export-dynamic"
+ apr_addto_bugger="\$(MOD_REWRITE_LDADD)"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
- for j in $HTTPD_LDFLAGS; do
+ for j in $AP_LIBS; do
if test "x$i" = "x$j"; then
apr_addto_duplicate="1"
break
fi
done
if test $apr_addto_duplicate = "0"; then
- test "x$silent" != "xyes" && echo " adding \"$i\" to HTTPD_LDFLAGS"
- HTTPD_LDFLAGS="$HTTPD_LDFLAGS $i"
+ test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS"
+ AP_LIBS="$AP_LIBS $i"
fi
done
fi
- INSTALL_DSO=yes
-else
- INSTALL_DSO=no
-fi
-
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST INSTALL_DSO"
-
-
-
-if test "$sharedobjs" = "yes"; then
- if test $ac_cv_define_APR_HAS_DSO = "no"; then
- as_fn_error "shared objects have been requested but cannot be built since mod_so cannot be built" "$LINENO" 5
- elif test $enable_so = "no"; then
- as_fn_error "shared objects have been requested but cannot be built since mod_so was disabled" "$LINENO" 5
- fi
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_so" >&5
-$as_echo_n "checking whether to enable mod_so... " >&6; }
- # Check whether --enable-so was given.
-if test "${enable_so+set}" = set; then :
- enableval=$enable_so;
-else
- enable_so=$enable_so
-fi
-
- _apmod_extra_msg=""
- if test "$module_selection" = "most" -a "$enable_so" = "most"; then
- _apmod_error_fatal="no"
- else
- _apmod_error_fatal="yes"
- fi
- if test "$enable_so" = "static"; then
- enable_so=yes
- elif test "$enable_so" = "yes"; then
- enable_so=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_so" = "most"; then
- if test "$module_selection" = "most" -o "$module_selection" = "all"; then
- enable_so=$module_default
- _apmod_extra_msg=" ($module_selection)"
- elif test "$enable_so" != "yes"; then
- enable_so=no
- fi
- elif test "$enable_so" = "maybe-all"; then
- if test "$module_selection" = "all"; then
- enable_so=$module_default
- _apmod_extra_msg=" (all)"
- else
- enable_so=no
- fi
- fi
- if test "$enable_so" != "no"; then
- :
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_so$_apmod_extra_msg" >&5
-$as_echo "$enable_so$_apmod_extra_msg" >&6; }
- if test "$enable_so" != "no"; then
- case "$enable_so" in
- shared*)
- enable_so=`echo $enable_so|sed 's/shared,*//'`
- sharedobjs=yes
- shared=yes
- DSO_MODULES="$DSO_MODULES so"
- ;;
- *)
- MODLIST="$MODLIST so"
- if test "so" = "so"; then
- sharedobjs=yes
fi
- shared="";;
- esac
-
-
- if test -z ""; then
- objects="mod_so.lo"
- else
- objects=""
- fi
-
- if test -z "$module_standalone"; then
- if test -z "$shared"; then
- # The filename of a convenience library must have a "lib" prefix:
- libname="libmod_so.la"
- BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
- modpath_static="$modpath_static $libname"
- cat >>$modpath_current/modules.mk<<EOF
-$libname: $objects
- \$(MOD_LINK) $objects \$(MOD_SO_LDADD)
-EOF
else
apache_need_shared=yes
- libname="mod_so.la"
+ libname="mod_rewrite.la"
shobjects=`echo $objects | sed 's/\.lo/.slo/g'`
modpath_shared="$modpath_shared $libname"
cat >>$modpath_current/modules.mk<<EOF
$libname: $shobjects
- \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_SO_LDADD)
+ \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects \$(MOD_REWRITE_LDADD)
EOF
fi
fi
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SO_LDADD"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_REWRITE_LDADD"
fi
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
- esac ;;
- esac
- done
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test "x$INCLUDES" = "x"; then
+ test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\""
+ INCLUDES="-I\$(top_srcdir)/$modpath_current"
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ apr_addto_bugger="-I\$(top_srcdir)/$modpath_current"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $INCLUDES; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES"
+ INCLUDES="$INCLUDES $i"
+ fi
+ done
fi
-fi
-rm -f confcache
+
echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
@@ -18434,10 +30577,6 @@ rm -f confcache
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST MPM_LIB"
-
-
-
APACHE_VAR_SUBST="$APACHE_VAR_SUBST OS"
@@ -18470,25 +30609,122 @@ if test "$apache_need_shared" = "yes"; then
fi
-if test "$enable_so" = "yes"; then
+if test "$enable_so" = "yes" -o "$enable_so" = "static"; then
case $host in
*-ibm-aix*)
- HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp"
- SH_LDFLAGS="$SH_LDFLAGS \$(EXTRA_LDFLAGS) \$(EXTRA_LIBS)"
- UTIL_LDFLAGS="$UTIL_LDFLAGS -Wl,-uXML_Parse"
- ;;
- *beos)
- SH_LDFLAGS='$(top_builddir)/_APP_'
- PRE_SHARED_CMDS='ln -s $(top_builddir)/httpd $(top_builddir)/_APP_'
- POST_SHARED_CMDS='rm $(top_builddir)/_APP_'
+
+ if test "x$HTTPD_LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting HTTPD_LDFLAGS to \"-Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp\""
+ HTTPD_LDFLAGS="-Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp"
+ else
+ apr_addto_bugger="-Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $HTTPD_LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to HTTPD_LDFLAGS"
+ HTTPD_LDFLAGS="$HTTPD_LDFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$SH_LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting SH_LDFLAGS to \"\$(EXTRA_LDFLAGS) \$(EXTRA_LIBS)\""
+ SH_LDFLAGS="\$(EXTRA_LDFLAGS) \$(EXTRA_LIBS)"
+ else
+ apr_addto_bugger="\$(EXTRA_LDFLAGS) \$(EXTRA_LIBS)"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $SH_LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to SH_LDFLAGS"
+ SH_LDFLAGS="$SH_LDFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$UTIL_LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting UTIL_LDFLAGS to \"-Wl,-uXML_Parse\""
+ UTIL_LDFLAGS="-Wl,-uXML_Parse"
+ else
+ apr_addto_bugger="-Wl,-uXML_Parse"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $UTIL_LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to UTIL_LDFLAGS"
+ UTIL_LDFLAGS="$UTIL_LDFLAGS $i"
+ fi
+ done
+ fi
+
;;
*os390)
- HTTPD_LDFLAGS="$HTTPD_LDFLAGS --main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll"
- SH_LDFLAGS="$SH_LDFLAGS --core-dll=$abs_srcdir/apachecore.dll"
+
+ if test "x$HTTPD_LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting HTTPD_LDFLAGS to \"--main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll\""
+ HTTPD_LDFLAGS="--main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll"
+ else
+ apr_addto_bugger="--main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $HTTPD_LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to HTTPD_LDFLAGS"
+ HTTPD_LDFLAGS="$HTTPD_LDFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$SH_LDFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting SH_LDFLAGS to \"--core-dll=$abs_srcdir/apachecore.dll\""
+ SH_LDFLAGS="--core-dll=$abs_srcdir/apachecore.dll"
+ else
+ apr_addto_bugger="--core-dll=$abs_srcdir/apachecore.dll"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $SH_LDFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to SH_LDFLAGS"
+ SH_LDFLAGS="$SH_LDFLAGS $i"
+ fi
+ done
+ fi
+
esac
+ MOD_SO_ENABLED=yes
fi
+
APACHE_VAR_SUBST="$APACHE_VAR_SUBST PRE_SHARED_CMDS"
@@ -18622,9 +30858,10 @@ _ACEOF
fi
-apulinklibs="`$apu_config --avoid-ldap --link-libtool --libs`" \
- || apulinklibs="`$apu_config --link-libtool --libs`"
-AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool --libs`"
+if test x${apu_found} != xobsolete; then
+ AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool --libs`"
+fi
+AP_LIBS="$AP_LIBS `$apr_config --link-libtool --libs`"
APACHE_VAR_SUBST="$APACHE_VAR_SUBST AP_LIBS"
@@ -18655,13 +30892,64 @@ $as_echo "#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1" >>confdefs.h
fi
+apr_old_cppflags=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $INCLUDES"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <apr.h>
+#if APR_HAVE_IPV6
+YES_IS_DEFINED
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then :
+ ac_cv_define_APR_HAVE_IPV6=yes
+else
+ ac_cv_define_APR_HAVE_IPV6=no
+fi
+rm -f conftest*
+
+CPPFLAGS=$apr_old_cppflags
+
+
+# Check whether --enable-v4-mapped was given.
+if test "${enable_v4_mapped+set}" = set; then :
+ enableval=$enable_v4_mapped;
+ v4mapped=$enableval
+
+else
+
+ case $host in
+ *freebsd5*|*netbsd*|*openbsd*)
+ v4mapped=no
+ ;;
+ *)
+ v4mapped=yes
+ ;;
+ esac
+ if ap_mpm_is_enabled winnt; then
+ v4mapped=no
+ fi
+
+fi
+
+
+if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
+
+$as_echo "#define AP_ENABLE_V4_MAPPED 1" >>confdefs.h
+
+fi
+
+
APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES Makefile modules/Makefile srclib/Makefile"
APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES os/Makefile server/Makefile"
- APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES support/Makefile srclib/pcre/Makefile"
+ APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES support/Makefile"
if test -d ./test; then
@@ -18985,6 +31273,10 @@ echo $ac_n "${nl}Construct makefiles and header files...${nl}"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST INTERNAL_CPPFLAGS"
+
+
+
APACHE_VAR_SUBST="$APACHE_VAR_SUBST LIBTOOL"
@@ -19013,14 +31305,6 @@ echo $ac_n "${nl}Construct makefiles and header files...${nl}"
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST nonssl_listen_stmt_1"
-
-
-
- APACHE_VAR_SUBST="$APACHE_VAR_SUBST nonssl_listen_stmt_2"
-
-
-
APACHE_VAR_SUBST="$APACHE_VAR_SUBST CORE_IMPLIB_FILE"
@@ -19053,6 +31337,14 @@ echo $ac_n "${nl}Construct makefiles and header files...${nl}"
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST ENABLED_DSO_MODULES"
+
+
+
+ APACHE_VAR_SUBST="$APACHE_VAR_SUBST LOAD_ALL_MODULES"
+
+
+
APACHE_VAR_SUBST="$APACHE_VAR_SUBST APR_BINDIR"
@@ -19124,11 +31416,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-cat >>confdefs.h <<_ACEOF
-#define APACHE_MPM_DIR "$MPM_DIR"
-_ACEOF
-
-
perlbin=`$ac_aux_dir/PrintPath perl`
if test "x$perlbin" = "x"; then
perlbin="/replace/with/path/to/perl/interpreter"
@@ -19159,7 +31446,7 @@ test -d docs/conf||$mkdir_p docs/conf
HTTPD_VERSION=`$abs_srcdir/build/get-version.sh all $abs_srcdir/include/ap_release.h AP_SERVER`
-ac_config_files="$ac_config_files $APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh"
+ac_config_files="$ac_config_files $APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf docs/conf/extra/proxy-html.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh"
ac_config_commands="$ac_config_commands default"
@@ -19227,10 +31514,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -19246,6 +31544,7 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -19261,7 +31560,7 @@ LTLIBOBJS=$ac_ltlibobjs
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -19362,6 +31661,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -19407,19 +31707,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -19615,7 +31915,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -19669,7 +31969,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -19709,6 +32009,7 @@ Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -19731,12 +32032,13 @@ Report bugs to the package provider."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -19752,11 +32054,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -19770,12 +32077,15 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -19788,7 +32098,7 @@ do
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error "ambiguous option: \`$1'
+ as_fn_error $? "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -19797,7 +32107,7 @@ Try \`$0 --help' for more information.";;
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error "unrecognized option: \`$1'
+ -*) as_fn_error $? "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -19869,6 +32179,7 @@ do
"docs/conf/extra/httpd-ssl.conf") CONFIG_FILES="$CONFIG_FILES docs/conf/extra/httpd-ssl.conf" ;;
"docs/conf/extra/httpd-userdir.conf") CONFIG_FILES="$CONFIG_FILES docs/conf/extra/httpd-userdir.conf" ;;
"docs/conf/extra/httpd-vhosts.conf") CONFIG_FILES="$CONFIG_FILES docs/conf/extra/httpd-vhosts.conf" ;;
+ "docs/conf/extra/proxy-html.conf") CONFIG_FILES="$CONFIG_FILES docs/conf/extra/proxy-html.conf" ;;
"include/ap_config_layout.h") CONFIG_FILES="$CONFIG_FILES include/ap_config_layout.h" ;;
"support/apxs") CONFIG_FILES="$CONFIG_FILES support/apxs" ;;
"support/apachectl") CONFIG_FILES="$CONFIG_FILES support/apachectl" ;;
@@ -19883,7 +32194,7 @@ do
"build/config_vars.sh") CONFIG_FILES="$CONFIG_FILES build/config_vars.sh" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -19906,9 +32217,10 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -19916,12 +32228,13 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -19938,12 +32251,12 @@ if test "x$ac_cr" = x; then
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\r'
+ ac_cs_awk_cr='\\r'
else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
@@ -19952,18 +32265,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -19971,7 +32284,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -19985,7 +32298,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -19999,7 +32312,7 @@ s/.\{148\}//
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -20019,7 +32332,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -20051,21 +32364,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -20077,7 +32398,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -20089,11 +32410,11 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -20178,7 +32499,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -20191,7 +32512,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -20210,7 +32531,7 @@ do
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -20219,7 +32540,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -20245,8 +32566,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -20371,23 +32692,24 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
+which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
+which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
esac \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -20396,21 +32718,21 @@ which seems to be undefined. Please make sure it is defined." >&2;}
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ mv "$ac_tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error "could not create -" "$LINENO" 5
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
fi
;;
@@ -20432,7 +32754,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -20453,30 +32775,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit $?
+ $ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-
-case $MPM_SUBDIR_NAME in
-*experimental*)
- echo ""
- echo ""
- echo "============================================================"
- echo " WARNING: THE '${APACHE_MPM}' MPM IS EXPERIMENTAL"
- echo "============================================================"
- echo " The selected MPM might not be fully functional!"
- echo ""
- echo " Development of this MPM is not complete. Do not use this"
- echo " MPM unless you are a programmer willing to help fix it."
- echo ""
- echo " If you are looking for a stable server, you should not use"
- echo " the '${APACHE_MPM}' MPM until it is moved out of experimental."
- echo "============================================================"
- echo ""
- echo ""
- ;;
-esac
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 05:46:25 +0000