www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

No longer assume SERVER_CONFIG_FILE is in the "conf" directory. Instead

Browse Source 
look for it in the $sysconfdir.

This required the use of a new m4 function from APR that retrieves
the fully "expanded", or recursively interpolated, value of the
$sysconfdir variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93622 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Bannert
2002-02-28 02:56:15 +00:00
parent bd335310d5
commit e45b18e4c6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@@ -443,9 +443,11 @@ dnl ## Build modules.c
rm -f modules.c
echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
AC_DEFINE_UNQUOTED(HTTPD_ROOT, "$prefix",
APR_EXPAND_VAR(ap_prefix, $prefix)
AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_prefix}",
[Root directory of the Apache install area])
AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "conf/$progname.conf",
APR_EXPAND_VAR(ap_sysconfdir, $sysconfdir)
AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${ap_sysconfdir}/${progname}.conf",
[Location of the config file, relative to the Apache root directory])
AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
[Location of the source for the current MPM])