Skip to content

Autotools: Quote M4 arguments #15045

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.

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 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions Zend/Zend.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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])
], [])
])

Expand Down Expand Up @@ -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,[ ])
Expand Down
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -238,24 +238,24 @@ 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

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
Expand Down
10 changes: 5 additions & 5 deletions ext/bz2/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
])
Expand Down
16 changes: 8 additions & 8 deletions ext/dba/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
])
Expand Down Expand Up @@ -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])
])
Expand All @@ -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])
])
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion ext/fileinfo/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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"
])

Expand Down
4 changes: 2 additions & 2 deletions ext/gettext/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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])
])
]
)
Expand Down
2 changes: 1 addition & 1 deletion ext/gmp/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ext/hash/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
16 changes: 8 additions & 8 deletions ext/iconv/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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/libc-version.h>]], [[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 <iconv.h>], [(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.h>]], [[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 <iconv.h>]], [[cstoccsid("");]])],[
AC_MSG_RESULT(yes)
AC_MSG_RESULT([yes])
iconv_impl_name="ibm"
],[
AC_MSG_RESULT(no)
AC_MSG_RESULT([no])
])
fi

Expand Down
4 changes: 2 additions & 2 deletions ext/ldap/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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])
Expand Down
Loading
Loading