cvs: php4 / configure.in /ext/zlib config.m4 zlib.m4

sniper Wed May 9 17:57:38 2001 EDT Added files: /php4/ext/zlib zlib.m4 Modified files: /php4 configure.in /php4/ext/zlib config.m4 Log: Moved the zlib configure before other extensions. Index: php4/configure.in diff -u php4/configure.in:1.243 php4/configure.in:1.244 --- php4/configure.in:1.243 Wed May 9 06:58:31 2001 +++ php4/configure.in Wed May 9 17:57:36 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.243 2001/05/09 13:58:31 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.244 2001/05/10 00:57:36 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -361,7 +361,6 @@ AC_CHECK_FUNCS( asctime_r \ chroot \ -crypt \ ctime_r \ cuserid \ flock \ @@ -469,8 +468,8 @@ fi PHP_ARG_WITH(layout,[layout of installed files], -[ --with-layout=TYPE Sets how installed files will be laid out. Type is - one of "PHP" (default) or "GNU"], PHP) +[ --with-layout=TYPE Sets how installed files will be laid out. Type is + one of "PHP" (default) or "GNU"], PHP) PHP_ARG_WITH(config-file-path,[path to configuration file], [ --with-config-file-path=PATH @@ -626,7 +625,10 @@ 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/ext/zlib/config.m4 diff -u php4/ext/zlib/config.m4:1.11 php4/ext/zlib/config.m4:1.12 --- php4/ext/zlib/config.m4:1.11 Tue Mar 27 12:34:44 2001 +++ php4/ext/zlib/config.m4 Wed May 9 17:57:36 2001 @@ -1,46 +1,5 @@ -dnl $Id: config.m4,v 1.11 2001/03/27 20:34:44 sniper Exp $ +dnl +dnl $Id: config.m4,v 1.12 2001/05/10 00:57:36 sniper Exp $ +dnl - - -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, - defaults to /usr.]) - -AC_DEFUN(AC_TEMP_LDFLAGS,[ - old_LDFLAGS="$LDFLAGS" - LDFLAGS="$1 $LDFLAGS" - $2 - LDFLAGS="$old_LDFLAGS" -]) - -if test "$PHP_ZLIB" != "no"; then - PHP_EXTENSION(zlib, $ext_shared) - for i in /usr/local /usr $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_TEMP_LDFLAGS(-L$ZLIB_LIBDIR,[ - 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 -fi +dnl This is dummy file..do not remove! \ No newline at end of file Index: php4/ext/zlib/zlib.m4 +++ php4/ext/zlib/zlib.m4 dnl dnl $Id: zlib.m4,v 1.1 2001/05/10 00:57:36 sniper 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