com php-src: fix symbol availability and ws: ext/sodium/config.w32
| From: | Anatol Belski | Date: | Tue, 11 Jul 2017 07:54:36 +0000 |
| Subject: | com php-src: fix symbol availability and ws: ext/sodium/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98509@lists.php.net to get a copy of this message | ||
Commit: 8cfe479d1f95fd09030892529918d8d68f23c43b
Author: Anatol Belski <ab@php.net> Tue, 11 Jul 2017 09:54:36 +0200
Parents: 90b2cecbaac4296ee364388306729d25bad5f178
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8cfe479d1f95fd09030892529918d8d68f23c43b
Log:
fix symbol availability and ws
Changed paths:
M ext/sodium/config.w32
Diff:
diff --git a/ext/sodium/config.w32 b/ext/sodium/config.w32
index c1af4e6..3c83779 100644
--- a/ext/sodium/config.w32
+++ b/ext/sodium/config.w32
@@ -4,11 +4,12 @@
ARG_WITH("sodium", "for libsodium support", "no");
if (PHP_SODIUM != "no") {
- if (CHECK_LIB("libsodium.lib", "sodium", PHP_SODIUM) &&
CHECK_HEADER_ADD_INCLUDE("sodium.h", "CFLAGS_SODIUM")) {
- EXTENSION("sodium", "libsodium.c");
- AC_DEFINE('HAVE_LIBSODIUMLIB', 1 , 'Have the Sodium library');
- PHP_INSTALL_HEADERS("ext/sodium/", "php_libsodium.h");
- } else {
- WARNING("libsodium not enabled; libraries and headers not found");
- }
+ if (CHECK_LIB("libsodium.lib", "sodium", PHP_SODIUM) &&
CHECK_HEADER_ADD_INCLUDE("sodium.h", "CFLAGS_SODIUM")) {
+ EXTENSION("sodium", "libsodium.c");
+ AC_DEFINE('HAVE_LIBSODIUMLIB', 1 , 'Have the Sodium library');
+ AC_DEFINE("HAVE_CRYPTO_AEAD_AES256GCM", 1, "");
+ PHP_INSTALL_HEADERS("ext/sodium/", "php_libsodium.h");
+ } else {
+ WARNING("libsodium not enabled; libraries and headers not found");
+ }
}