From: Aaron Bannert <aaron@apache.org>
Date: Thu, 28 Feb 2002 02:56:15 +0000 (+0000)
Subject: No longer assume SERVER_CONFIG_FILE is in the "conf" directory. Instead
X-Git-Tag: 2.0.33~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e45b18e4c6e9dd79d9b4647738ac5257d5ef0771;p=thirdparty%2Fapache%2Fhttpd.git

No longer assume SERVER_CONFIG_FILE is in the "conf" directory. Instead
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
---

diff --git a/configure.in b/configure.in
index 08819da8db8..1f2a4619c22 100644
--- a/configure.in
+++ b/configure.in
@@ -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])