From 0b69ede0a9e48df859553613f0a039acf9a24f79 Mon Sep 17 00:00:00 2001
From: Jim Jagielski <jim@apache.org>
Date: Sat, 5 Sep 2015 17:02:03 +0000
Subject: [PATCH] Merge r1693919 from trunk:

Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q

PR58202.

Submitted By: Daniel Shahaf
Committed By: covener



Submitted by: covener
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701408 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES      | 3 +++
 STATUS       | 5 -----
 acinclude.m4 | 2 ++
 configure.in | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0b42d8ce41..c3b04943f4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.17
 
+  *) apxs: Add HTTPD_VERSION and HTTPD_MMN to the variables available with 
+     apxs -q. PR58202. [Daniel Shahaf <danielsh apache.org>]
+
   *) mod_authz_dbd: Avoid a crash when lacking correct DB access permissions.
      PR 57868. [Jose Kahan <jose w3.org>, Yann Ylavic]
 
diff --git a/STATUS b/STATUS
index b0221a8fb1..a03383bf27 100644
--- a/STATUS
+++ b/STATUS
@@ -109,11 +109,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) apxs: add HTTPD_MMN and HTTPD_VERSION to apxs -q
-     trunk: http://svn.apache.org/r1693919
-     2.4.x: trunk works modulo CHANGES
-     +1: covener, ylavic, jim
-
   *) mod_rewrite: Allow cookies to include ':' by using an alternate separator.
      PR47241.
      trunk: http://svn.apache.org/r1693963
diff --git a/acinclude.m4 b/acinclude.m4
index d94f8aae6f..5cac96bc24 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,6 +23,8 @@ AC_DEFUN(APACHE_FAST_OUTPUT,[
 dnl APACHE_GEN_CONFIG_VARS
 dnl Creates config_vars.mk
 AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
+  APACHE_SUBST(HTTPD_VERSION)
+  APACHE_SUBST(HTTPD_MMN)
   APACHE_SUBST(abs_srcdir)
   APACHE_SUBST(bindir)
   APACHE_SUBST(sbindir)
diff --git a/configure.in b/configure.in
index 4380bae126..289b231ca9 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ abs_builddir=`pwd`
 
 dnl Ensure that the httpd version is included
 HTTPD_VERSION=`$abs_srcdir/build/get-version.sh all $abs_srcdir/include/ap_release.h AP_SERVER`
-AC_SUBST(HTTPD_VERSION)
+HTTPD_MMN=`$abs_srcdir/build/get-version.sh mmn $abs_srcdir/include/ap_mmn.h MODULE_MAGIC_NUMBER`
 
 dnl #
 dnl # Include our own M4 macros along with those for APR and libtool