tony2001 Tue, 08 Dec 2009 10:15:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291870
Log:
fix build without --prefix and make sure fpm_conf is recompiled every
time one changes --prefix
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/Makefile.frag
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/Makefile.frag
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/Makefile.frag 2009-12-08
10:15:11 UTC (rev 291869)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/Makefile.frag 2009-12-08
10:15:59 UTC (rev 291870)
@@ -3,6 +3,8 @@
$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
$(BUILD_FPM)
+$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
+
install-build: install-fpm
install-fpm: install-sapi
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4 2009-12-08 10:15:11 UTC
(rev 291869)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4 2009-12-08 10:15:59 UTC
(rev 291870)
@@ -534,6 +534,10 @@
php_fpm_conf_path="$PHP_FPM_CONF"
fi
+ if test -z "$prefix" -o "$prefix" = "NONE"; then
+ prefix="/usr/local"
+ fi
+
if test -z "$php_fpm_conf_path"; then
php_fpm_conf_path=`eval echo "$sysconfdir"`
php_fpm_conf_path="$php_fpm_conf_path/php-fpm.conf"
@@ -636,7 +640,7 @@
AC_FPM_CHECKS
AC_FPM_CONF
- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/fpm/Makefile.frag)
+ PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag],
[$abs_srcdir/sapi/fpm], [sapi/fpm])
SAPI_FPM_PATH=sapi/fpm/php-fpm
PHP_SUBST(SAPI_FPM_PATH)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
