From 2089c4bec9d91c45bef0e531f4170d9e69a6adb5 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Fri, 19 Jul 2024 20:46:35 +0200 Subject: [PATCH] Autotools: Quote M4 arguments - PHP_ADD_INCLUDE - PHP_EVAL_INCLINE - PHP_EVAL_LIBLINE --- build/php.m4 | 20 ++++++++++---------- ext/bz2/config.m4 | 2 +- ext/dba/config.m4 | 4 ++-- ext/enchant/config.m4 | 8 ++++---- ext/ffi/config.m4 | 4 ++-- ext/gd/config.m4 | 28 ++++++++++++++-------------- ext/gettext/config.m4 | 2 +- ext/gmp/config.m4 | 2 +- ext/ldap/config.m4 | 6 +++--- ext/mbstring/config.m4 | 4 ++-- ext/odbc/config.m4 | 10 +++++----- ext/opcache/config.m4 | 4 ++-- ext/pcre/config0.m4 | 4 ++-- ext/pdo_dblib/config.m4 | 2 +- ext/pdo_firebird/config.m4 | 6 +++--- ext/pdo_mysql/config.m4 | 6 +++--- ext/readline/config.m4 | 6 +++--- ext/session/config.m4 | 2 +- ext/skeleton/config.m4.in | 6 +++--- ext/snmp/config.m4 | 4 ++-- ext/sodium/config.m4 | 4 ++-- ext/standard/config.m4 | 4 ++-- ext/tidy/config.m4 | 2 +- ext/xsl/config.m4 | 8 ++++---- ext/zip/config.m4 | 4 ++-- 25 files changed, 76 insertions(+), 76 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index e40c6c588967..be706c564851 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -391,7 +391,7 @@ AC_DEFUN([PHP_EVAL_INCLINE],[ case $ac_i in -I*[)] ac_ii=`echo $ac_i|cut -c 3-` - PHP_ADD_INCLUDE($ac_ii) + PHP_ADD_INCLUDE([$ac_ii]) ;; esac done @@ -1781,8 +1781,8 @@ dnl AC_DEFUN([PHP_SETUP_ICU],[ PKG_CHECK_MODULES([ICU], [icu-uc >= 50.1 icu-io icu-i18n]) - PHP_EVAL_INCLINE($ICU_CFLAGS) - PHP_EVAL_LIBLINE($ICU_LIBS, $1) + PHP_EVAL_INCLINE([$ICU_CFLAGS]) + PHP_EVAL_LIBLINE([$ICU_LIBS], [$1]) ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" @@ -1802,8 +1802,8 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.1.1], [found_openssl=yes]) if test "$found_openssl" = "yes"; then - PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1) - PHP_EVAL_INCLINE($OPENSSL_CFLAGS) + PHP_EVAL_LIBLINE([$OPENSSL_LIBS], [$1]) + PHP_EVAL_INCLINE([$OPENSSL_CFLAGS]) ifelse([$2],[],:,[$2]) fi ]) @@ -1878,7 +1878,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ AC_DEFINE(HAVE_ICONV,1,[ ]) if test -n "$ICONV_DIR"; then PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1) - PHP_ADD_INCLUDE($ICONV_INCLUDE_DIR) + PHP_ADD_INCLUDE([$ICONV_INCLUDE_DIR]) fi $2 ifelse([$3],[],,[else $3]) @@ -1893,8 +1893,8 @@ dnl AC_DEFUN([PHP_SETUP_LIBXML], [ PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.9.0]) - PHP_EVAL_INCLINE($LIBXML_CFLAGS) - PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) + PHP_EVAL_INCLINE([$LIBXML_CFLAGS]) + PHP_EVAL_LIBLINE([$LIBXML_LIBS], [$1]) AC_DEFINE(HAVE_LIBXML, 1, [ ]) @@ -1909,8 +1909,8 @@ dnl AC_DEFUN([PHP_SETUP_EXPAT], [ PKG_CHECK_MODULES([EXPAT], [expat]) - PHP_EVAL_INCLINE($EXPAT_CFLAGS) - PHP_EVAL_LIBLINE($EXPAT_LIBS, $1) + PHP_EVAL_INCLINE([$EXPAT_CFLAGS]) + PHP_EVAL_LIBLINE([$EXPAT_LIBS], [$1]) AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) ]) diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4 index db812266dd67..5330f4b371d3 100644 --- a/ext/bz2/config.m4 +++ b/ext/bz2/config.m4 @@ -24,7 +24,7 @@ if test "$PHP_BZ2" != "no"; then PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, [ - PHP_ADD_INCLUDE($BZIP_DIR/include) + PHP_ADD_INCLUDE([$BZIP_DIR/include]) PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD) AC_DEFINE(HAVE_BZ2,1,[ ]) ], [ diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index fa498f929add..79ef68beb1b9 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -235,7 +235,7 @@ if test "$PHP_TCADB" != "no"; then for i in $PHP_TCADB /usr/local /usr; do if test -f "$i/include/tcadb.h"; then THIS_PREFIX=$i - PHP_ADD_INCLUDE($THIS_PREFIX/include) + PHP_ADD_INCLUDE([$THIS_PREFIX/include]) THIS_INCLUDE=$i/include/tcadb.h break fi @@ -266,7 +266,7 @@ if test "$PHP_LMDB" != "no"; then for i in $PHP_LMDB /usr/local /usr; do if test -f "$i/include/lmdb.h"; then THIS_PREFIX=$i - PHP_ADD_INCLUDE($THIS_PREFIX/include) + PHP_ADD_INCLUDE([$THIS_PREFIX/include]) THIS_INCLUDE=$i/include/lmdb.h break fi diff --git a/ext/enchant/config.m4 b/ext/enchant/config.m4 index 5c21fe242ec5..d3f94d34b047 100644 --- a/ext/enchant/config.m4 +++ b/ext/enchant/config.m4 @@ -8,8 +8,8 @@ if test "$PHP_ENCHANT" != "no"; then if test "$found_enchant_2" = "yes"; then - PHP_EVAL_INCLINE($ENCHANT2_CFLAGS) - PHP_EVAL_LIBLINE($ENCHANT2_LIBS, ENCHANT_SHARED_LIBADD) + PHP_EVAL_INCLINE([$ENCHANT2_CFLAGS]) + PHP_EVAL_LIBLINE([$ENCHANT2_LIBS], [ENCHANT_SHARED_LIBADD]) AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ enchant_get_version since 1.6.0 ]) @@ -17,8 +17,8 @@ if test "$PHP_ENCHANT" != "no"; then AC_MSG_WARN([libenchant-2 not found trying with old libenchant]) PKG_CHECK_MODULES([ENCHANT], [enchant >= 1.4.2]) - PHP_EVAL_INCLINE($ENCHANT_CFLAGS) - PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD) + PHP_EVAL_INCLINE([$ENCHANT_CFLAGS]) + PHP_EVAL_LIBLINE([$ENCHANT_LIBS], [ENCHANT_SHARED_LIBADD]) PHP_CHECK_LIBRARY(enchant, enchant_get_version, [ diff --git a/ext/ffi/config.m4 b/ext/ffi/config.m4 index 81f7e500b847..9d684c741b25 100644 --- a/ext/ffi/config.m4 +++ b/ext/ffi/config.m4 @@ -6,8 +6,8 @@ PHP_ARG_WITH([ffi], if test "$PHP_FFI" != "no"; then PKG_CHECK_MODULES([FFI], [libffi >= 3.0.11]) - PHP_EVAL_INCLINE($FFI_CFLAGS) - PHP_EVAL_LIBLINE($FFI_LIBS, FFI_SHARED_LIBADD) + PHP_EVAL_INCLINE([$FFI_CFLAGS]) + PHP_EVAL_LIBLINE([$FFI_LIBS], [FFI_SHARED_LIBADD]) AC_DEFINE(HAVE_FFI, 1, [Have ffi support]) diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 2a22a1aeed80..86e134b64cbe 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -68,16 +68,16 @@ dnl dnl libpng is always required AC_DEFUN([PHP_GD_PNG],[ PKG_CHECK_MODULES([PNG], [libpng]) - PHP_EVAL_LIBLINE($PNG_LIBS, GD_SHARED_LIBADD) - PHP_EVAL_INCLINE($PNG_CFLAGS) + PHP_EVAL_LIBLINE([$PNG_LIBS], [GD_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$PNG_CFLAGS]) AC_DEFINE(HAVE_LIBPNG, 1, [ ]) ]) AC_DEFUN([PHP_GD_AVIF],[ if test "$PHP_AVIF" != "no"; then PKG_CHECK_MODULES([AVIF], [libavif >= 0.8.2]) - PHP_EVAL_LIBLINE($AVIF_LIBS, GD_SHARED_LIBADD) - PHP_EVAL_INCLINE($AVIF_CFLAGS) + PHP_EVAL_LIBLINE([$AVIF_LIBS], [GD_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$AVIF_CFLAGS]) AC_DEFINE(HAVE_LIBAVIF, 1, [ ]) AC_DEFINE(HAVE_GD_AVIF, 1, [ ]) fi @@ -86,8 +86,8 @@ AC_DEFUN([PHP_GD_AVIF],[ AC_DEFUN([PHP_GD_WEBP],[ if test "$PHP_WEBP" != "no"; then PKG_CHECK_MODULES([WEBP], [libwebp >= 0.2.0]) - PHP_EVAL_LIBLINE($WEBP_LIBS, GD_SHARED_LIBADD) - PHP_EVAL_INCLINE($WEBP_CFLAGS) + PHP_EVAL_LIBLINE([$WEBP_LIBS], [GD_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$WEBP_CFLAGS]) AC_DEFINE(HAVE_LIBWEBP, 1, [ ]) AC_DEFINE(HAVE_GD_WEBP, 1, [ ]) fi @@ -96,8 +96,8 @@ AC_DEFUN([PHP_GD_WEBP],[ AC_DEFUN([PHP_GD_JPEG],[ if test "$PHP_JPEG" != "no"; then PKG_CHECK_MODULES([JPEG], [libjpeg]) - PHP_EVAL_LIBLINE($JPEG_LIBS, GD_SHARED_LIBADD) - PHP_EVAL_INCLINE($JPEG_CFLAGS) + PHP_EVAL_LIBLINE([$JPEG_LIBS], [GD_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$JPEG_CFLAGS]) AC_DEFINE(HAVE_LIBJPEG, 1, [ ]) AC_DEFINE(HAVE_GD_JPG, 1, [ ]) fi @@ -106,8 +106,8 @@ AC_DEFUN([PHP_GD_JPEG],[ AC_DEFUN([PHP_GD_XPM],[ if test "$PHP_XPM" != "no"; then PKG_CHECK_MODULES([XPM], [xpm]) - PHP_EVAL_LIBLINE($XPM_LIBS, GD_SHARED_LIBADD) - PHP_EVAL_INCLINE($XPM_CFLAGS) + PHP_EVAL_LIBLINE([$XPM_LIBS], [GD_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$XPM_CFLAGS]) AC_DEFINE(HAVE_XPM, 1, [ ]) AC_DEFINE(HAVE_GD_XPM, 1, [ ]) fi @@ -117,8 +117,8 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ if test "$PHP_FREETYPE" != "no"; then PKG_CHECK_MODULES([FREETYPE2], [freetype2], [FREETYPE2_FOUND=true]) - PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) - PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) + PHP_EVAL_INCLINE([$FREETYPE2_CFLAGS]) + PHP_EVAL_LIBLINE([$FREETYPE2_LIBS], [GD_SHARED_LIBADD]) AC_DEFINE(HAVE_LIBFREETYPE, 1, [ ]) AC_DEFINE(HAVE_GD_FREETYPE, 1, [ ]) fi @@ -239,8 +239,8 @@ dnl Various checks for GD features else extra_sources="gd_compat.c" PKG_CHECK_MODULES([GDLIB], [gdlib >= 2.1.0]) - PHP_EVAL_LIBLINE($GDLIB_LIBS, GD_SHARED_LIBADD) - PHP_EVAL_INCLINE($GDLIB_CFLAGS) + PHP_EVAL_LIBLINE([$GDLIB_LIBS], [GD_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$GDLIB_CFLAGS]) AC_DEFINE(HAVE_LIBGD, 1, [ ]) PHP_GD_CHECK_VERSION diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 index c2292d9351b8..0381c9c4b096 100644 --- a/ext/gettext/config.m4 +++ b/ext/gettext/config.m4 @@ -35,7 +35,7 @@ if test "$PHP_GETTEXT" != "no"; then PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared) PHP_SUBST([GETTEXT_SHARED_LIBADD]) - PHP_ADD_INCLUDE($GETTEXT_INCDIR) + PHP_ADD_INCLUDE([$GETTEXT_INCDIR]) AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, ngettext, [AC_DEFINE(HAVE_NGETTEXT, 1, [ ])]) AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dngettext, [AC_DEFINE(HAVE_DNGETTEXT, 1, [ ])]) diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4 index 66faf2c43dca..642fe9c4a58f 100644 --- a/ext/gmp/config.m4 +++ b/ext/gmp/config.m4 @@ -24,7 +24,7 @@ if test "$PHP_GMP" != "no"; then ]) PHP_ADD_LIBRARY_WITH_PATH(gmp, $PHP_GMP/$PHP_LIBDIR, GMP_SHARED_LIBADD) - PHP_ADD_INCLUDE($PHP_GMP/include) + PHP_ADD_INCLUDE([$PHP_GMP/include]) fi PHP_INSTALL_HEADERS([ext/gmp], [php_gmp_int.h]) diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 483b2c8fb5fb..bef5b85d4350 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -91,7 +91,7 @@ if test "$PHP_LDAP" != "no"; then AC_MSG_ERROR(Cannot find ldap libraries in $LDAP_LIBDIR.) fi - PHP_ADD_INCLUDE($LDAP_INCDIR) + PHP_ADD_INCLUDE([$LDAP_INCDIR]) PHP_SUBST([LDAP_SHARED_LIBADD]) AC_DEFINE(HAVE_LDAP,1,[ ]) @@ -131,8 +131,8 @@ if test "$PHP_LDAP" != "no"; then if test "$PHP_LDAP_SASL" != "no"; then PKG_CHECK_MODULES([SASL], [libsasl2]) - PHP_EVAL_INCLINE($SASL_CFLAGS) - PHP_EVAL_LIBLINE($SASL_LIBS, LDAP_SHARED_LIBADD) + PHP_EVAL_INCLINE([$SASL_CFLAGS]) + PHP_EVAL_LIBLINE([$SASL_LIBS], [LDAP_SHARED_LIBADD]) AC_DEFINE(HAVE_LDAP_SASL, 1, [LDAP SASL support]) fi diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index 54c511ae89d6..38ee4107be61 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -52,8 +52,8 @@ EOF AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ if test "$PHP_MBREGEX" = "yes"; then PKG_CHECK_MODULES([ONIG], [oniguruma]) - PHP_EVAL_LIBLINE($ONIG_LIBS, MBSTRING_SHARED_LIBADD) - PHP_EVAL_INCLINE($ONIG_CFLAGS) + PHP_EVAL_LIBLINE([$ONIG_LIBS], [MBSTRING_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$ONIG_CFLAGS]) AC_CACHE_CHECK([if oniguruma has an invalid entry for KOI8 encoding], [php_cv_lib_onig_invalid_koi8], diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 70c2e1004bfd..f559b82ad040 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -106,7 +106,7 @@ PHP_ARG_WITH([adabas],, if test "$PHP_ADABAS" = "yes"; then PHP_ADABAS=/usr/local fi - PHP_ADD_INCLUDE($PHP_ADABAS/incl) + PHP_ADD_INCLUDE([$PHP_ADABAS/incl]) PHP_ADD_LIBPATH($PHP_ADABAS/$PHP_LIBDIR) ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a" ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a" @@ -136,7 +136,7 @@ PHP_ARG_WITH([sapdb],, if test "$PHP_SAPDB" = "yes"; then PHP_SAPDB=/usr/local fi - PHP_ADD_INCLUDE($PHP_SAPDB/incl) + PHP_ADD_INCLUDE([$PHP_SAPDB/incl]) PHP_ADD_LIBPATH($PHP_SAPDB/$PHP_LIBDIR) PHP_ADD_LIBRARY(sqlod) ODBC_TYPE=sapdb @@ -320,7 +320,7 @@ PHP_ARG_WITH([iodbc],, if test "$PHP_IODBC" != "no"; then AC_MSG_RESULT(yes) PKG_CHECK_MODULES([ODBC], [libiodbc]) - PHP_EVAL_INCLINE($ODBC_CFLAGS) + PHP_EVAL_INCLINE([$ODBC_CFLAGS]) ODBC_TYPE=iodbc AC_DEFINE(HAVE_IODBC,1,[ ]) else @@ -361,7 +361,7 @@ PHP_ARG_WITH([unixODBC],, if test "$PHP_UNIXODBC" = "yes"; then AC_MSG_RESULT(yes from pkgconfig) PKG_CHECK_MODULES([ODBC], [odbc]) - PHP_EVAL_INCLINE($ODBC_CFLAGS) + PHP_EVAL_INCLINE([$ODBC_CFLAGS]) else dnl keep old DIR way for old version without libodbc.pc ODBC_INCDIR=$PHP_UNIXODBC/include @@ -423,7 +423,7 @@ PHP_ARG_WITH([dbmaker],, else AC_MSG_RESULT([yes (static)]) PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR) - PHP_ADD_INCLUDE($ODBC_INCDIR) + PHP_ADD_INCLUDE([$ODBC_INCDIR]) ODBC_STATIC="libphpext_odbc.la" fi else diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 57d992a1538d..bbbe9d7960f4 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -84,8 +84,8 @@ if test "$PHP_OPCACHE" != "no"; then AS_IF([test x"$with_capstone" = "xyes"],[ PKG_CHECK_MODULES([CAPSTONE],[capstone >= 3.0.0],[ AC_DEFINE([HAVE_CAPSTONE], [1], [Capstone is available]) - PHP_EVAL_LIBLINE($CAPSTONE_LIBS, OPCACHE_SHARED_LIBADD) - PHP_EVAL_INCLINE($CAPSTONE_CFLAGS) + PHP_EVAL_LIBLINE([$CAPSTONE_LIBS], [OPCACHE_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$CAPSTONE_CFLAGS]) ZEND_JIT_SRC="$ZEND_JIT_SRC jit/ir/ir_disasm.c" ],[ AC_MSG_ERROR([capstone >= 3.0 required but not found]) diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 7c9ccabd625d..0395cd631e39 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -19,8 +19,8 @@ AH_TEMPLATE([HAVE_PCRE_JIT_SUPPORT], if test "$PHP_EXTERNAL_PCRE" != "no"; then PKG_CHECK_MODULES([PCRE2], [libpcre2-8 >= 10.30]) - PHP_EVAL_INCLINE($PCRE2_CFLAGS) - PHP_EVAL_LIBLINE($PCRE2_LIBS) + PHP_EVAL_INCLINE([$PCRE2_CFLAGS]) + PHP_EVAL_LIBLINE([$PCRE2_LIBS]) AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ]) AS_VAR_IF([PHP_PCRE_JIT], [no],, diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4 index 3bf1a6cd4223..1755ba7678f0 100644 --- a/ext/pdo_dblib/config.m4 +++ b/ext/pdo_dblib/config.m4 @@ -37,7 +37,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]) fi - PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR) + PHP_ADD_INCLUDE([$PDO_FREETDS_INCLUDE_DIR]) PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR, PDO_DBLIB_SHARED_LIBADD) fi diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4 index db1fd23c05b1..1fae0f3f6324 100644 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@ -18,8 +18,8 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then FB_LIBDIR=`$FB_CONFIG --libs` FB_VERSION=`$FB_CONFIG --version` AC_MSG_RESULT(version $FB_VERSION) - PHP_EVAL_LIBLINE($FB_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD) - PHP_EVAL_INCLINE($FB_CFLAGS) + PHP_EVAL_LIBLINE([$FB_LIBDIR], [PDO_FIREBIRD_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$FB_CFLAGS]) else if test "$PHP_PDO_FIREBIRD" = "yes"; then @@ -55,7 +55,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then $FIREBIRD_LIBDIR_FLAG ]) PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, PDO_FIREBIRD_SHARED_LIBADD) - PHP_ADD_INCLUDE($FIREBIRD_INCDIR) + PHP_ADD_INCLUDE([$FIREBIRD_INCDIR]) fi PHP_CHECK_PDO_INCLUDES diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index 6d69362ba6f2..819feafef7ea 100644 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -67,15 +67,15 @@ if test "$PHP_PDO_MYSQL" != "no"; then AC_MSG_ERROR([Unable to find your mysql installation]) fi - PHP_ADD_INCLUDE($PDO_MYSQL_INC_DIR) + PHP_ADD_INCLUDE([$PDO_MYSQL_INC_DIR]) PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR else AC_MSG_RESULT([not found]) AC_MSG_ERROR([Unable to find your mysql installation]) fi - PHP_EVAL_INCLINE($PDO_MYSQL_INCLUDE) - PHP_EVAL_LIBLINE($PDO_MYSQL_LIBS, PDO_MYSQL_SHARED_LIBADD) + PHP_EVAL_INCLINE([$PDO_MYSQL_INCLUDE]) + PHP_EVAL_LIBLINE([$PDO_MYSQL_LIBS], [PDO_MYSQL_SHARED_LIBADD]) fi PHP_CHECK_PDO_INCLUDES diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 index f377f96552cc..77174a38ebdb 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -26,7 +26,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h) fi - PHP_ADD_INCLUDE($READLINE_DIR/include) + PHP_ADD_INCLUDE([$READLINE_DIR/include]) PHP_READLINE_LIBS="" AC_CHECK_LIB(ncurses, tgetent, @@ -91,8 +91,8 @@ elif test "$PHP_LIBEDIT" != "no"; then fi PKG_CHECK_MODULES([EDIT], [libedit]) - PHP_EVAL_LIBLINE($EDIT_LIBS, READLINE_SHARED_LIBADD) - PHP_EVAL_INCLINE($EDIT_CFLAGS) + PHP_EVAL_LIBLINE([$EDIT_LIBS], [READLINE_SHARED_LIBADD]) + PHP_EVAL_INCLINE([$EDIT_CFLAGS]) AC_CHECK_LIB(ncurses, tgetent, [ diff --git a/ext/session/config.m4 b/ext/session/config.m4 index 36314f6db6b5..53692dbafeeb 100644 --- a/ext/session/config.m4 +++ b/ext/session/config.m4 @@ -37,7 +37,7 @@ if test "$PHP_MM" != "no"; then fi PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD) - PHP_ADD_INCLUDE($MM_DIR/include) + PHP_ADD_INCLUDE([$MM_DIR/include]) PHP_INSTALL_HEADERS([ext/session], [mod_mm.h]) AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) fi diff --git a/ext/skeleton/config.m4.in b/ext/skeleton/config.m4.in index 088f171bbbaa..8c97d30ce7be 100644 --- a/ext/skeleton/config.m4.in +++ b/ext/skeleton/config.m4.in @@ -23,8 +23,8 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then dnl Remove this code block if the library does not support pkg-config. dnl PKG_CHECK_MODULES([LIBFOO], [foo]) - dnl PHP_EVAL_INCLINE($LIBFOO_CFLAGS) - dnl PHP_EVAL_LIBLINE($LIBFOO_LIBS, %EXTNAMECAPS%_SHARED_LIBADD) + dnl PHP_EVAL_INCLINE([$LIBFOO_CFLAGS]) + dnl PHP_EVAL_LIBLINE([$LIBFOO_LIBS], [%EXTNAMECAPS%_SHARED_LIBADD]) dnl If you need to check for a particular library version using PKG_CHECK_MODULES, dnl you can use comparison operators. For example: @@ -55,7 +55,7 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then dnl Remove this code block if the library supports pkg-config. dnl --with-%EXTNAME% -> add include path - dnl PHP_ADD_INCLUDE($%EXTNAMECAPS%_DIR/include) + dnl PHP_ADD_INCLUDE([$%EXTNAMECAPS%_DIR/include]) dnl Remove this code block if the library supports pkg-config. dnl --with-%EXTNAME% -> check for lib and symbol presence diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4 index 5ad3766f862a..a285f8b402ba 100644 --- a/ext/snmp/config.m4 +++ b/ext/snmp/config.m4 @@ -23,8 +23,8 @@ if test "$PHP_SNMP" != "no"; then SNMP_VERSION=`expr [$]1 \* 1000 + [$]2` if test "$SNMP_VERSION" -ge "5003"; then if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - PHP_ADD_INCLUDE(${SNMP_PREFIX}/include) - PHP_EVAL_LIBLINE($SNMP_LIBS, SNMP_SHARED_LIBADD) + PHP_ADD_INCLUDE([${SNMP_PREFIX}/include]) + PHP_EVAL_LIBLINE([$SNMP_LIBS], [SNMP_SHARED_LIBADD]) SNMP_LIBNAME=netsnmp else AC_MSG_ERROR([Could not find the required paths. Please check your net-snmp installation.]) diff --git a/ext/sodium/config.m4 b/ext/sodium/config.m4 index 50ccf23573d0..a2fa7108c0ea 100644 --- a/ext/sodium/config.m4 +++ b/ext/sodium/config.m4 @@ -6,8 +6,8 @@ PHP_ARG_WITH([sodium], 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) + PHP_EVAL_INCLINE([$LIBSODIUM_CFLAGS]) + PHP_EVAL_LIBLINE([$LIBSODIUM_LIBS], [SODIUM_SHARED_LIBADD]) AC_DEFINE(HAVE_LIBSODIUMLIB, 1, [ ]) diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index e17ef560b3e3..5da848363e01 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -342,8 +342,8 @@ PHP_ARG_WITH([password-argon2], if test "$PHP_PASSWORD_ARGON2" != "no"; then PKG_CHECK_MODULES([ARGON2], [libargon2]) - PHP_EVAL_INCLINE($ARGON2_CFLAGS) - PHP_EVAL_LIBLINE($ARGON2_LIBS) + PHP_EVAL_INCLINE([$ARGON2_CFLAGS]) + PHP_EVAL_LIBLINE([$ARGON2_LIBS]) AC_DEFINE(HAVE_ARGON2LIB, 1, [ ]) fi diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index f48d25141e2b..1570b70c2284 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -63,7 +63,7 @@ if test "$PHP_TIDY" != "no"; then ], [], []) PHP_ADD_LIBRARY_WITH_PATH($TIDY_LIB_NAME, $TIDY_LIBDIR, TIDY_SHARED_LIBADD) - PHP_ADD_INCLUDE($TIDY_INCDIR) + PHP_ADD_INCLUDE([$TIDY_INCDIR]) dnl Add -Wno-ignored-qualifiers as this is an issue upstream TIDY_COMPILER_FLAGS="$TIDY_CFLAGS -Wno-ignored-qualifiers -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4 index 99674eccca42..6eb8ac209b7a 100644 --- a/ext/xsl/config.m4 +++ b/ext/xsl/config.m4 @@ -15,13 +15,13 @@ if test "$PHP_XSL" != "no"; then PKG_CHECK_MODULES([XSL], [libxslt >= 1.1.0]) - PHP_EVAL_INCLINE($XSL_CFLAGS) - PHP_EVAL_LIBLINE($XSL_LIBS, XSL_SHARED_LIBADD) + PHP_EVAL_INCLINE([$XSL_CFLAGS]) + PHP_EVAL_LIBLINE([$XSL_LIBS], [XSL_SHARED_LIBADD]) PKG_CHECK_MODULES([EXSLT], [libexslt], [ - PHP_EVAL_INCLINE($EXSLT_CFLAGS) - PHP_EVAL_LIBLINE($EXSLT_LIBS, XSL_SHARED_LIBADD) + PHP_EVAL_INCLINE([$EXSLT_CFLAGS]) + PHP_EVAL_LIBLINE([$EXSLT_LIBS], [XSL_SHARED_LIBADD]) AC_DEFINE(HAVE_XSL_EXSLT, 1, [ ]) ], [ ]) diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 7c15d5321103..fc3eb888c2d0 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -6,8 +6,8 @@ PHP_ARG_WITH([zip], if test "$PHP_ZIP" != "no"; then PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0]) - PHP_EVAL_INCLINE($LIBZIP_CFLAGS) - PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD) + PHP_EVAL_INCLINE([$LIBZIP_CFLAGS]) + PHP_EVAL_LIBLINE([$LIBZIP_LIBS], [ZIP_SHARED_LIBADD]) PHP_CHECK_LIBRARY(zip, zip_file_set_mtime, [