From: Eric Covener <covener@apache.org>
Date: Mon, 3 Aug 2015 15:37:07 +0000 (+0000)
Subject: Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q
X-Git-Tag: 2.5.0-alpha~2980
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4774dd4680797753dce815a85a8d8b94f3c51d9c;p=thirdparty%2Fapache%2Fhttpd.git

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

PR58202.

Submitted By: Daniel Shahaf
Committed By: covener




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

diff --git a/CHANGES b/CHANGES
index 73589350e8b..9bc6611d0f3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) apxs: Add HTTPD_VERSION and HTTPD_MMN to the variables available with 
+     apxs -q. PR58202. [Daniel Shahaf <danielsh apache.org>]
+
   *) mod_ssl: Add support for extracting the msUPN and dnsSRV forms
      of subjectAltName entries of type "otherName" into
      SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n environment
diff --git a/acinclude.m4 b/acinclude.m4
index 6b24241d8fd..50e6e38de6b 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 961eb22ccd9..12dcc09e8ca 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