From: Guenter Knauf <fuankg@apache.org>
Date: Sat, 25 May 2013 00:38:15 +0000 (+0000)
Subject: Make AP_SERVER_ADD_STRING define-able from CFLAGS.
X-Git-Tag: 2.4.5~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7643bf1556d9bb7dc4c492e86659c5b06ac3a7c6;p=apache

Make AP_SERVER_ADD_STRING define-able from CFLAGS.
backport of r1481955.
Reviewed by: minfrin, humbedooh


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1486262 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 56f793cf7d..178282130a 100644
--- a/STATUS
+++ b/STATUS
@@ -115,11 +115,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works (minus CHANGES)
       +1: minfrin, jim, jorton
 
-    * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS.
-      trunk patch: http://svn.apache.org/r1481955
-      2.4.x patch: trunk works (with fuzz)
-      +1: fuankg, minfrin, humbedooh
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/include/ap_release.h b/include/ap_release.h
index a140f62700..bec8fc3e6c 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -47,13 +47,15 @@
 #define AP_SERVER_MINORVERSION_NUMBER 4
 #define AP_SERVER_PATCHLEVEL_NUMBER   5
 #define AP_SERVER_DEVBUILD_BOOLEAN    1
-#define AP_SERVER_ADD_STRING          "-dev"
 
 /* Synchronize the above with docs/manual/style/version.ent */
 
 #if !AP_SERVER_DEVBUILD_BOOLEAN
-#undef AP_SERVER_ADD_STRING
 #define AP_SERVER_ADD_STRING          ""
+#else
+#ifndef AP_SERVER_ADD_STRING
+#define AP_SERVER_ADD_STRING          "-dev"
+#endif
 #endif
 
 /* keep old macros as well */