svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/ Makefile.frag config.m4 fpm/fpm_conf.c fpm/fpm_php.h init.d.php-fpm.in

tony2001 Tue, 15 Dec 2009 12:51:46 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292164 Log: rewrite configure stuff to use $sbindir and $sysconfdir correctly (with a lot of help from Jani) 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 U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_conf.c U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_php.h U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/init.d.php-fpm.in 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-15 12:44:15 UTC (rev 292163) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/Makefile.frag 2009-12-15 12:51:46 UTC (rev 292164) @@ -8,16 +8,16 @@ install-build: install-fpm install-fpm: install-sapi - @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(bindir)/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) + @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir) @$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_pid_dir) @$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_log_dir) - @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROO)$(bindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT) + @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROO)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT) - @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(php_fpm_conf_dir)/" && \ - $(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_conf_dir) || : + @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \ + $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || : - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_dir)/php-fpm.conf.default || : + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || : @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 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-15 12:44:15 UTC (rev 292163) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4 2009-12-15 12:51:46 UTC (rev 292164) @@ -60,12 +60,12 @@ # Set our flags if we are checking a specific directory. if test -n "$ac_libevent_path" ; then - LIBEVENT_CPPFLAGS="-I$ac_libevent_path/include" - LIBEVENT_LDFLAGS="-L$ac_libevent_path/lib" - LD_LIBRARY_PATH="$ac_libevent_path/lib:$LD_LIBRARY_PATH" + LIBEVENT_CPPFLAGS="-I$ac_libevent_path/include" + LIBEVENT_LDFLAGS="-L$ac_libevent_path/lib" + LD_LIBRARY_PATH="$ac_libevent_path/lib:$LD_LIBRARY_PATH" else - LIBEVENT_CPPFLAGS="" - LIBEVENT_LDFLAGS="" + LIBEVENT_CPPFLAGS="" + LIBEVENT_LDFLAGS="" fi # Required flag for libevent. @@ -173,7 +173,7 @@ if test "$PHP_LIBEVENT_DIR" != "yes" && test "$PHP_LIBEVENT_DIR" != "/usr/local"; then dnl don't try to be too smart, check only $PHP_LIBEVENT_DIR if specified ac_libevent_path=$PHP_LIBEVENT_DIR - AC_LIB_EVENT_DO_CHECK + AC_LIB_EVENT_DO_CHECK if test "$success" = "no"; then AC_MSG_ERROR([Could not find libevent >= $WANT_LIBEVENT_VERSION in $PHP_LIBEVENT_DIR]) fi @@ -196,7 +196,7 @@ ac_have_libevent=yes AC_DEFINE(HAVE_LIBEVENT, 1, [define if libevent is available]) fi - + LIBEVENT_LIBS="-levent" if test -n "$ac_libevent_path"; then @@ -509,9 +509,6 @@ dnl configure options {{{ AC_DEFUN([AC_FPM_ARGS], [ - PHP_ARG_WITH(fpm-conf,, - [ --with-fpm-conf[=PATH] Set the path for php-fpm configuration file. (default: \$sysconfdir/php-fpm.conf)], yes, no) - PHP_ARG_WITH(fpm-log,, [ --with-fpm-log[=PATH] Set the path for php-fpm log file. (default: /var/log/php-fpm.log)], yes, no) @@ -528,36 +525,6 @@ AC_DEFUN([AC_FPM_VARS], [ - if test -z "$PHP_FPM_CONF" -o "$PHP_FPM_CONF" = "yes" -o "$PHP_FPM_CONF" = "no"; then - php_fpm_conf_path="" - else - php_fpm_conf_path="$PHP_FPM_CONF" - fi - - if test -z "$prefix" -o "$prefix" = "NONE"; then - prefix="/usr/local" - fi - - if test -z "$exec_prefix" -o "$exec_prefix" = "NONE"; then - exec_prefix=eval echo "$prefix" - fi - - php_fpm_bin_path=eval echo "$bindir" - php_fpm_bin_path="$php_fpm_bin_path/php-fpm" - - 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" - fi - - if test -d "$php_fpm_conf_path"; then - php_fpm_conf_dir="$php_fpm_conf" - php_fpm_conf="$php_fpm_conf/php-fpm.conf" - else - php_fpm_conf_dir=dirname $php_fpm_conf_path - php_fpm_conf=basename $php_fpm_conf_path - fi - if test -z "$PHP_FPM_LOG" -o "$PHP_FPM_LOG" = "yes" -o "$PHP_FPM_LOG" = "no"; then php_fpm_log_path="/var/log/php-fpm.log" else @@ -586,9 +553,6 @@ PHP_SUBST_OLD(fpm_version) - PHP_SUBST_OLD(php_fpm_conf_dir) - PHP_SUBST_OLD(php_fpm_conf_path) - PHP_SUBST_OLD(php_fpm_bin_path) PHP_SUBST_OLD(php_fpm_log_path) PHP_SUBST_OLD(php_fpm_pid_path) PHP_SUBST_OLD(php_fpm_log_dir) @@ -596,8 +560,6 @@ PHP_SUBST_OLD(php_fpm_user) PHP_SUBST_OLD(php_fpm_group) - AC_DEFINE_UNQUOTED(PHP_FPM_CONF_DIR, "$php_fpm_conf_dir", [fpm conf file dir]) - AC_DEFINE_UNQUOTED(PHP_FPM_CONF_PATH, "$php_fpm_conf_path", [fpm conf file path]) AC_DEFINE_UNQUOTED(PHP_FPM_VERSION, "$fpm_version", [fpm version]) AC_DEFINE_UNQUOTED(PHP_FPM_LOG_PATH, "$php_fpm_log_path", [fpm log file path]) AC_DEFINE_UNQUOTED(PHP_FPM_PID_PATH, "$php_fpm_pid_path", [fpm pid file path]) @@ -673,6 +635,7 @@ 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 Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_conf.c =================================================================== --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_conf.c 2009-12-15 12:44:15 UTC (rev 292163) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_conf.c 2009-12-15 12:51:46 UTC (rev 292164) @@ -29,7 +29,6 @@ #include "xml_config.h" #include "zlog.h" - struct fpm_global_config_s fpm_global_config; static void *fpm_global_config_ptr() /* {{{ */ @@ -551,11 +550,13 @@ } if (filename == NULL) { - filename = PHP_FPM_CONF_PATH; + spprintf(&filename, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR); + err = xml_conf_load_file(filename); + efree(filename); + } else { + err = xml_conf_load_file(filename); } - err = xml_conf_load_file(filename); - if (err) { zlog(ZLOG_STUFF, ZLOG_ERROR, "failed to load configuration file: %s", err); return -1; Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_php.h =================================================================== --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_php.h 2009-12-15 12:44:15 UTC (rev 292163) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_php.h 2009-12-15 12:51:46 UTC (rev 292164) @@ -7,6 +7,7 @@ #include <TSRM.h> +#include "php.h" #include "build-defs.h" /* for PHP_ defines */ struct fpm_worker_pool_s; Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/init.d.php-fpm.in =================================================================== --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/init.d.php-fpm.in 2009-12-15 12:44:15 UTC (rev 292163) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/init.d.php-fpm.in 2009-12-15 12:51:46 UTC (rev 292164) @@ -10,8 +10,11 @@ # Description: starts the PHP FastCGI Process Manager daemon ### END INIT INFO -php_fpm_BIN=@php_fpm_bin_path@ -php_fpm_CONF=@php_fpm_conf_path@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ + +php_fpm_BIN=@sbindir@/php-fpm +php_fpm_CONF=@sysconfdir@/php-fpm.conf php_fpm_PID=@php_fpm_pid_path@