cellog Fri Jan 18 00:33:15 2008 UTC
Modified files:
/php-src/ext/zip Makefile.frag config.m4 php_zip.c
Log:
MF5.3: install headers, use correct zip version
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/Makefile.frag?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zip/Makefile.frag
diff -u /dev/null php-src/ext/zip/Makefile.frag:1.2
--- /dev/null Fri Jan 18 00:33:15 2008
+++ php-src/ext/zip/Makefile.frag Fri Jan 18 00:33:15 2008
@@ -0,0 +1,28 @@
+phpincludedir=$(prefix)/include/php
+
+ZIP_HEADER_FILES= \
+ zip.h \
+ zipint.h \
+ zip_alias.h \
+ zipint_alias.h
+
+install-zip-headers:
+ @echo "Installing ZIP headers:
$(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib
+ @for f in $(ZIP_HEADER_FILES); do \
+ if test -f "$(top_srcdir)/lib/$$f"; then \
+ $(INSTALL_DATA) $(top_srcdir)/lib/$$f
$(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \
+ elif test -f "$(top_builddir)/lib/$$f"; then \
+ $(INSTALL_DATA) $(top_builddir)/lib/$$f
$(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \
+ elif test -f "$(top_srcdir)/ext/zip/lib/$$f"; then \
+ $(INSTALL_DATA) $(top_srcdir)/ext/zip/lib/$$f
$(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \
+ elif test -f "$(top_builddir)/ext/zip/lib/$$f"; then \
+ $(INSTALL_DATA) $(top_builddir)/ext/zip/lib/$$f
$(INSTALL_ROOT)$(phpincludedir)/ext/zip/lib; \
+ else \
+ echo "hmmm"; \
+ fi \
+ done;
+
+# mini hack
+install: $(all_targets) $(install_targets) install-zip-headers
+
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/zip/config.m4
diff -u php-src/ext/zip/config.m4:1.11 php-src/ext/zip/config.m4:1.12
--- php-src/ext/zip/config.m4:1.11 Tue Jul 3 17:24:37 2007
+++ php-src/ext/zip/config.m4 Fri Jan 18 00:33:15 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.11 2007/07/03 17:24:37 sniper Exp $
+dnl $Id: config.m4,v 1.12 2008/01/18 00:33:15 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.55&r2=1.56&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.55 php-src/ext/zip/php_zip.c:1.56
--- php-src/ext/zip/php_zip.c:1.55 Mon Jan 14 08:17:55 2008
+++ php-src/ext/zip/php_zip.c Fri Jan 18 00:33:15 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.55 2008/01/14 08:17:55 tony2001 Exp $ */
+/* $Id: php_zip.c,v 1.56 2008/01/18 00:33:15 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
};
/* }}} */
@@ -2205,7 +2205,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.55
2008/01/14 08:17:55 tony2001 Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.56
2008/01/18 00:33:15 cellog Exp $");
php_info_print_table_row(2, "Zip version", "2.0.0");
php_info_print_table_row(2, "Libzip version", "0.7.1");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
