cellog Fri Jan 18 00:31:23 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/zip Makefile.frag
Modified files:
/php-src/ext/zip config.m4 php_zip.c
Log:
MF5.3: install headers, use correct zip version
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.8.2.3&r2=1.8.2.4&diff_format=u
Index: php-src/ext/zip/config.m4
diff -u php-src/ext/zip/config.m4:1.8.2.3 php-src/ext/zip/config.m4:1.8.2.4
--- php-src/ext/zip/config.m4:1.8.2.3 Tue Jul 3 17:25:35 2007
+++ php-src/ext/zip/config.m4 Fri Jan 18 00:31:23 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8.2.3 2007/07/03 17:25:35 sniper Exp $
+dnl $Id: config.m4,v 1.8.2.4 2008/01/18 00:31:23 cellog Exp $
dnl
PHP_ARG_ENABLE(zip, for zip archive read/writesupport,
@@ -66,4 +66,12 @@
PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES,
$ext_shared)
PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
PHP_SUBST(ZIP_SHARED_LIBADD)
+ ifdef([PHP_INSTALL_HEADERS],
+ [
+ dnl Sadly, this is a complete NOP for pecl extensions
+ PHP_INSTALL_HEADERS(ext/zip/lib, [lib/zip.h lib/zipint.h
lib/zip_alias.h lib/zipint_alias.h])
+ ])
+
+ dnl so we always include the known-good working hack.
+ PHP_ADD_MAKEFILE_FRAGMENT
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.41&r2=1.1.2.42&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.41 php-src/ext/zip/php_zip.c:1.1.2.42
--- php-src/ext/zip/php_zip.c:1.1.2.41 Mon Jan 14 03:19:41 2008
+++ php-src/ext/zip/php_zip.c Fri Jan 18 00:31:23 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.1.2.41 2008/01/14 03:19:41 cellog Exp $ */
+/* $Id: php_zip.c,v 1.1.2.42 2008/01/18 00:31:23 cellog Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -654,7 +654,7 @@
NULL,
NULL,
PHP_MINFO(zip),
- "1.4.0",
+ "2.0.0",
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -2111,7 +2111,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.41 2008/01/14 03:19:41 cellog Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.42 2008/01/18 00:31:23 cellog Exp $");
php_info_print_table_row(2, "Zip version", "2.0.0");
php_info_print_table_row(2, "Libzip version", "0.7.1");
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/Makefile.frag?view=markup&rev=1.1
Index: php-src/ext/zip/Makefile.frag
+++ php-src/ext/zip/Makefile.frag
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
