From a556aab55566e40700fda6d8c7457f335d97081b Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Fri, 12 Jul 2024 21:07:03 +0200 Subject: [PATCH] Autotools: Use LIBS for appending -lonig LDFLAGS is by convention used more for linker options like -s and -L. The -l option should go to LIBS instead. This does the same check but is more understandable in the logs and M4 code. --- ext/mbstring/config.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index a8d287af353c7..00745bf9bacbc 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -57,10 +57,10 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ AC_CACHE_CHECK([if oniguruma has an invalid entry for KOI8 encoding], [php_cv_lib_onig_invalid_koi8], - [save_old_LDFLAGS=$LDFLAGS + [save_old_LIBS=$LIBS + LIBS="$LIBS $MBSTRING_SHARED_LIBADD" save_old_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $ONIG_CFLAGS" - PHP_EVAL_LIBLINE([$MBSTRING_SHARED_LIBADD], [LDFLAGS]) AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #include @@ -68,7 +68,7 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ [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 + LIBS=$save_old_LIBS CFLAGS=$save_old_CFLAGS]) AS_VAR_IF([php_cv_lib_onig_invalid_koi8], [yes], [AC_DEFINE([PHP_ONIG_BAD_KOI8_ENTRY], [1],