Skip to content

Commit

Permalink
(fix) AC_OUTPUT fails when $php_fpm_conf and $php_fpm_init aren't set
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreamcat4
dreamcat4 authored and dreamcat four committed Oct 18, 2009
1 parent af22161 commit 6daf84b
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = fpm_autoconfig.h
CONFIG_CLEAN_FILES = $php_fpm_conf init.d.$php_fpm_init \
CONFIG_CLEAN_FILES = php_fpm.conf init.d.php_fpm \
nginx-site-conf.sample $php_fpm_bin.1
am__EXEEXT_1 = @php_fpm_bin@
am__installdirs = "$(DESTDIR)$(bindir)"
Expand Down Expand Up @@ -294,9 +294,9 @@ $(srcdir)/fpm_autoconfig.h.in: $(am__configure_deps)

distclean-hdr:
-rm -f fpm_autoconfig.h stamp-h1
$php_fpm_conf: $(top_builddir)/config.status $(top_srcdir)/conf/php-fpm.conf.in
php_fpm.conf: $(top_builddir)/config.status $(top_srcdir)/conf/php-fpm.conf.in
cd $(top_builddir) && $(SHELL) ./config.status $@
init.d.$php_fpm_init: $(top_builddir)/config.status $(top_srcdir)/conf/init.d.php-fpm.in
init.d.php_fpm: $(top_builddir)/config.status $(top_srcdir)/conf/init.d.php-fpm.in
cd $(top_builddir) && $(SHELL) ./config.status $@
nginx-site-conf.sample: $(top_builddir)/config.status $(top_srcdir)/conf/nginx-site-conf.sample.in
cd $(top_builddir) && $(SHELL) ./config.status $@
Expand Down Expand Up @@ -747,7 +747,7 @@ install-fpm: $(php_fpm_bin)
$(INSTALL_DATA) $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old

@test "$(php_fpm_conf)" && \
$(INSTALL_DATA) $(php_fpm_conf) $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
$(INSTALL_DATA) php_fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
ln -sf $(INSTALL_ROOT)$(php_fpm_conf_path).default $(INSTALL_ROOT)$(php_fpm_conf_path)

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

@test -d /etc/nginx/ && \
echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \
Expand Down
4 changes: 2 additions & 2 deletions ac/Makefile.frag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ install-fpm: $(SAPI_FPM_PATH)
$(INSTALL_DATA) $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old

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

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

@test -d /etc/nginx/ && \
echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \
Expand Down
4 changes: 2 additions & 2 deletions ac/fpm_conf.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ AC_DEFUN([AC_FPM_VARS],

AC_DEFUN([AC_FPM_OUTPUT],
[
PHP_OUTPUT(sapi/fpm/$php_fpm_conf:sapi/fpm/conf/php-fpm.conf.in)
PHP_OUTPUT(sapi/fpm/init.d.$php_fpm_init:sapi/fpm/conf/init.d.php-fpm.in)
PHP_OUTPUT(sapi/fpm/php_fpm.conf:sapi/fpm/conf/php-fpm.conf.in)
PHP_OUTPUT(sapi/fpm/init.d.php_fpm:sapi/fpm/conf/init.d.php-fpm.in)
PHP_OUTPUT(sapi/fpm/nginx-site-conf.sample:sapi/fpm/conf/nginx-site-conf.sample.in)
PHP_OUTPUT(sapi/fpm/$php_fpm_bin.1:sapi/fpm/man/php-fpm.1.in)
])
Expand Down
6 changes: 3 additions & 3 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23313,7 +23313,7 @@ _ACEOF



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"
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"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
Expand Down Expand Up @@ -23901,8 +23901,8 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"cgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES cgi/Makefile" ;;
"fpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES fpm/Makefile" ;;
"$php_fpm_conf" ) CONFIG_FILES="$CONFIG_FILES $php_fpm_conf:conf/php-fpm.conf.in" ;;
"init.d.$php_fpm_init" ) CONFIG_FILES="$CONFIG_FILES init.d.$php_fpm_init:conf/init.d.php-fpm.in" ;;
"php_fpm.conf" ) CONFIG_FILES="$CONFIG_FILES php_fpm.conf:conf/php-fpm.conf.in" ;;
"init.d.php_fpm" ) CONFIG_FILES="$CONFIG_FILES init.d.php_fpm:conf/init.d.php-fpm.in" ;;
"nginx-site-conf.sample" ) CONFIG_FILES="$CONFIG_FILES nginx-site-conf.sample:conf/nginx-site-conf.sample.in" ;;
"$php_fpm_bin.1" ) CONFIG_FILES="$CONFIG_FILES $php_fpm_bin.1:man/php-fpm.1.in" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ AC_CONFIG_FILES([Makefile cgi/Makefile fpm/Makefile])


AC_OUTPUT( \
$php_fpm_conf:conf/php-fpm.conf.in \
init.d.$php_fpm_init:conf/init.d.php-fpm.in \
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 \
)
Expand Down
4 changes: 2 additions & 2 deletions m4/Makefile.frag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ install-fpm: $(php_fpm_bin)
$(INSTALL_DATA) $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old

@test "$(php_fpm_conf)" && \
$(INSTALL_DATA) $(php_fpm_conf) $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
$(INSTALL_DATA) php_fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
ln -sf $(INSTALL_ROOT)$(php_fpm_conf_path).default $(INSTALL_ROOT)$(php_fpm_conf_path)

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

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

0 comments on commit 6daf84b

Please sign in to comment.