Fix apxs to allow "apxs -q installbuilddir" and to allow

querying certain other variables from config_vars.mk.

PR:    9316

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

diff --git a/CHANGES b/CHANGES
index d659114a77e41477e855ef8fc916b150a574d1ce..f7c275ef273221051d7f2b3fd469363fb16c9183 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.37
 
+  *) Fix apxs to allow "apxs -q installbuilddir" and to allow
+     querying certain other variables from config_vars.mk.  PR 9316  
+     [Jeff Trawick]
+
   *) Added the "detached" attribute to the cgi_exec_info_t internals
      so that Win32 and Netware won't create a new window or console
      for each CGI invoked.  PR 8387

diff --git a/support/apxs.in b/support/apxs.in
index f6f1e38f8461a835f06352692bb465a4f5623d57..299e2ff82dc06ebf302ab7f4f952edafffc9389e 100644 (file)
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -71,6 +71,8 @@ get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
 my $prefix         = get_vars("prefix");
 my $CFG_PREFIX     = $prefix;
 my $exec_prefix    = get_vars("exec_prefix");
+my $datadir        = get_vars("datadir");
+my $localstatedir  = get_vars("localstatedir");
 my $CFG_TARGET     = get_vars("progname");
 my $CFG_SYSCONFDIR = get_vars("sysconfdir");
 my $CFG_CFLAGS     = join ' ', map { get_vars($_) }