Commit e2c43d0c authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Finish up the config.m4 file overhaul, so that we can load config.m4 files 

in order.


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

build/build.mk

+1 −4
Original line number Diff line number Diff line
@@ -91,10 +91,7 @@ generated_lists: 
		echo "libtoolize not found in path"; \

		exit 1; \

	fi; 

	@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#'` > $@

	@echo config_m4_files = `find . -name config.m4` > $@

	@n=`build/PrintPath libtoolize`; echo libtool_prefix = `dirname $$n`/.. >> $@



$(STAMP): build/buildcheck.sh

build/config-stubs

+6 −4
Original line number Diff line number Diff line 
#!/bin/sh



dir=$1

for stubdir in `find $dir -type d`; do

    if [ -r $stubdir/config.m4 ]; then

        echo "sinclude($stubdir/config.m4)"

for configfiles in `find . -name "config*.m4" | \

         sed 's#\(.*\)\/config\(.*\)\.m4#\2config.m4\1#' | \

         sort -g | \

         sed 's#\(.*\)config.m4\(.*\)#\2/config\1.m4#g'`; do

    if [ -r $configfiles ]; then

        echo "sinclude($configfiles)"

    fi

done