diff options
| author | Antony Dovgal <tony2001@php.net> | 2009-12-14 10:56:14 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2009-12-14 10:56:14 +0000 |
| commit | 7384cdf3380cc3b5a9fb6dbfd86c6a55a191570b (patch) | |
| tree | ba48ca67cbb7aba4b6b6cbcebd24c840ce8dcfda | |
| parent | 2cce8d78b8d72d8f31bb6f91435c16db05faeaa9 (diff) | |
| download | php-git-7384cdf3380cc3b5a9fb6dbfd86c6a55a191570b.tar.gz | |
get rid of `find` completely
| -rw-r--r-- | sapi/fpm/config.m4 | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index 0f053c189e..f8073c9bb1 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -653,11 +653,8 @@ if test "$PHP_FPM" != "no"; then SAPI_FPM_PATH=sapi/fpm/php-fpm PHP_SUBST(SAPI_FPM_PATH) - mkdir -p sapi/fpm/fpm - PHP_FPM_FILES=`cd $abs_srcdir/sapi/fpm && find fpm/ \( -name *.c \! -name fpm_trace*.c \) -exec printf "{} " \;` - - if test "$fpm_trace_type" ; then - PHP_FPM_TRACE_FILES=`cd $abs_srcdir/sapi/fpm && find fpm/ \( -name fpm_trace.c -or -name fpm_trace_$fpm_trace_type.c \) -exec printf "{} " \;` + if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then + PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c" fi PHP_FPM_CFLAGS="$LIBEVENT_CFLAGS -I$abs_srcdir/sapi/fpm" @@ -666,6 +663,29 @@ if test "$PHP_FPM" != "no"; then PHP_SUBST(SAPI_EXTRA_LIBS) INSTALL_IT=":" + PHP_FPM_FILES="fpm/fastcgi.c \ + fpm/fpm.c \ + fpm/fpm_children.c \ + fpm/fpm_cleanup.c \ + fpm/fpm_clock.c \ + fpm/fpm_conf.c \ + fpm/fpm_env.c \ + fpm/fpm_events.c \ + fpm/fpm_main.c \ + fpm/fpm_php.c \ + fpm/fpm_php_trace.c \ + fpm/fpm_process_ctl.c \ + fpm/fpm_request.c \ + fpm/fpm_shm.c \ + fpm/fpm_shm_slots.c \ + fpm/fpm_signals.c \ + fpm/fpm_sockets.c \ + fpm/fpm_stdio.c \ + fpm/fpm_unix.c \ + fpm/fpm_worker_pool.c \ + fpm/xml_config.c \ + fpm/zlog.c \ + " PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)') case $host_alias in |