diff options
| author | Sascha Schumann <sas@php.net> | 2001-05-11 20:09:31 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-05-11 20:09:31 +0000 |
| commit | 7566cf7f27ad3615f4d4e0b012713070733f69a4 (patch) | |
| tree | 871a9c36ff8288cae575e5b160a880a8b544d151 | |
| parent | c115a755441c392661c03b94f760d4d43dcd96c3 (diff) | |
| download | php-git-7566cf7f27ad3615f4d4e0b012713070733f69a4.tar.gz | |
Fix special treatment of zlib by introducing the Apache concept
of config.m4 hierarchies.
| -rw-r--r-- | build/build.mk | 2 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | ext/zlib/config.m4 | 5 | ||||
| -rw-r--r-- | ext/zlib/config0.m4 (renamed from ext/zlib/zlib.m4) | 0 | ||||
| -rwxr-xr-x | scripts/config-stubs | 2 |
5 files changed, 2 insertions, 10 deletions
diff --git a/build/build.mk b/build/build.mk index b91918bb91..c23483b962 100644 --- 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 e9ffb4708e..ea57cbd18b 100644 --- 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 index eb11400217..0000000000 --- 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 index d7f5120837..d7f5120837 100644 --- a/ext/zlib/zlib.m4 +++ b/ext/zlib/config0.m4 diff --git a/scripts/config-stubs b/scripts/config-stubs index 7c774f8407..a32e7fc30a 100755 --- 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 |