mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
52dba99d47
This syncs the installed sapi and extension headers on *nix and Windows systems by installing only what is intended outside of php-src. - ext/gd: without gd_arginfo.h and gd_compat.h - ext/hash: php_hash_joaat.h and php_hash_fnv.h added also on Windows installation; xxhash/xxhash.h added on both installations as it is included in php_hash_xxhash.h; Include path for xxhash.h changed to relative so the php_hash_xxhash.h can be included outside of php-src; Redundant include flags removed - ext/iconv: without iconv_arginfo.h - ext/mysqli: mysqli_mysqlnd.h was missing on Windows - ext/phar: php_phar.h was missing on Windows - ext/sodium: php_libsodium.h was missing on *nix - ext/xml: without xml_arginfo.h - sapi/cli: cli.h was missing on Windows Closes GH-13210 Closes GH-13213
21 lines
798 B
Plaintext
21 lines
798 B
Plaintext
PHP_ARG_WITH([sodium],
|
|
[for sodium support],
|
|
[AS_HELP_STRING([--with-sodium],
|
|
[Include sodium support])])
|
|
|
|
if test "$PHP_SODIUM" != "no"; then
|
|
PKG_CHECK_MODULES([LIBSODIUM], [libsodium >= 1.0.8])
|
|
|
|
PHP_EVAL_INCLINE($LIBSODIUM_CFLAGS)
|
|
PHP_EVAL_LIBLINE($LIBSODIUM_LIBS, SODIUM_SHARED_LIBADD)
|
|
|
|
AC_DEFINE(HAVE_LIBSODIUMLIB, 1, [ ])
|
|
|
|
dnl Add -Wno-type-limits and -Wno-logical-op as this may arise on 32bits platforms
|
|
SODIUM_COMPILER_FLAGS="$LIBSODIUM_CFLAGS -Wno-type-limits"
|
|
AX_CHECK_COMPILE_FLAG([-Wno-logical-op], SODIUM_COMPILER_FLAGS="$SODIUM_COMPILER_FLAGS -Wno-logical-op", , [-Werror])
|
|
PHP_NEW_EXTENSION(sodium, libsodium.c sodium_pwhash.c, $ext_shared, , $SODIUM_COMPILER_FLAGS)
|
|
PHP_INSTALL_HEADERS([ext/sodium], [php_libsodium.h])
|
|
PHP_SUBST(SODIUM_SHARED_LIBADD)
|
|
fi
|