Skip to content

Commit 149abd2

Browse files
authored
Autotools: Refactor oniguruma invalid KOI8 check (#14928)
- Fixed warning: cast from pointer to integer of different size using the intptr_t instead of int type case - CS synced - Check wrapped in AC_CACHE_CHECK - Over-quoted arguments reduced - Also the include flags added to the check when building with oniguruma installed on custom places
1 parent 92c0db3 commit 149abd2

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

ext/mbstring/config.m4

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,24 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
5555
PHP_EVAL_LIBLINE($ONIG_LIBS, MBSTRING_SHARED_LIBADD)
5656
PHP_EVAL_INCLINE($ONIG_CFLAGS)
5757
58-
save_old_LDFLAGS=$LDFLAGS
59-
PHP_EVAL_LIBLINE([$MBSTRING_SHARED_LIBADD], LDFLAGS)
60-
AC_MSG_CHECKING([if oniguruma has an invalid entry for KOI8 encoding])
61-
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
62-
#include <oniguruma.h>
63-
]], [[
64-
return (int)(ONIG_ENCODING_KOI8 + 1);
65-
]])], [
66-
AC_MSG_RESULT([no])
67-
], [
68-
AC_MSG_RESULT([yes])
69-
AC_DEFINE([PHP_ONIG_BAD_KOI8_ENTRY], [1], [define to 1 if oniguruma has an invalid entry for KOI8 encoding])
70-
])
71-
LDFLAGS=$save_old_LDFLAGS
58+
AC_CACHE_CHECK([if oniguruma has an invalid entry for KOI8 encoding],
59+
[php_cv_lib_onig_invalid_koi8],
60+
[save_old_LDFLAGS=$LDFLAGS
61+
save_old_CFLAGS=$CFLAGS
62+
CFLAGS="$CFLAGS $ONIG_CFLAGS"
63+
PHP_EVAL_LIBLINE([$MBSTRING_SHARED_LIBADD], [LDFLAGS])
64+
AC_LINK_IFELSE([AC_LANG_PROGRAM([
65+
#include <stdint.h>
66+
#include <oniguruma.h>
67+
],
68+
[return (intptr_t)(ONIG_ENCODING_KOI8 + 1);])],
69+
[php_cv_lib_onig_invalid_koi8=no],
70+
[php_cv_lib_onig_invalid_koi8=yes])
71+
LDFLAGS=$save_old_LDFLAGS
72+
CFLAGS=$save_old_CFLAGS])
73+
AS_VAR_IF([php_cv_lib_onig_invalid_koi8], [yes],
74+
[AC_DEFINE([PHP_ONIG_BAD_KOI8_ENTRY], [1],
75+
[Define to 1 if oniguruma has an invalid entry for KOI8 encoding.])])
7276
7377
PHP_MBSTRING_ADD_CFLAG([-DONIG_ESCAPE_UCHAR_COLLISION=1])
7478
PHP_MBSTRING_ADD_CFLAG([-DUChar=OnigUChar])

0 commit comments

Comments
 (0)