Skip to content

Commit 5e27a2a

Browse files
authored
Autotools: Simplify SAPI configure log check messages (#14764)
The PHP_ARG_ENABLE and PHP_ARG_WITH 2nd argument is the check message in the configure log output.
1 parent 2c20811 commit 5e27a2a

File tree

6 files changed

+11
-29
lines changed

6 files changed

+11
-29
lines changed

sapi/apache2handler/config.m4

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
PHP_ARG_WITH([apxs2],,
1+
PHP_ARG_WITH([apxs2],
2+
[whether to build Apache 2 handler module support via DSO through APXS],
23
[AS_HELP_STRING([[--with-apxs2[=FILE]]],
34
[Build shared Apache 2 handler module. FILE is the optional pathname to
45
the Apache apxs tool [apxs]])],
56
[no],
67
[no])
78

8-
AC_MSG_CHECKING([for Apache 2 handler module support via DSO through APXS])
9-
109
if test "$PHP_APXS2" != "no"; then
1110
if test "$PHP_APXS2" = "yes"; then
1211
APXS=apxs
@@ -118,7 +117,4 @@ if test "$PHP_APXS2" != "no"; then
118117
PHP_BUILD_THREAD_SAFE
119118
fi
120119
fi
121-
AC_MSG_RESULT(yes)
122-
else
123-
AC_MSG_RESULT(no)
124120
fi

sapi/cgi/config9.m4

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
PHP_ARG_ENABLE([cgi],,
1+
PHP_ARG_ENABLE([cgi],
2+
[for CGI build],
23
[AS_HELP_STRING([--disable-cgi],
34
[Disable building CGI version of PHP])],
45
[yes],
56
[no])
67

7-
dnl CGI setup.
8-
AC_MSG_CHECKING(for CGI build)
98
if test "$PHP_CGI" != "no"; then
10-
AC_MSG_RESULT(yes)
11-
129
dnl BSD systems.
1310
AC_CHECK_MEMBERS([struct sockaddr_un.sun_len],,,[#include <sys/un.h>])
1411

@@ -59,6 +56,4 @@ if test "$PHP_CGI" != "no"; then
5956
PHP_SUBST([BUILD_CGI])
6057

6158
PHP_OUTPUT(sapi/cgi/php-cgi.1)
62-
else
63-
AC_MSG_RESULT(no)
6459
fi

sapi/cli/config.m4

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
PHP_ARG_ENABLE([cli],,
1+
PHP_ARG_ENABLE([cli],
2+
[for CLI build],
23
[AS_HELP_STRING([--disable-cli],
34
[Disable building CLI version of PHP (this forces --without-pear)])],
45
[yes],
@@ -20,7 +21,6 @@ if test "$cli_cv_var_PS_STRINGS" = yes ; then
2021
AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS thing exists.])
2122
fi
2223

23-
AC_MSG_CHECKING(for CLI build)
2424
if test "$PHP_CLI" != "no"; then
2525
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag)
2626

@@ -57,4 +57,3 @@ if test "$PHP_CLI" != "no"; then
5757

5858
PHP_INSTALL_HEADERS([sapi/cli], [cli.h])
5959
fi
60-
AC_MSG_RESULT($PHP_CLI)

sapi/embed/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ if test "$PHP_EMBED" != "no"; then
3131
AC_MSG_RESULT([$PHP_EMBED_TYPE])
3232
AC_SUBST([PHP_EMBED_TYPE])
3333
else
34-
AC_MSG_RESULT(no)
34+
AC_MSG_RESULT([no])
3535
fi

sapi/fpm/config.m4

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
PHP_ARG_ENABLE([fpm],,
1+
PHP_ARG_ENABLE([fpm],
2+
[for FPM build],
23
[AS_HELP_STRING([--enable-fpm],
34
[Enable building of the fpm SAPI executable])],
45
[no],
@@ -416,10 +417,7 @@ AS_VAR_IF([php_cv_have_select], [yes],
416417
[Define to 1 if system has a working 'select' function.])])
417418
])
418419

419-
AC_MSG_CHECKING(for FPM build)
420420
if test "$PHP_FPM" != "no"; then
421-
AC_MSG_RESULT($PHP_FPM)
422-
423421
PHP_FPM_CLOCK
424422
PHP_FPM_TRACE
425423
PHP_FPM_BUILTIN_ATOMIC
@@ -635,7 +633,4 @@ if test "$PHP_FPM" != "no"; then
635633

636634
PHP_SUBST([SAPI_FPM_PATH])
637635
PHP_SUBST([BUILD_FPM])
638-
639-
else
640-
AC_MSG_RESULT(no)
641636
fi

sapi/litespeed/config.m4

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
AC_MSG_CHECKING(for LiteSpeed support)
2-
3-
PHP_ARG_ENABLE([litespeed],,
1+
PHP_ARG_ENABLE([litespeed],
2+
[for LiteSpeed support],
43
[AS_HELP_STRING([--enable-litespeed],
54
[Build PHP as litespeed module])],
65
[no])
@@ -25,5 +24,3 @@ if test "$PHP_LITESPEED" != "no"; then
2524
PHP_SUBST([SAPI_LITESPEED_PATH])
2625
PHP_SUBST([BUILD_LITESPEED])
2726
fi
28-
29-
AC_MSG_RESULT($PHP_LITESPEED)

0 commit comments

Comments
 (0)