mirror of
https://github.com/php/php-src.git
synced 2024-09-24 03:17:26 +00:00
- MFH Fix dependency from Phar to hash
This commit is contained in:
parent
55e7b35e6b
commit
e2ab5164ce
@ -8,7 +8,9 @@ if test "$PHP_PHAR" != "no"; then
|
||||
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)
|
||||
AC_MSG_CHECKING([for phar openssl support])
|
||||
if test "$PHP_HASH_SHARED" != "yes"; then
|
||||
AC_DEFINE(PHAR_HASH_OK,1,[ ])
|
||||
if test "$PHP_HASH" != "no"; then
|
||||
AC_DEFINE(PHAR_HASH_OK,1,[ ])
|
||||
fi
|
||||
else
|
||||
AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared])
|
||||
fi
|
||||
@ -22,6 +24,7 @@ if test "$PHP_PHAR" != "no"; then
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
fi
|
||||
PHP_ADD_EXTENSION_DEP(phar, hash, true)
|
||||
PHP_ADD_EXTENSION_DEP(phar, spl, true)
|
||||
PHP_ADD_MAKEFILE_FRAGMENT
|
||||
fi
|
||||
|
@ -21,6 +21,9 @@
|
||||
/* $Id$ */
|
||||
|
||||
#include "phar_internal.h"
|
||||
#ifdef PHAR_HASH_OK
|
||||
#include "ext/hash/php_hash_sha.h"
|
||||
#endif
|
||||
|
||||
#ifdef PHAR_HAVE_OPENSSL
|
||||
/* OpenSSL includes */
|
||||
|
Loading…
Reference in New Issue
Block a user