cvs: php4 / configure.in /build build.mk /ext/zlib config.m4 config0.m4 zlib.m4 /scripts config-stubs

sas Fri May 11 13:09:31 2001 EDT Added files: /php4/ext/zlib config0.m4 Removed files: /php4/ext/zlib config.m4 zlib.m4 Modified files: /php4 configure.in /php4/build build.mk /php4/scripts config-stubs Log: Fix special treatment of zlib by introducing the Apache concept of config.m4 hierarchies. Index: php4/configure.in diff -u php4/configure.in:1.245 php4/configure.in:1.246 --- php4/configure.in:1.245 Fri May 11 11:03:42 2001 +++ php4/configure.in Fri May 11 13:09:26 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.245 2001/05/11 18:03:42 thies Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.246 2001/05/11 20:09:26 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -625,9 +625,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) Index: php4/build/build.mk diff -u php4/build/build.mk:1.7 php4/build/build.mk:1.8 --- php4/build/build.mk:1.7 Tue Apr 3 14:16:07 2001 +++ php4/build/build.mk Fri May 11 13:09:30 2001 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: build.mk,v 1.7 2001/04/03 21:16:07 wsanchez Exp $ +# $Id: build.mk,v 1.8 2001/05/11 20:09:30 sas Exp $ # # # Makefile to generate build tools @@ -34,7 +34,7 @@ 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) Index: php4/scripts/config-stubs diff -u php4/scripts/config-stubs:1.2 php4/scripts/config-stubs:1.3 --- php4/scripts/config-stubs:1.2 Mon Sep 27 09:34:28 1999 +++ php4/scripts/config-stubs Fri May 11 13:09:31 2001 @@ -1,8 +1,8 @@ #!/bin/sh # -# $Id: config-stubs,v 1.2 1999/09/27 16:34:28 ssb Exp $ +# $Id: config-stubs,v 1.3 2001/05/11 20:09:31 sas Exp $ dir=$1; shift -for stubfile in $dir/*/config.m4; do +for stubfile in $dir/*/config0.m4 $dir/*/config.m4; do echo "sinclude($stubfile)" done Index: php4/ext/zlib/config0.m4 +++ php4/ext/zlib/config0.m4 dnl dnl $Id: config0.m4,v 1.1 2001/05/11 20:09:30 sas Exp $ dnl PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, [ --with-zlib-dir=<DIR>] Define the location of zlib install directory]) PHP_ARG_WITH(zlib,whether to include ZLIB support, [ --with-zlib[=DIR] Include zlib support (requires zlib >= 1.0.9). DIR is the zlib install directory.]) if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then PHP_EXTENSION(zlib, $ext_shared) for i in /usr/local /usr $PHP_ZLIB_DIR $PHP_ZLIB; do if test -f $i/include/zlib/zlib.h; then ZLIB_DIR=$i ZLIB_INCDIR=$i/include/zlib elif test -f $i/include/zlib.h; then ZLIB_DIR=$i ZLIB_INCDIR=$i/include fi done if test -z "$ZLIB_DIR"; then AC_MSG_ERROR(Cannot find libz) fi ZLIB_LIBDIR=$ZLIB_DIR/lib AC_CHECK_LIB(z, gzgets, [ AC_DEFINE(HAVE_ZLIB,1,[ ]) ],[ AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9) ]) PHP_SUBST(ZLIB_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR, ZLIB_SHARED_LIBADD) PHP_ADD_INCLUDE($ZLIB_INCDIR) PHP_FOPENCOOKIE if test -z "$PHP_ZLIB_DIR" -o "$PHP_ZLIB_DIR" = "no"; then if test "$PHP_ZLIB" != "yes"; then PHP_ZLIB_DIR=$PHP_ZLIB else PHP_ZLIB_DIR="/usr/local" fi fi fi