Skip to content

Commit 6daf84b

Browse files
dreamcat4dreamcat four
dreamcat4
authored and
dreamcat four
committed
(fix) AC_OUTPUT fails when $php_fpm_conf and $php_fpm_init aren't set
1 parent af22161 commit 6daf84b

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

‎Makefile.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
5959
configure.lineno configure.status.lineno
6060
mkinstalldirs = $(install_sh) -d
6161
CONFIG_HEADER = fpm_autoconfig.h
62-
CONFIG_CLEAN_FILES = $php_fpm_conf init.d.$php_fpm_init \
62+
CONFIG_CLEAN_FILES = php_fpm.conf init.d.php_fpm \
6363
nginx-site-conf.sample $php_fpm_bin.1
6464
am__EXEEXT_1 = @php_fpm_bin@
6565
am__installdirs = "$(DESTDIR)$(bindir)"
@@ -294,9 +294,9 @@ $(srcdir)/fpm_autoconfig.h.in: $(am__configure_deps)
294294

295295
distclean-hdr:
296296
-rm -f fpm_autoconfig.h stamp-h1
297-
$php_fpm_conf: $(top_builddir)/config.status $(top_srcdir)/conf/php-fpm.conf.in
297+
php_fpm.conf: $(top_builddir)/config.status $(top_srcdir)/conf/php-fpm.conf.in
298298
cd $(top_builddir) && $(SHELL) ./config.status $@
299-
init.d.$php_fpm_init: $(top_builddir)/config.status $(top_srcdir)/conf/init.d.php-fpm.in
299+
init.d.php_fpm: $(top_builddir)/config.status $(top_srcdir)/conf/init.d.php-fpm.in
300300
cd $(top_builddir) && $(SHELL) ./config.status $@
301301
nginx-site-conf.sample: $(top_builddir)/config.status $(top_srcdir)/conf/nginx-site-conf.sample.in
302302
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -747,7 +747,7 @@ install-fpm: $(php_fpm_bin)
747747
$(INSTALL_DATA) $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old
748748

749749
@test "$(php_fpm_conf)" && \
750-
$(INSTALL_DATA) $(php_fpm_conf) $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
750+
$(INSTALL_DATA) php_fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
751751
ln -sf $(INSTALL_ROOT)$(php_fpm_conf_path).default $(INSTALL_ROOT)$(php_fpm_conf_path)
752752

753753
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man1/$(php_fpm_bin)$(program_suffix).1"
@@ -757,7 +757,7 @@ install-fpm: $(php_fpm_bin)
757757
@test "$(php_fpm_init)" && \
758758
echo "Installing PHP FPM init script: $(INSTALL_ROOT)$(php_fpm_init_path)" && \
759759
$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_init_dir) && \
760-
$(INSTALL) -m 0755 init.d.$(php_fpm_init) $(INSTALL_ROOT)$(php_fpm_init_path)
760+
$(INSTALL) -m 0755 init.d.php_fpm $(INSTALL_ROOT)$(php_fpm_init_path)
761761

762762
@test -d /etc/nginx/ && \
763763
echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \

‎ac/Makefile.frag

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ install-fpm: $(SAPI_FPM_PATH)
2121
$(INSTALL_DATA) $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old
2222

2323
@test "$(php_fpm_conf)" && \
24-
$(INSTALL_DATA) sapi/fpm/$(php_fpm_conf) $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
24+
$(INSTALL_DATA) sapi/fpm/php_fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
2525
ln -sf $(INSTALL_ROOT)$(php_fpm_conf_path).default $(INSTALL_ROOT)$(php_fpm_conf_path)
2626

2727
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man1/$(php_fpm_bin)$(program_suffix).1"
@@ -31,7 +31,7 @@ install-fpm: $(SAPI_FPM_PATH)
3131
@test "$(php_fpm_init)" && \
3232
echo "Installing PHP FPM init script: $(INSTALL_ROOT)$(php_fpm_init_path)" && \
3333
$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_init_dir) && \
34-
$(INSTALL) -m 0755 sapi/fpm/init.d.$(php_fpm_init) $(INSTALL_ROOT)$(php_fpm_init_path)
34+
$(INSTALL) -m 0755 sapi/fpm/init.d.php_fpm $(INSTALL_ROOT)$(php_fpm_init_path)
3535

3636
@test -d /etc/nginx/ && \
3737
echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \

‎ac/fpm_conf.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ AC_DEFUN([AC_FPM_VARS],
172172

173173
AC_DEFUN([AC_FPM_OUTPUT],
174174
[
175-
PHP_OUTPUT(sapi/fpm/$php_fpm_conf:sapi/fpm/conf/php-fpm.conf.in)
176-
PHP_OUTPUT(sapi/fpm/init.d.$php_fpm_init:sapi/fpm/conf/init.d.php-fpm.in)
175+
PHP_OUTPUT(sapi/fpm/php_fpm.conf:sapi/fpm/conf/php-fpm.conf.in)
176+
PHP_OUTPUT(sapi/fpm/init.d.php_fpm:sapi/fpm/conf/init.d.php-fpm.in)
177177
PHP_OUTPUT(sapi/fpm/nginx-site-conf.sample:sapi/fpm/conf/nginx-site-conf.sample.in)
178178
PHP_OUTPUT(sapi/fpm/$php_fpm_bin.1:sapi/fpm/man/php-fpm.1.in)
179179
])

‎configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23313,7 +23313,7 @@ _ACEOF
2331323313

2331423314

2331523315

23316-
ac_config_files="$ac_config_files $php_fpm_conf:conf/php-fpm.conf.in init.d.$php_fpm_init:conf/init.d.php-fpm.in nginx-site-conf.sample:conf/nginx-site-conf.sample.in $php_fpm_bin.1:man/php-fpm.1.in"
23316+
ac_config_files="$ac_config_files php_fpm.conf:conf/php-fpm.conf.in init.d.php_fpm:conf/init.d.php-fpm.in nginx-site-conf.sample:conf/nginx-site-conf.sample.in $php_fpm_bin.1:man/php-fpm.1.in"
2331723317
cat >confcache <<\_ACEOF
2331823318
# This file is a shell script that caches the results of configure
2331923319
# tests run on this system so they can be shared between configure
@@ -23901,8 +23901,8 @@ do
2390123901
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
2390223902
"cgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES cgi/Makefile" ;;
2390323903
"fpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES fpm/Makefile" ;;
23904-
"$php_fpm_conf" ) CONFIG_FILES="$CONFIG_FILES $php_fpm_conf:conf/php-fpm.conf.in" ;;
23905-
"init.d.$php_fpm_init" ) CONFIG_FILES="$CONFIG_FILES init.d.$php_fpm_init:conf/init.d.php-fpm.in" ;;
23904+
"php_fpm.conf" ) CONFIG_FILES="$CONFIG_FILES php_fpm.conf:conf/php-fpm.conf.in" ;;
23905+
"init.d.php_fpm" ) CONFIG_FILES="$CONFIG_FILES init.d.php_fpm:conf/init.d.php-fpm.in" ;;
2390623906
"nginx-site-conf.sample" ) CONFIG_FILES="$CONFIG_FILES nginx-site-conf.sample:conf/nginx-site-conf.sample.in" ;;
2390723907
"$php_fpm_bin.1" ) CONFIG_FILES="$CONFIG_FILES $php_fpm_bin.1:man/php-fpm.1.in" ;;
2390823908
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

‎configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ AC_CONFIG_FILES([Makefile cgi/Makefile fpm/Makefile])
8181

8282

8383
AC_OUTPUT( \
84-
$php_fpm_conf:conf/php-fpm.conf.in \
85-
init.d.$php_fpm_init:conf/init.d.php-fpm.in \
84+
php_fpm.conf:conf/php-fpm.conf.in \
85+
init.d.php_fpm:conf/init.d.php-fpm.in \
8686
nginx-site-conf.sample:conf/nginx-site-conf.sample.in \
8787
$php_fpm_bin.1:man/php-fpm.1.in \
8888
)

‎m4/Makefile.frag

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ install-fpm: $(php_fpm_bin)
2121
$(INSTALL_DATA) $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old
2222

2323
@test "$(php_fpm_conf)" && \
24-
$(INSTALL_DATA) $(php_fpm_conf) $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
24+
$(INSTALL_DATA) php_fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
2525
ln -sf $(INSTALL_ROOT)$(php_fpm_conf_path).default $(INSTALL_ROOT)$(php_fpm_conf_path)
2626

2727
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man1/$(php_fpm_bin)$(program_suffix).1"
@@ -31,7 +31,7 @@ install-fpm: $(php_fpm_bin)
3131
@test "$(php_fpm_init)" && \
3232
echo "Installing PHP FPM init script: $(INSTALL_ROOT)$(php_fpm_init_path)" && \
3333
$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_init_dir) && \
34-
$(INSTALL) -m 0755 init.d.$(php_fpm_init) $(INSTALL_ROOT)$(php_fpm_init_path)
34+
$(INSTALL) -m 0755 init.d.php_fpm $(INSTALL_ROOT)$(php_fpm_init_path)
3535

3636
@test -d /etc/nginx/ && \
3737
echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \

0 commit comments

Comments
 (0)