Skip to content

Autotools: Refactor oniguruma invalid KOI8 check #14928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Autotools: Refactor oniguruma invalid KOI8 check #14928

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions ext/mbstring/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,24 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
PHP_EVAL_LIBLINE($ONIG_LIBS, MBSTRING_SHARED_LIBADD)
PHP_EVAL_INCLINE($ONIG_CFLAGS)

save_old_LDFLAGS=$LDFLAGS
PHP_EVAL_LIBLINE([$MBSTRING_SHARED_LIBADD], LDFLAGS)
AC_MSG_CHECKING([if oniguruma has an invalid entry for KOI8 encoding])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <oniguruma.h>
]], [[
return (int)(ONIG_ENCODING_KOI8 + 1);
]])], [
AC_MSG_RESULT([no])
], [
AC_MSG_RESULT([yes])
AC_DEFINE([PHP_ONIG_BAD_KOI8_ENTRY], [1], [define to 1 if oniguruma has an invalid entry for KOI8 encoding])
])
LDFLAGS=$save_old_LDFLAGS
AC_CACHE_CHECK([if oniguruma has an invalid entry for KOI8 encoding],
[php_cv_lib_onig_invalid_koi8],
[save_old_LDFLAGS=$LDFLAGS
save_old_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $ONIG_CFLAGS"
PHP_EVAL_LIBLINE([$MBSTRING_SHARED_LIBADD], [LDFLAGS])
AC_LINK_IFELSE([AC_LANG_PROGRAM([
#include <stdint.h>
#include <oniguruma.h>
],
[return (intptr_t)(ONIG_ENCODING_KOI8 + 1);])],
[php_cv_lib_onig_invalid_koi8=no],
[php_cv_lib_onig_invalid_koi8=yes])
LDFLAGS=$save_old_LDFLAGS
CFLAGS=$save_old_CFLAGS])
AS_VAR_IF([php_cv_lib_onig_invalid_koi8], [yes],
[AC_DEFINE([PHP_ONIG_BAD_KOI8_ENTRY], [1],
[Define to 1 if oniguruma has an invalid entry for KOI8 encoding.])])

PHP_MBSTRING_ADD_CFLAG([-DONIG_ESCAPE_UCHAR_COLLISION=1])
PHP_MBSTRING_ADD_CFLAG([-DUChar=OnigUChar])
Expand Down