diff options
| -rw-r--r-- | ext/zip/config.m4 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index f7ea725d94..2f6756cfdf 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -6,7 +6,6 @@ PHP_ARG_WITH(zip,for ZIP support, [ --with-zip[=DIR] Include ZIP support (requires zziplib >= 0.10.6).]) if test "$PHP_ZIP" != "no"; then - PHP_NEW_EXTENSION(zip, zip.c, $ext_shared) for i in $PHP_ZIP /usr/local /usr ; do if test -f $i/include/zzlib/zziplib.h; then ZZIPLIB_DIR=$i @@ -23,15 +22,20 @@ if test "$PHP_ZIP" != "no"; then ZZIPLIB_LIBDIR=$ZZIPLIB_DIR/lib - PHP_TEMP_LDFLAGS(-L$ZZIPLIB_LIBDIR,[ - AC_CHECK_LIB(zzip, zzip_open, [AC_DEFINE(HAVE_ZZIPLIB,1,[ ])], - [AC_MSG_ERROR(zziplib module requires zzlib >= 0.10.6.)]) + PHP_CHECK_LIBRARY(zzip, zzip_open, + [ + AC_DEFINE(HAVE_ZZIPLIB,1,[ ]) + ], [ + AC_MSG_ERROR(zziplib module requires zzlib >= 0.10.6.) + ], [ + -L$ZZIPLIB_LIBDIR ]) - PHP_SUBST(ZIP_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(zzip, $ZZIPLIB_LIBDIR, ZIP_SHARED_LIBADD) - PHP_ADD_INCLUDE($ZZIPLIB_INCDIR) PHP_FOPENCOOKIE + + PHP_NEW_EXTENSION(zip, zip.c, $ext_shared) + PHP_SUBST(ZIP_SHARED_LIBADD) fi |