Fix special treatment of zlib by introducing the Apache concept

of config.m4 hierarchies.

diff --git a/build/build.mk b/build/build.mk
index b91918bb910b0cec58e43d3ae04ff4517a4547a2..c23483b962ad6e2f3d8b0eec6f5dab1f9c94863a 100644 (file)
--- a/build/build.mk
+++ b/build/build.mk
@@ -34,7 +34,7 @@ generated_lists:
                TSRM/Makefile.am > $@
        @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
        @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 \
-               Zend/acinclude.m4 ext/*/config.m4 sapi/*/config.m4 >> $@
+               Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
 
 $(STAMP): build/buildcheck.sh
        @build/buildcheck.sh && touch $(STAMP)

diff --git a/configure.in b/configure.in
index e9ffb4708ec52a0b61ed48e2e3aa7421145cf3d7..ea57cbd18b5140bfca42b841f952611ea2bb80ff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -626,9 +626,6 @@ divert(5)
 
 PHP_CONFIGURE_PART(Configuring extensions)
 
-# zlib checks have to be here
-sinclude(./ext/zlib/zlib.m4)
-
 # reading config stubs
 esyscmd(./scripts/config-stubs ext)
 

diff --git a/ext/zlib/config.m4 b/ext/zlib/config.m4
deleted file mode 100644 (file)
index eb11400..0000000
--- a/ext/zlib/config.m4
+++ /dev/null
@@ -1,5 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-dnl This is dummy file..do not remove!
\ No newline at end of file

diff --git a/ext/zlib/zlib.m4 b/ext/zlib/config0.m4
similarity index 100%
rename from ext/zlib/zlib.m4
rename to ext/zlib/config0.m4

diff --git a/scripts/config-stubs b/scripts/config-stubs
index 7c774f84074e4e650f9bdb08dc20177b4ef73d47..a32e7fc30a42cdbed6eba0487f5bf806e3b95860 100755 (executable)
--- a/scripts/config-stubs
+++ b/scripts/config-stubs
@@ -3,6 +3,6 @@
 # $Id$
 
 dir=$1; shift
-for stubfile in $dir/*/config.m4; do
+for stubfile in $dir/*/config0.m4 $dir/*/config.m4; do
     echo "sinclude($stubfile)"
 done