Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit8804b55

Browse files
author
Felipe Zimmerle
committed
test: Makes regression test mac friendly
Apache configuration was updated and the configure script is usingan alternative way to discovery the libexecdir.
1 parent8314791 commit8804b55

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

‎configure.ac‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ VERSION_OK
618618
APXS_PROGNAME="`$APXS -q PROGNAME`"
619619
if test "$verbose_output" -eq 1; thenAC_MSG_NOTICE(apxsPROGNAME:$APXS_PROGNAME); fi
620620
APXS_LIBEXECDIR="`$APXS -q LIBEXECDIR`"
621+
if test "xx$APXS_LIBEXECDIR" = "xx"; then APXS_LIBEXECDIR="`$APXS -q LIBDIR`/modules"; fi
621622
if test "$verbose_output" -eq 1; thenAC_MSG_NOTICE(apxsLIBEXECDIR:$APXS_LIBEXECDIR); fi
622623
APXS_MODULES=$APXS_LIBEXECDIR
623624
if test "$verbose_output" -eq 1; thenAC_MSG_NOTICE(apxsMODULES:$APXS_MODULES); fi

‎tests/regression/server_root/conf/httpd.conf.in‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,20 @@ LoadModule unique_id_module @APXS_LIBEXECDIR@/mod_unique_id.so
66
# TODO: Need to have these configurable
77
LoadModule security2_module @MSC_BASE_DIR@/apache2/.libs/mod_security2.so
88

9+
<IfModule !mod_version.c>
10+
LoadModule version_module @APXS_LIBEXECDIR@/mod_version.so
11+
</IfModule>
12+
913
<IfVersion >= 2.4>
10-
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
11-
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
12-
LoadModule authn_core_module /usr/lib/apache2/modules/mod_authn_core.so
13-
LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
14+
<IfModule !mod_unixd.c>
15+
LoadModule unixd_module @APXS_LIBEXECDIR@/mod_unixd.so
16+
</IfModule>
17+
<IfModule !mpm_worker_module>
18+
LoadModule mpm_worker_module @APXS_LIBEXECDIR@/mod_mpm_worker.so
19+
</IfModule>
20+
LoadModule access_compat_module @APXS_LIBEXECDIR@/mod_access_compat.so
21+
LoadModule authn_core_module @APXS_LIBEXECDIR@/mod_authn_core.so
22+
LoadModule authz_core_module @APXS_LIBEXECDIR@/mod_authz_core.so
1423
</IfVersion>
1524

1625
ServerName localhost

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp