Merge the AP_OPENSSL_USE_ERRNO_THREADID check to trunk for wider testing

[apache] / build / config_vars.sh.in

diff --git a/build/config_vars.sh.in b/build/config_vars.sh.in
index 7a60c0634e682eaf833996d4622c25ab5ff0a708..496c2d0dba5667e66be9d7d286759e71920cfd4e 100644 (file)
--- a/build/config_vars.sh.in
+++ b/build/config_vars.sh.in
@@ -41,16 +41,22 @@ test -n "@APU_CONFIG@" && APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
 
 installbuilddir="@exp_installbuilddir@"
 
+### this might be better as a whitelist.
 exec sed "
-/^[A-Z_]*_LDADD/d
+/^[A-Z0-9_]*_LDADD/d
 /MPM_LIB/d
 /APACHECTL_ULIMIT/d
 /[a-z]*_LTFLAGS/d
+/^MPM_MODULES/d
+/^ENABLED_MPM_MODULE/d
 /^DSO_MODULES/d
+/^ENABLED_DSO_MODULES/d
+/^LOAD_ALL_MODULES/d
 /^MODULE_/d
 /^PORT/d
 /^SSLPORT/d
 /^nonssl_/d
+/^ab_/d
 /^CORE_IMPLIB/d
 /^rel_/d
 /^abs_srcdir/d
@@ -60,7 +66,7 @@ exec sed "
 /^OS_DIR/d
 /^AP_LIBS/d
 /^OS_SPECIFIC_VARS/d
-/^MPM_SUBDIR_NAME/d
+/^MPM_SUBDIRS/d
 /^EXTRA_INCLUDES/{ 
   s, = , = -I\$(includedir) ,
   s, -I\$(top_srcdir)/[^ ]*,,g