Skip to content

Commit 2438717

Browse files
authored
Autotools: Sync CS in sapi/cgi (#15407)
- AS_* macros used - Indentation level synced - Obsolete backticks replaced with recommended $(...) (on shells where the "newer" style still doesn't work, for example on Solaris 10 default shell, Autoconf takes care of that by re-executing the script itself)
1 parent d6afe05 commit 2438717

File tree

1 file changed

+43
-53
lines changed

1 file changed

+43
-53
lines changed

sapi/cgi/config9.m4

Lines changed: 43 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,47 @@ PHP_ARG_ENABLE([cgi],
66
[no])
77

88
if test "$PHP_CGI" != "no"; then
9-
dnl BSD systems.
10-
AC_CHECK_MEMBERS([struct sockaddr_un.sun_len],,,[#include <sys/un.h>])
11-
12-
AC_MSG_CHECKING([whether cross-process locking is required by accept()])
13-
case "`uname -sr`" in
14-
SunOS\ 5.*)
15-
AC_MSG_RESULT([yes])
16-
AC_DEFINE([USE_LOCKING], [1],
17-
[Define to 1 if cross-process locking is required by 'accept()'.])
18-
;;
19-
*)
20-
AC_MSG_RESULT([no])
21-
;;
22-
esac
23-
24-
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/cgi/Makefile.frag])
25-
26-
dnl Set filename.
27-
case $host_alias in
28-
*cygwin* )
29-
SAPI_CGI_PATH=sapi/cgi/php-cgi.exe
30-
;;
31-
* )
32-
SAPI_CGI_PATH=sapi/cgi/php-cgi
33-
;;
34-
esac
35-
36-
dnl Select SAPI.
37-
PHP_SELECT_SAPI([cgi],
38-
[program],
39-
[cgi_main.c],
40-
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
41-
42-
case $host_alias in
43-
*aix*)
44-
if test "$php_sapi_module" = "shared"; then
45-
BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
46-
else
47-
BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
48-
fi
49-
;;
50-
*darwin*)
51-
BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
52-
;;
53-
*)
54-
BUILD_CGI="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
55-
;;
56-
esac
57-
58-
PHP_SUBST([SAPI_CGI_PATH])
59-
PHP_SUBST([BUILD_CGI])
60-
61-
AC_CONFIG_FILES([sapi/cgi/php-cgi.1])
9+
dnl BSD systems.
10+
AC_CHECK_MEMBERS([struct sockaddr_un.sun_len],,,[#include <sys/un.h>])
11+
12+
AC_MSG_CHECKING([whether cross-process locking is required by accept()])
13+
AS_CASE([$(uname -sr)],
14+
[SunOS\ 5.*], [
15+
AC_MSG_RESULT([yes])
16+
AC_DEFINE([USE_LOCKING], [1],
17+
[Define to 1 if cross-process locking is required by 'accept()'.])
18+
],
19+
[AC_MSG_RESULT([no])])
20+
21+
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/cgi/Makefile.frag])
22+
23+
dnl Set filename.
24+
AS_CASE([$host_alias],
25+
[*cygwin*], [SAPI_CGI_PATH=sapi/cgi/php-cgi.exe],
26+
[SAPI_CGI_PATH=sapi/cgi/php-cgi])
27+
28+
dnl Select SAPI.
29+
PHP_SELECT_SAPI([cgi],
30+
[program],
31+
[cgi_main.c],
32+
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
33+
34+
AS_CASE([$host_alias],
35+
[*aix*], [
36+
AS_VAR_IF([php_sapi_module], [shared], [
37+
BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
38+
], [
39+
BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
40+
])
41+
],
42+
[*darwin*], [
43+
BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
44+
], [
45+
BUILD_CGI="\$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
46+
])
47+
48+
PHP_SUBST([SAPI_CGI_PATH])
49+
PHP_SUBST([BUILD_CGI])
50+
51+
AC_CONFIG_FILES([sapi/cgi/php-cgi.1])
6252
fi

0 commit comments

Comments
 (0)