diff options
| author | Greg Beaver <cellog@php.net> | 2005-12-04 23:23:04 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2005-12-04 23:23:04 +0000 |
| commit | 141aecfcdd18ad544d5219a1104632881db1a48c (patch) | |
| tree | 01f3dc18d35246fc9a9a357734a938c1710337b4 | |
| parent | 96d6465999cbc27ff76236daa3d667c50f710277 (diff) | |
| download | php-git-141aecfcdd18ad544d5219a1104632881db1a48c.tar.gz | |
attempt to locate zlib even if --with-zlib is disabled, so we can add library support in phar
| -rw-r--r-- | ext/phar/config.m4 | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/ext/phar/config.m4 b/ext/phar/config.m4 index 0bec2da83e..8c765423a1 100644 --- a/ext/phar/config.m4 +++ b/ext/phar/config.m4 @@ -1,9 +1,49 @@ dnl $Id$ dnl config.m4 for extension phar -PHP_ARG_ENABLE(phar, whether to enable phar support, -[ --enable-phar Enable phar support]) +PHP_ARG_WITH(phar, enable phar support (only specify ZLIB_DIR for --with-zlib=no), +[ --with-phar[=ZLIB_DIR] Enable phar support]) if test "$PHP_PHAR" != "no"; then PHP_NEW_EXTENSION(phar, phar.c, $ext_shared) + + dnl use zlib extension data if specified, otherwise try to find our own zlib + if test "$PHP_ZLIB" = "no" -a "$PHP_ZLIB_DIR" = "no" + PHP_SUBST(PHAR_SHARED_LIBADD) + for i in /usr/local /usr $PHP_PHAR; do + if test -f $i/include/zlib/zlib.h; then + PHAR_ZLIB_DIR=$i + PHAR_ZLIB_INCDIR=$i/include/zlib + elif test -f $i/include/zlib.h; then + PHAR_ZLIB_DIR=$i + PHAR_ZLIB_INCDIR=$i/include + fi + done + + if test -z "$PHAR_ZLIB_DIR"; then + AC_MSG_WARN(Cannot find libz, zlib support disabled for phar extension) + elif + PHP_CHECK_LIBRARY(z, gzgets, [ + AC_DEFINE(HAVE_PHAR_ZLIB,1,[ ]) + PHP_ADD_LIBPATH($PHAR_ZLIB_DIR/$PHAR_ZLIB_DIR, PHAR_SHARED_LIBADD) + + PHP_ZLIB_DIR=$PHAR_ZLIB_DIR + PHP_ADD_LIBRARY(z,, PHAR_SHARED_LIBADD) + PHP_ADD_INCLUDE($PHAR_ZLIB_INCDIR) + ],[ + AC_MSG_WARN(PHAR extension requires zlib >= 1.0.9, zlib support disabled for phar extension) + ],[ + case $PHAR_ZLIB_DIR in + /usr) ac_extra= ;; + *) ac_extra=-L$PHAR_ZLIB_DIR/$PHP_LIBDIR ;; + esac + $ac_extra + PHP_ADD_LIBPATH($PHAR_ZLIB_DIR/$PHP_LIBDIR, PHAR_SHARED_LIBADD) + + PHP_ZLIB_DIR=$PHAR_ZLIB_DIR + PHP_ADD_LIBRARY(z,, PHAR_SHARED_LIBADD) + PHP_ADD_INCLUDE($PHAR_ZLIB_INCDIR) + ]) + fi + fi fi |