Widen strip pattern in config_vars.sh to also

match MOD_XML2ENC_LDADD. This was the first
module with digits in its name.

Submitted by: rjung
Backported by: rjung
Reviewed by: rjung, covener, fuankg

Backport of r1426975 from trunk.

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

diff --git a/STATUS b/STATUS
index 25866b1dba82270adea9f908e695e27e63eed5e3..e9cedb61ee6db2c27182983d0505c502fda6c959 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -172,13 +172,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: covener 
          also valid if you opt to remove APLOGNO altogether
 
-   * config_vars.mk: Widen strip pattern in config_vars.sh to also
-     match MOD_XML2ENC_LDADD. This was the first module with digits
-     in its name.
-     trunk patch: http://svn.apache.org/viewvc?rev=1426975&view=rev
-     2.4.x patch: trunk patch works
-     +1: rjung, covener, fuankg
-
 A list of further possible backports can be found at:
     http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt
 If you want to propose one of those, please still add them here.

diff --git a/build/config_vars.sh.in b/build/config_vars.sh.in
index 4a6eddafccd5207e0d039ac77b5fe1629f6108b2..cbb4a39decc1fee6215034324fb438b10c103aa6 100644 (file)
--- a/build/config_vars.sh.in
+++ b/build/config_vars.sh.in
@@ -42,7 +42,7 @@ test -n "@APU_CONFIG@" && APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
 installbuilddir="@exp_installbuilddir@"
 
 exec sed "
-/^[A-Z_]*_LDADD/d
+/^[A-Z0-9_]*_LDADD/d
 /MPM_LIB/d
 /APACHECTL_ULIMIT/d
 /[a-z]*_LTFLAGS/d