update m4 to make zip support always enabled so zip headers must be installed, add...

diff --git a/ext/phar/config.m4 b/ext/phar/config.m4
index cc8c1270c7bbfd10b3c441681ece2cdd92f50be8..5999c6d7473ec66c5bb7d563438cb7134b960b5d 100644 (file)
--- a/ext/phar/config.m4
+++ b/ext/phar/config.m4
@@ -4,21 +4,12 @@ dnl config.m4 for extension phar
 PHP_ARG_ENABLE(phar, for phar support/phar zlib support,
 [  --enable-phar           Enable phar support])
 
-PHP_ARG_WITH(phar-zip, for zip-based phar support,
-[  --without-phar-zip        PHAR: Disable zip-based phar archive support], no, no)
-
 if test "$PHP_PHAR" != "no"; then
   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)
-       AC_MSG_CHECKING([for zip-based phar support])
-       if test "$PHP_PHAR_ZIP" != "yes"; then
-               AC_MSG_RESULT([yes])
-               AC_DEFINE(HAVE_PHAR_ZIP,1,[ ])
-               PHP_ADD_EXTENSION_DEP(phar, zip, true)
-       else
-               AC_MSG_RESULT([no])
-       fi
+  AC_DEFINE(HAVE_PHAR_ZIP,1,[ ])
   PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
   PHP_SUBST(PHAR_SHARED_LIBADD)
+  PHP_ADD_EXTENSION_DEP(phar, zip, true)
   PHP_ADD_EXTENSION_DEP(phar, zlib, true)
   PHP_ADD_EXTENSION_DEP(phar, bz2, true)
   PHP_ADD_EXTENSION_DEP(phar, spl, true)

diff --git a/ext/phar/package.php b/ext/phar/package.php
index 4368edbb3108ecd100cd5f33cf488882d4811d01..aa996ba4883e3c2b15c64785d7738af902a54c17 100644 (file)
--- a/ext/phar/package.php
+++ b/ext/phar/package.php
@@ -64,6 +64,7 @@ $package->addPackageDepWithChannel('optional', 'bz2', 'pecl.php.net', false, fal
 // all this false business sets the <providesextension> tag that allows us to have hash built
 // in statically
 $package->addPackageDepWithChannel('optional', 'hash', 'pecl.php.net', false, false, false, false, 'hash');
+$package->addPackageDepWithChannel('optional', 'zip', 'pecl.php.net', '1.8.11', false, false, false, 'zip');
 $package->addExtensionDep('optional', 'spl');
 $package->addExtensionDep('optional', 'zlib');
 $package->setPackageType('extsrc');