From ceeb431beb8db1eb7a9e959ff53684b2313bf9fe Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Tue, 26 Dec 2000 21:39:35 +0000 Subject: [PATCH] Allow buildconf to find the config.m4 files in the correct order. This allows the decisions made in one config.m4 file to be based on decisions made in previous config.m4 files. For example, the config.m4 in the generators config.m4 can choose the correc cgi module based on which MPM is chosen. To do this, we find all filenames config*.m4, and then we re-order the filename so that it looks like: *config.m4/path/to/file. Once all files are in this format, we sort the files, and then re-arrange the file names again to put them in the correct order. There may be better ways to do this, but I couldn't find a portable way to call sort so that this would work. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87526 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 5 +++++ STATUS | 9 +-------- build/build.mk | 5 ++++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 8a70af3fe4..2af6b86b1b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,10 @@ Changes with Apache 2.0b1 + *) Allow the buildconf process to find the config.m4 files in the correct + order. Basically, we can now name config.m4 files as config\d\d.m4, + and we will sort them correctly when inserting them into the build + process. [Ryan Bloom] + *) Get mod_cgid to use apr calls for creating the actual CGI process. This also allows mod_cgid to use ap_os_create_priviledged_process, thus allowing for SuExec execution from mod_cgid. Currently, we do diff --git a/STATUS b/STATUS index 49a89ce153..23b3db5153 100644 --- a/STATUS +++ b/STATUS @@ -1,5 +1,5 @@ APACHE 2.0 STATUS: -*-text-*- -Last modified at [$Date: 2000/12/23 07:15:43 $] +Last modified at [$Date: 2000/12/26 21:39:34 $] Release: @@ -17,13 +17,6 @@ Release: RELEASE SHOWSTOPPERS: - * Need some way to force config.m4 files to be loaded in order. The - config.m4 file in modules/generators needs to be loaded after the - one in server/mpm, because we rely on the MPM choice to determine - the correct CGI module. This should be done by renaming the config.m4 - files to config##.m4, and doing a find for those files. The files - can then be sorted to ensure they are pulled in at the right times. - * Root all file systems with for WIN32/OS2/NW permissions Status: patch brought forward from 1.3.14 WIN32 and OS2 need review [William Rowe, Brian Harvard] diff --git a/build/build.mk b/build/build.mk index a45069dcba..514f118c1a 100644 --- a/build/build.mk +++ b/build/build.mk @@ -91,7 +91,10 @@ generated_lists: echo "libtoolize not found in path"; \ exit 1; \ fi; - @echo config_m4_files = `find . -name config.m4` > $@ + @echo config_m4_files = `find . -name "config*.m4" | \ + sed 's#\(.*\)\/config\(.*\)\.m4#\2config.m4\1#' | \ + sort -g | \ + sed 's#\(.*\)config.m4\(.*\)#\2/config\1.m4#'` > $@ @n=`build/PrintPath libtoolize`; echo libtool_prefix = `dirname $$n`/.. >> $@ $(STAMP): build/buildcheck.sh -- 2.50.1