]>
Commit | Line | Data |
---|---|---|
66181086 ER |
1 | --- php-7.0.0RC6/ext/phar/config.m4 2015-11-17 19:13:50.877662712 +0200 |
2 | +++ php-7.0.0RC6/ext/phar/config.m4 2015-11-20 12:51:24.088185045 +0200 | |
97b0b310 ER |
3 | @@ -7,13 +7,13 @@ |
4 | if test "$PHP_PHAR" != "no"; then | |
5 | PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) | |
6 | AC_MSG_CHECKING([for phar openssl support]) | |
7 | - if test "$PHP_HASH_SHARED" != "yes"; then | |
8 | - if test "$PHP_HASH" != "no"; then | |
9 | +dnl if test "$PHP_HASH_SHARED" != "yes"; then | |
10 | +dnl if test "$PHP_HASH" != "no"; then | |
11 | AC_DEFINE(PHAR_HASH_OK,1,[ ]) | |
12 | - fi | |
13 | - else | |
66181086 ER |
14 | - AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) |
15 | - fi | |
97b0b310 ER |
16 | +dnl fi |
17 | +dnl else | |
66181086 | 18 | +dnl AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) |
97b0b310 ER |
19 | +dnl fi |
20 | if test "$PHP_OPENSSL_SHARED" = "yes"; then | |
21 | AC_MSG_RESULT([no (shared openssl)]) | |
22 | else | |
a013a9dc ER |
23 | --- php-7.0.0RC7/ext/phar/Makefile.frag~ 2015-11-23 11:06:31.000000000 +0200 |
24 | +++ php-7.0.0RC7/ext/phar/Makefile.frag 2015-11-23 11:15:36.452443959 +0200 | |
25 | @@ -9,7 +9,7 @@ | |
26 | $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ | |
27 | if test "x$(PHP_MODULES)" != "x"; then \ | |
28 | $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ | |
29 | - for i in pcre spl bz2 zlib phar; do \ | |
30 | + for i in pcre spl bz2 zlib hash phar; do \ | |
31 | if test -f "$(top_builddir)/modules/$$i.la"; then \ | |
32 | . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ | |
33 | fi; \ |