From e33e3008af6cc82bf6f1909a12aaa9cfb1f64e78 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 20 Jul 2024 22:42:15 +0200 Subject: [PATCH] Autotools: Quote M4 arguments - AC_MSG_CHECKING - AC_MSG_RESULT - AC_MSG_WARN - AC_MSG_ERROR --- Zend/Zend.m4 | 14 +++++------ configure.ac | 10 ++++---- ext/bz2/config.m4 | 10 ++++---- ext/dba/config.m4 | 16 ++++++------ ext/fileinfo/config.m4 | 2 +- ext/gettext/config.m4 | 4 +-- ext/gmp/config.m4 | 2 +- ext/hash/config.m4 | 2 +- ext/iconv/config.m4 | 16 ++++++------ ext/ldap/config.m4 | 4 +-- ext/odbc/config.m4 | 50 +++++++++++++++++++------------------- ext/pdo_dblib/config.m4 | 4 +-- ext/pdo_firebird/config.m4 | 4 +-- ext/pdo_mysql/config.m4 | 2 +- ext/readline/config.m4 | 6 ++--- ext/session/config.m4 | 4 +-- ext/skeleton/config.m4.in | 2 +- ext/tidy/config.m4 | 2 +- ext/zip/config.m4 | 4 +-- sapi/fuzzer/config.m4 | 2 +- 20 files changed, 80 insertions(+), 80 deletions(-) diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 6aafc1629da0..99a1bd655ad7 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -119,12 +119,12 @@ dnl AC_DEFUN([ZEND_DLSYM_CHECK], [dnl AC_MSG_CHECKING([whether dlsym() requires a leading underscore in symbol names]) _LT_AC_TRY_DLOPEN_SELF([ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ], [ - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, 1, [Define if dlsym() requires a leading underscore in symbol names. ]) ], [ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ], []) ]) @@ -166,11 +166,11 @@ ZEND_DLSYM_CHECK ZEND_CHECK_GLOBAL_REGISTER_VARIABLES ZEND_CHECK_CPUID_COUNT -AC_MSG_CHECKING(whether to enable thread-safety) -AC_MSG_RESULT($ZEND_ZTS) +AC_MSG_CHECKING([whether to enable thread-safety]) +AC_MSG_RESULT([$ZEND_ZTS]) -AC_MSG_CHECKING(whether to enable Zend debugging) -AC_MSG_RESULT($ZEND_DEBUG) +AC_MSG_CHECKING([whether to enable Zend debugging]) +AC_MSG_RESULT([$ZEND_DEBUG]) if test "$ZEND_DEBUG" = "yes"; then AC_DEFINE(ZEND_DEBUG,1,[ ]) diff --git a/configure.ac b/configure.ac index 749bd739da59..84dab9f5cc4d 100644 --- a/configure.ac +++ b/configure.ac @@ -238,13 +238,13 @@ case $host_alias in i?86-*-linux*|i?86-*-freebsd*) if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then with_pic=no - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi ;; *) - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ;; esac @@ -252,10 +252,10 @@ dnl Detect musl libc AC_MSG_CHECKING([whether we are using musl libc]) if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl then - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) AC_DEFINE([__MUSL__], [1], [Define when using musl libc]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi dnl Add _GNU_SOURCE compile definition because the php_config.h with definitions diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4 index 5330f4b371d3..ec5f6a914343 100644 --- a/ext/bz2/config.m4 +++ b/ext/bz2/config.m4 @@ -7,19 +7,19 @@ if test "$PHP_BZ2" != "no"; then if test -r $PHP_BZ2/include/bzlib.h; then BZIP_DIR=$PHP_BZ2 else - AC_MSG_CHECKING(for BZip2 in default path) + AC_MSG_CHECKING([for BZip2 in default path]) for i in /usr/local /usr; do if test -r $i/include/bzlib.h; then BZIP_DIR=$i - AC_MSG_RESULT(found in $i) + AC_MSG_RESULT([found in $i]) break fi done fi if test -z "$BZIP_DIR"; then - AC_MSG_RESULT(not found) - AC_MSG_ERROR(Please reinstall the BZip2 distribution) + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([Please reinstall the BZip2 distribution]) fi PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, @@ -28,7 +28,7 @@ if test "$PHP_BZ2" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/$PHP_LIBDIR, BZ2_SHARED_LIBADD) AC_DEFINE(HAVE_BZ2,1,[ ]) ], [ - AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0) + AC_MSG_ERROR([bz2 module requires libbz2 >= 1.0.0]) ], [ -L$BZIP_DIR/$PHP_LIBDIR ]) diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index 79ef68beb1b9..008c12fe3a80 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -48,14 +48,14 @@ AC_DEFUN([PHP_DBA_STD_RESULT],[ fi AC_MSG_CHECKING([for $THIS_FULL_NAME support]) if test -n "$3"; then - AC_MSG_ERROR($3) + AC_MSG_ERROR([$3]) fi if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then HAVE_DBA=1 eval HAVE_$THIS_NAME=1 AC_MSG_RESULT([$THIS_RESULT]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi unset THIS_RESULT THIS_NAME THIS_FULL_NAME ]) @@ -335,7 +335,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[ yes #endif ],[ - AC_MSG_RESULT(ok) + AC_MSG_RESULT([ok]) ],[ AC_MSG_ERROR([Version 4.1 requires patch level 25]) ]) @@ -348,7 +348,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[ yes #endif ],[ - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) ],[ AC_MSG_ERROR([At least version 3.3 is required]) ]) @@ -589,14 +589,14 @@ if test "$PHP_DBM" != "no"; then if test -n "$THIS_INCLUDE"; then for LIB in dbm c gdbm; do PHP_CHECK_LIBRARY($LIB, dbminit, [ - AC_MSG_CHECKING(for DBM using GDBM) + AC_MSG_CHECKING([for DBM using GDBM]) AC_DEFINE_UNQUOTED(DBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) if test "$LIB" = "gdbm"; then AC_DEFINE_UNQUOTED(DBM_VERSION, "GDBM", [ ]) - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) else AC_DEFINE_UNQUOTED(DBM_VERSION, "DBM", [ ]) - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi AC_DEFINE(DBA_DBM, 1, [ ]) THIS_LIBS=$LIB @@ -707,5 +707,5 @@ if test "$HAVE_DBA" = "1"; then PHP_ADD_BUILD_DIR([$ext_builddir/libinifile]) PHP_SUBST([DBA_SHARED_LIBADD]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 index e8e460387a42..9e3dd7743518 100644 --- a/ext/fileinfo/config.m4 +++ b/ext/fileinfo/config.m4 @@ -17,7 +17,7 @@ if test "$PHP_FILEINFO" != "no"; then AC_CHECK_HEADERS([sys/sysmacros.h]) AC_CHECK_FUNCS([strcasestr],,[ - AC_MSG_NOTICE(using libmagic strcasestr implementation) + AC_MSG_NOTICE([using libmagic strcasestr implementation]) libmagic_sources="$libmagic_sources libmagic/strcasestr.c" ]) diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 index 0381c9c4b096..d18eddee3c4d 100644 --- a/ext/gettext/config.m4 +++ b/ext/gettext/config.m4 @@ -9,7 +9,7 @@ if test "$PHP_GETTEXT" != "no"; then done if test -z "$GETTEXT_DIR"; then - AC_MSG_ERROR(Cannot locate header file libintl.h) + AC_MSG_ERROR([Cannot locate header file libintl.h]) fi GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR @@ -26,7 +26,7 @@ if test "$PHP_GETTEXT" != "no"; then GETTEXT_LIBS= GETTEXT_CHECK_IN_LIB=c ],[ - AC_MSG_ERROR(Unable to find required gettext library) + AC_MSG_ERROR([Unable to find required gettext library]) ]) ] ) diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4 index 642fe9c4a58f..06ea56925093 100644 --- a/ext/gmp/config.m4 +++ b/ext/gmp/config.m4 @@ -13,7 +13,7 @@ if test "$PHP_GMP" != "no"; then PHP_ADD_LIBRARY(gmp,,GMP_SHARED_LIBADD) else if test ! -f $PHP_GMP/include/gmp.h; then - AC_MSG_ERROR(Unable to locate gmp.h) + AC_MSG_ERROR([Unable to locate gmp.h]) fi PHP_CHECK_LIBRARY(gmp, __gmpz_rootrem, diff --git a/ext/hash/config.m4 b/ext/hash/config.m4 index bca93fcc7b76..af54e360aa69 100644 --- a/ext/hash/config.m4 +++ b/ext/hash/config.m4 @@ -11,7 +11,7 @@ fi if test $ac_cv_c_bigendian_php = yes; then EXT_HASH_SHA3_SOURCES="hash_sha3.c" AC_DEFINE(HAVE_SLOW_HASH3, 1, [Define if hash3 algo is available]) - AC_MSG_WARN("Use SHA3 slow implementation on bigendian") + AC_MSG_WARN([Using SHA3 slow implementation on bigendian]) else AC_CHECK_SIZEOF([long]) AC_MSG_CHECKING([if we're at 64-bit platform]) diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 index a0b9c7927851..57cd2eaab727 100644 --- a/ext/iconv/config.m4 +++ b/ext/iconv/config.m4 @@ -15,39 +15,39 @@ if test "$PHP_ICONV" != "no"; then AC_MSG_CHECKING([if iconv is glibc's]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[gnu_get_libc_version();]])],[ - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) iconv_impl_name="glibc" ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) if test -z "$iconv_impl_name"; then AC_MSG_CHECKING([if using GNU libiconv]) AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [(void) _libiconv_version])],[ - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) iconv_impl_name="gnu_libiconv" ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) fi if test -z "$iconv_impl_name"; then AC_MSG_CHECKING([if iconv is Konstantin Chuguev's]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[iconv_ccs_init(NULL, NULL);]])],[ - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) iconv_impl_name="bsd" ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) fi if test -z "$iconv_impl_name"; then AC_MSG_CHECKING([if using IBM iconv]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[cstoccsid("");]])],[ - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) iconv_impl_name="ibm" ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) fi diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index bef5b85d4350..22ee6afe81cf 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -62,7 +62,7 @@ if test "$PHP_LDAP" != "no"; then fi if test -z "$LDAP_DIR"; then - AC_MSG_ERROR(Cannot find ldap.h) + AC_MSG_ERROR([Cannot find ldap.h]) fi dnl -pc removal is a hack for clang @@ -88,7 +88,7 @@ if test "$PHP_LDAP" != "no"; then AC_DEFINE(HAVE_ORALDAP,1,[ ]) else - AC_MSG_ERROR(Cannot find ldap libraries in $LDAP_LIBDIR.) + AC_MSG_ERROR([Cannot find ldap libraries in $LDAP_LIBDIR.]) fi PHP_ADD_INCLUDE([$LDAP_INCDIR]) diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index f559b82ad040..abac5ba16b90 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -122,7 +122,7 @@ PHP_ARG_WITH([adabas],, AC_DEFINE(HAVE_ADABAS,1,[ ]) AC_MSG_RESULT([$ext_output]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -143,7 +143,7 @@ PHP_ARG_WITH([sapdb],, AC_DEFINE(HAVE_SAPDB,1,[ ]) AC_MSG_RESULT([$ext_output]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -152,7 +152,7 @@ PHP_ARG_WITH([solid],, [AS_HELP_STRING([[--with-solid[=DIR]]], [Include Solid support [/usr/local/solid]])]) - AC_MSG_CHECKING(for Solid support) + AC_MSG_CHECKING([for Solid support]) if test "$PHP_SOLID" != "no"; then if test "$PHP_SOLID" = "yes"; then PHP_SOLID=/usr/local/solid @@ -171,7 +171,7 @@ PHP_ARG_WITH([solid],, AC_MSG_RESULT([$ext_output]) PHP_ODBC_FIND_SOLID_LIBS($ODBC_LIBDIR) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -180,7 +180,7 @@ PHP_ARG_WITH([ibm-db2],, [AS_HELP_STRING([[--with-ibm-db2[=DIR]]], [Include IBM DB2 support [/home/db2inst1/sqllib]])]) - AC_MSG_CHECKING(for IBM DB2 support) + AC_MSG_CHECKING([for IBM DB2 support]) if test "$PHP_IBM_DB2" != "no"; then if test "$PHP_IBM_DB2" = "yes"; then ODBC_INCDIR=/home/db2inst1/sqllib/include @@ -201,7 +201,7 @@ PHP_ARG_WITH([ibm-db2],, AC_DEFINE(HAVE_IBMDB2,1,[ ]) AC_MSG_RESULT([$ext_output]) ], [ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) AC_MSG_ERROR([ build test failed. Please check the config.log for details. You need to source your DB2 environment before running PHP configure: @@ -211,7 +211,7 @@ You need to source your DB2 environment before running PHP configure: $ODBC_LFLAGS $ODBC_LIBS ]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -221,7 +221,7 @@ PHP_ARG_WITH([empress],, [Include Empress support $EMPRESSPATH (Empress Version >= 8.60 required)])]) - AC_MSG_CHECKING(for Empress support) + AC_MSG_CHECKING([for Empress support]) if test "$PHP_EMPRESS" != "no"; then if test "$PHP_EMPRESS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc @@ -237,7 +237,7 @@ PHP_ARG_WITH([empress],, AC_MSG_RESULT([$ext_output]) PHP_ODBC_FIND_EMPRESS_LIBS($ODBC_LIBDIR) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -247,7 +247,7 @@ PHP_ARG_WITH([empress-bcs],, [Include Empress Local Access support $EMPRESSPATH (Empress Version >= 8.60 required)])]) - AC_MSG_CHECKING(for Empress local access support) + AC_MSG_CHECKING([for Empress local access support]) if test "$PHP_EMPRESS_BCS" != "no"; then if test "$PHP_EMPRESS_BCS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc @@ -279,7 +279,7 @@ PHP_ARG_WITH([empress-bcs],, AC_MSG_RESULT([$ext_output]) PHP_ODBC_FIND_EMPRESS_BCS_LIBS($ODBC_LIBDIR) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -293,7 +293,7 @@ PHP_ARG_WITH([custom-odbc],, CPPFLAGS="-DODBC_QNX -DSQLANY_BUG" LDFLAGS=-lunix CUSTOM_ODBC_LIBS="-ldblib -lodbc"])]) - AC_MSG_CHECKING(for a custom ODBC support) + AC_MSG_CHECKING([for a custom ODBC support]) if test "$PHP_CUSTOM_ODBC" != "no"; then if test "$PHP_CUSTOM_ODBC" = "yes"; then PHP_CUSTOM_ODBC=/usr/local @@ -307,7 +307,7 @@ PHP_ARG_WITH([custom-odbc],, AC_DEFINE(HAVE_CODBC,1,[ ]) AC_MSG_RESULT([$ext_output]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -316,15 +316,15 @@ PHP_ARG_WITH([iodbc],, [AS_HELP_STRING([--with-iodbc], [Include iODBC support])]) - AC_MSG_CHECKING(whether to build with iODBC support) + AC_MSG_CHECKING([whether to build with iODBC support]) if test "$PHP_IODBC" != "no"; then - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) PKG_CHECK_MODULES([ODBC], [libiodbc]) PHP_EVAL_INCLINE([$ODBC_CFLAGS]) ODBC_TYPE=iodbc AC_DEFINE(HAVE_IODBC,1,[ ]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -333,7 +333,7 @@ PHP_ARG_WITH([esoob],, [AS_HELP_STRING([[--with-esoob[=DIR]]], [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])]) - AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) + AC_MSG_CHECKING([for Easysoft ODBC-ODBC Bridge support]) if test "$PHP_ESOOB" != "no"; then if test "$PHP_ESOOB" = "yes"; then PHP_ESOOB=/usr/local/easysoft/oob/client @@ -347,7 +347,7 @@ PHP_ARG_WITH([esoob],, AC_DEFINE(HAVE_ESOOB,1,[ ]) AC_MSG_RESULT([$ext_output]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -356,10 +356,10 @@ PHP_ARG_WITH([unixODBC],, [AS_HELP_STRING([--with-unixODBC], [Include unixODBC support])]) - AC_MSG_CHECKING(whether to build with unixODBC support) + AC_MSG_CHECKING([whether to build with unixODBC support]) if test "$PHP_UNIXODBC" != "no"; then if test "$PHP_UNIXODBC" = "yes"; then - AC_MSG_RESULT(yes from pkgconfig) + AC_MSG_RESULT([yes from pkgconfig]) PKG_CHECK_MODULES([ODBC], [odbc]) PHP_EVAL_INCLINE([$ODBC_CFLAGS]) else @@ -370,12 +370,12 @@ PHP_ARG_WITH([unixODBC],, ODBC_CFLAGS=-I$ODBC_INCDIR ODBC_LIBS=-lodbc PHP_ODBC_CHECK_HEADER(sqlext.h) - AC_MSG_RESULT(yes in $PHP_UNIXODBC) + AC_MSG_RESULT([yes in $PHP_UNIXODBC]) fi ODBC_TYPE=unixODBC AC_DEFINE(HAVE_UNIXODBC,1,[ ]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -384,7 +384,7 @@ PHP_ARG_WITH([dbmaker],, [AS_HELP_STRING([[--with-dbmaker[=DIR]]], [Include DBMaker support])]) - AC_MSG_CHECKING(for DBMaker support) + AC_MSG_CHECKING([for DBMaker support]) if test "$PHP_DBMAKER" != "no"; then if test "$PHP_DBMAKER" = "yes"; then dnl Find dbmaker's home directory @@ -427,7 +427,7 @@ PHP_ARG_WITH([dbmaker],, ODBC_STATIC="libphpext_odbc.la" fi else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi fi @@ -458,5 +458,5 @@ if test -n "$ODBC_TYPE"; then PHP_NEW_EXTENSION(odbc, php_odbc.c odbc_utils.c, $ext_shared,, [$ODBC_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1]) else AC_MSG_CHECKING([for any ODBC driver support]) - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4 index 1755ba7678f0..7162e0a4ad7c 100644 --- a/ext/pdo_dblib/config.m4 +++ b/ext/pdo_dblib/config.m4 @@ -26,7 +26,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds else - AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory) + AC_MSG_ERROR([Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory]) fi if test "x$PHP_LIBDIR" = "x" ; then @@ -34,7 +34,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then fi if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then - AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]) + AC_MSG_ERROR([[Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so]]]) fi PHP_ADD_INCLUDE([$PDO_FREETDS_INCLUDE_DIR]) diff --git a/ext/pdo_firebird/config.m4 b/ext/pdo_firebird/config.m4 index 1fae0f3f6324..951579aa4d46 100644 --- a/ext/pdo_firebird/config.m4 +++ b/ext/pdo_firebird/config.m4 @@ -13,11 +13,11 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then AC_PATH_PROG(FB_CONFIG, fb_config, no) if test -x "$FB_CONFIG" && test "$PHP_PDO_FIREBIRD" = "yes"; then - AC_MSG_CHECKING(for libfbconfig) + AC_MSG_CHECKING([for libfbconfig]) FB_CFLAGS=`$FB_CONFIG --cflags` FB_LIBDIR=`$FB_CONFIG --libs` FB_VERSION=`$FB_CONFIG --version` - AC_MSG_RESULT(version $FB_VERSION) + AC_MSG_RESULT([version $FB_VERSION]) PHP_EVAL_LIBLINE([$FB_LIBDIR], [PDO_FIREBIRD_SHARED_LIBADD]) PHP_EVAL_INCLINE([$FB_CFLAGS]) diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index 819feafef7ea..4b3b79e3ada5 100644 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -43,7 +43,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then else AC_MSG_CHECKING([for mysql_config]) if test -n "$PDO_MYSQL_CONFIG"; then - AC_MSG_RESULT($PDO_MYSQL_CONFIG) + AC_MSG_RESULT([$PDO_MYSQL_CONFIG]) PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"` PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"` elif test -n "$PDO_MYSQL_DIR"; then diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 index 77174a38ebdb..629172d531ee 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -23,7 +23,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then done if test -z "$READLINE_DIR"; then - AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h) + AC_MSG_ERROR([Please reinstall readline - I cannot find readline.h]) fi PHP_ADD_INCLUDE([$READLINE_DIR/include]) @@ -45,7 +45,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then [ PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ - AC_MSG_ERROR(readline library not found) + AC_MSG_ERROR([readline library not found]) ], [ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) @@ -107,7 +107,7 @@ elif test "$PHP_LIBEDIT" != "no"; then PHP_CHECK_LIBRARY(edit, readline, [ ], [ - AC_MSG_ERROR(edit library required by readline not found) + AC_MSG_ERROR([edit library required by readline not found]) ], [ $READLINE_SHARED_LIBADD ]) diff --git a/ext/session/config.m4 b/ext/session/config.m4 index 53692dbafeeb..a50bba7553fb 100644 --- a/ext/session/config.m4 +++ b/ext/session/config.m4 @@ -28,12 +28,12 @@ if test "$PHP_MM" != "no"; then done if test -z "$MM_DIR" ; then - AC_MSG_ERROR(cannot find mm library) + AC_MSG_ERROR([cannot find mm library]) fi if test "$PHP_THREAD_SAFETY" = "yes"; then dnl The mm library is not thread-safe, and mod_mm.c refuses to compile. - AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts) + AC_MSG_ERROR([--with-mm cannot be combined with --enable-zts]) fi PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD) diff --git a/ext/skeleton/config.m4.in b/ext/skeleton/config.m4.in index 8c97d30ce7be..27caa4f9a90b 100644 --- a/ext/skeleton/config.m4.in +++ b/ext/skeleton/config.m4.in @@ -43,7 +43,7 @@ if test "$PHP_%EXTNAMECAPS%" != "no"; then dnl for i in $SEARCH_PATH ; do dnl if test -r $i/$SEARCH_FOR; then dnl %EXTNAMECAPS%_DIR=$i - dnl AC_MSG_RESULT(found in $i) + dnl AC_MSG_RESULT([found in $i]) dnl fi dnl done dnl fi diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index 1570b70c2284..9a8ee94d616f 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -28,7 +28,7 @@ if test "$PHP_TIDY" != "no"; then done if test -z "$TIDY_DIR"; then - AC_MSG_ERROR(Cannot find libtidy) + AC_MSG_ERROR([Cannot find libtidy]) else dnl Check for tidybuffio.h (as opposed to simply buffio.h) which indicates dnl that we are building against tidy-html5 and not the legacy htmltidy. The diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index fc3eb888c2d0..cb4915ed260a 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -13,7 +13,7 @@ if test "$PHP_ZIP" != "no"; then [ AC_DEFINE(HAVE_SET_MTIME, 1, [Libzip >= 1.0.0 with zip_file_set_mtime]) ], [ - AC_MSG_WARN(Libzip >= 1.0.0 needed for setting mtime) + AC_MSG_WARN([Libzip >= 1.0.0 needed for setting mtime]) ], [ $LIBZIP_LIBS ]) @@ -22,7 +22,7 @@ if test "$PHP_ZIP" != "no"; then [ AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support]) ], [ - AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support) + AC_MSG_WARN([Libzip >= 1.2.0 needed for encryption support]) ], [ $LIBZIP_LIBS ]) diff --git a/sapi/fuzzer/config.m4 b/sapi/fuzzer/config.m4 index c25d33a327c9..933b898c37e1 100644 --- a/sapi/fuzzer/config.m4 +++ b/sapi/fuzzer/config.m4 @@ -37,7 +37,7 @@ if test "$PHP_FUZZER" != "no"; then CFLAGS="$CFLAGS -fsanitize=fuzzer-no-link" CXXFLAGS="$CXXFLAGS -fsanitize=fuzzer-no-link" ],[ - AC_MSG_ERROR(Compiler doesn't support -fsanitize=fuzzer-no-link) + AC_MSG_ERROR([Compiler doesn't support -fsanitize=fuzzer-no-link]) ]) else FUZZING_LIB="$LIB_FUZZING_ENGINE"