Fix a bug that would cause SERVER_CONFIG_FILE to be an absolute path,

which would prevent the relocation of an httpd binary without having to
specify the -f flag.

Now it will be relative to the $prefix if $sysconfdir shares a common prefix,
or it will remain relative to $sysconfdir.

Submitted by:	Thom May <thom@planetarytramp.net>, Aaron Bannert

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93798 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index 8a74ec29463606e19affbfac222eaf0298eadd53..9b0681cc9a9cf369f742d15b9c6790ba05446564 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -444,7 +444,8 @@ APR_EXPAND_VAR(ap_prefix, $prefix)
 AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_prefix}",
        [Root directory of the Apache install area])
 APR_EXPAND_VAR(ap_sysconfdir, $sysconfdir)
-AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${ap_sysconfdir}/${progname}.conf",
+APR_PATH_RELATIVE(rel_sysconfdir, $ap_sysconfdir, $prefix)
+AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_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])