Skip to content
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
13 changes: 6 additions & 7 deletions build/php.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ AC_DEFUN([_PHP_CHECK_SIZEOF], [
LIBS=
old_LDFLAGS=$LDFLAGS
LDFLAGS=
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <inttypes.h>
Expand All @@ -1065,7 +1065,7 @@ int main(void)
fprintf(fp, "%d\n", sizeof($1));
return(0);
}
]])], [
])], [
eval $php_cache_value=`cat conftestval`
], [
eval $php_cache_value=0
Expand Down Expand Up @@ -1151,7 +1151,7 @@ dnl
dnl Internal.
dnl
AC_DEFUN([PHP_DOES_PWRITE_WORK],[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
Expand All @@ -1168,8 +1168,7 @@ $1
if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) return 1;
return 0;
}

]])],[
])],[
ac_cv_pwrite=yes
],[
ac_cv_pwrite=no
Expand Down Expand Up @@ -1543,14 +1542,14 @@ dnl
AC_DEFUN([PHP_TEST_BUILD], [
old_LIBS=$LIBS
LIBS="$4 $LIBS"
AC_LINK_IFELSE([AC_LANG_SOURCE([[
AC_LINK_IFELSE([AC_LANG_SOURCE([
$5
char $1(void);
int main(void) {
$1();
return 0;
}
]])],[
])],[
LIBS=$old_LIBS
$2
],[
Expand Down
2 changes: 1 addition & 1 deletion ext/hash/config.m4
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PHP_ARG_WITH([mhash],
[for mhash support],
[AS_HELP_STRING([[--with-mhash]],
[AS_HELP_STRING([--with-mhash],
[Include mhash support])])

AS_VAR_IF([PHP_MHASH], [no],, [
Expand Down
4 changes: 2 additions & 2 deletions ext/iconv/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ int main(void) {
[AC_MSG_FAILURE([The iconv check failed, 'errno' is missing.])])

AC_CACHE_CHECK([if iconv supports //IGNORE], [php_cv_iconv_ignore],
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
[AC_RUN_IFELSE([AC_LANG_SOURCE([
#include <iconv.h>
#include <stdlib.h>

Expand All @@ -103,7 +103,7 @@ int main(void) {
}
return 0;
}
]])],
])],
[php_cv_iconv_ignore=yes],
[php_cv_iconv_ignore=no],
[php_cv_iconv_ignore=no])])
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqli/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [

PHP_ARG_WITH([mysqli],
[for MySQLi support],
[AS_HELP_STRING([[--with-mysqli]],
[AS_HELP_STRING([--with-mysqli],
[Include MySQLi support. The MySQL native driver will be used])])

dnl ext/pdo_mysql/config.m4 also depends on this configure option.
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ dnl Check for argon2
dnl
PHP_ARG_WITH([password-argon2],
[for Argon2 support],
[AS_HELP_STRING([[--with-password-argon2]],
[AS_HELP_STRING([--with-password-argon2],
[Include Argon2 support in password_*])])

AS_VAR_IF([PHP_PASSWORD_ARGON2], [no],, [
Expand Down