From fa6027041d17757c3a649534b52edfbedee95d33 Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Thu, 17 Jan 2008 04:04:30 +0000 Subject: [PATCH] refine config.m4 to use the newly found zip headers --- ext/phar/config.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/phar/config.m4 b/ext/phar/config.m4 index 79286b5de9..4aac00d497 100644 --- a/ext/phar/config.m4 +++ b/ext/phar/config.m4 @@ -10,20 +10,23 @@ if test "$PHP_PHAR" != "no"; then zip_inc_path=$abs_srcdir/ext AC_DEFINE(HAVE_PHAR_ZIP,1,[ ]) AC_MSG_RESULT($zip_inc_path) + PHP_NEW_EXTENSION(phar, tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,,-I$zip_inc_path $PHAR_DEFS) elif test -f $abs_srcdir/ext/zip/lib/zip.h; then zip_inc_path=$abs_srcdir/ext AC_DEFINE(HAVE_PHAR_ZIP,1,[ ]) AC_MSG_RESULT($zip_inc_path) + PHP_NEW_EXTENSION(phar, tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,,-I$zip_inc_path $PHAR_DEFS) elif test -f $prefix/include/php/ext/zip/lib/zip.h; then zip_inc_path=$prefix/include/php/ext AC_DEFINE(HAVE_PHAR_ZIP,1,[ ]) AC_MSG_RESULT($zip_inc_path) + PHP_NEW_EXTENSION(phar, tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,,-I$zip_inc_path $PHAR_DEFS) else zip_inc_path=/dev/null AC_DEFINE(HAVE_PHAR_ZIP,0,[ ]) AC_MSG_RESULT([not found, disabling ZIP-based phar support]) + PHP_NEW_EXTENSION(phar, tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) fi - PHP_NEW_EXTENSION(phar, tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) PHP_ADD_BUILD_DIR($ext_builddir/lib, 1) PHP_SUBST(PHAR_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(phar, zip, true) -- 2.50.1