cvs: php-src(PHP_5_3) /ext/zip config.m4 config.w32
| From: | Pierre-Alain Joye | Date: | Fri, 30 May 2008 19:46:56 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/zip config.m4 config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50205@lists.php.net to get a copy of this message | ||
pajoye Fri May 30 19:46:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/zip config.m4 config.w32
Log:
- not exported
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.m4?r1=1.8.2.3.2.2&r2=1.8.2.3.2.3&diff_format=u
Index: php-src/ext/zip/config.m4
diff -u php-src/ext/zip/config.m4:1.8.2.3.2.2 php-src/ext/zip/config.m4:1.8.2.3.2.3
--- php-src/ext/zip/config.m4:1.8.2.3.2.2 Wed May 21 09:27:41 2008
+++ php-src/ext/zip/config.m4 Fri May 30 19:46:56 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8.2.3.2.2 2008/05/21 09:27:41 pajoye Exp $
+dnl $Id: config.m4,v 1.8.2.3.2.3 2008/05/30 19:46:56 pajoye Exp $
dnl
PHP_ARG_ENABLE(zip, for zip archive read/writesupport,
@@ -95,12 +95,7 @@
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/config.w32?r1=1.1.2.1.2.3&r2=1.1.2.1.2.4&diff_format=u
Index: php-src/ext/zip/config.w32
diff -u php-src/ext/zip/config.w32:1.1.2.1.2.3 php-src/ext/zip/config.w32:1.1.2.1.2.4
--- php-src/ext/zip/config.w32:1.1.2.1.2.3 Wed May 21 09:27:41 2008
+++ php-src/ext/zip/config.w32 Fri May 30 19:46:56 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1.2.1.2.3 2008/05/21 09:27:41 pajoye Exp $
+// $Id: config.w32,v 1.1.2.1.2.4 2008/05/30 19:46:56 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE("zip", "ZIP support", "yes");
@@ -30,7 +30,6 @@
AC_DEFINE('HAVE_ZLIB', 1);
AC_DEFINE('HAVE_ZIP', 1);
- ADD_FLAG("CFLAGS_ZIP", "/D PHP_ZIP_EXPORTS ");
} else {
WARNING("zip not enabled; libraries and headers not found");
}