(LP: #438619) /usr/local/bin/php5-fpm: not found

dreamcat4 · Sep 29, 2009 · 9ad8ffa · 9ad8ffa
1 parent f9a28da
commit 9ad8ffa
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/ac/fpm_conf.m4 b/ac/fpm_conf.m4
@@ -29,6 +29,12 @@ AC_DEFUN([AC_FPM_VARS],
 	fpm_prefix=$ac_default_prefix
 	if test $prefix != "NONE" -a $prefix != "" -a $prefix != "no" ; then
 		fpm_prefix=$prefix
+	else
+		prefix=$fpm_prefix
+	fi
+
+	if test $exec_prefix = "NONE" -o $exec_prefix = "" -o $exec_prefix = "no" ; then
+		exec_prefix=$fpm_prefix
 	fi
 
 	fpm_bin_prefix=$fpm_prefix/bin

diff --git a/acinclude.m4 b/acinclude.m4
@@ -400,19 +400,25 @@ AC_DEFUN([AC_FPM_PATHS],
 		AC_HELP_STRING([--with-fpm-group=@<:@GRP@:>@], [Set the group for php-fpm to run as @<:@nobody@:>@]))
 
 	fpm_prefix=$ac_default_prefix
-	if test $prefix != "NONE" -a $prefix != "" -a $prefix != "no" ; then 
+	if test $prefix != "NONE" -a $prefix != "" -a $prefix != "no" ; then
 		fpm_prefix=$prefix
+	else
+		prefix=$fpm_prefix
+	fi
+
+	if test $exec_prefix = "NONE" -o $exec_prefix = "" -o $exec_prefix = "no" ; then
+		exec_prefix=$fpm_prefix
 	fi
 
 	fpm_bin_prefix=$fpm_prefix/bin
 	if test $bindir != "NONE" -a $bindir != "" -a $bindir != "no" ; then
 		fpm_bin_prefix=$bindir
 	fi
 
-	if test -z "$with_fpm_bin" -o "$with_fpm_bin" = "yes" -o "$with_fpm_bin" = "no"; then
+	if test -z "$PHP_FPM_BIN" -o "$PHP_FPM_BIN" = "yes" -o "$PHP_FPM_BIN" = "no"; then
 		php_fpm_bin_path="$fpm_bin_prefix/php-fpm"
 	else
-		php_fpm_bin_path="$with_fpm_bin"
+		php_fpm_bin_path="$PHP_FPM_BIN"
 	fi
 	php_fpm_bin=`basename $php_fpm_bin_path`
 	php_fpm_bin_dir=`dirname $php_fpm_bin_path`

diff --git a/configure b/configure
@@ -20549,23 +20549,40 @@ if test "${with_fpm_group+set}" = set; then
 
 fi;
 
+	echo ""
+	echo "\$exec_prefix=$exec_prefix"
+	echo "\$prefix=$prefix"
+
+
 	fpm_prefix=$ac_default_prefix
 	if test $prefix != "NONE" -a $prefix != "" -a $prefix != "no" ; then
 		fpm_prefix=$prefix
+	else
+		prefix=$fpm_prefix
+	fi
+
+	if test $exec_prefix = "NONE" -o $exec_prefix = "" -o $exec_prefix = "no" ; then
+		exec_prefix=$fpm_prefix
 	fi
 
 	fpm_bin_prefix=$fpm_prefix/bin
 	if test $bindir != "NONE" -a $bindir != "" -a $bindir != "no" ; then
+		echo "\$bindir=$bindir"
 		fpm_bin_prefix=$bindir
 	fi
 
-	if test -z "$with_fpm_bin" -o "$with_fpm_bin" = "yes" -o "$with_fpm_bin" = "no"; then
+	if test -z "$PHP_FPM_BIN" -o "$PHP_FPM_BIN" = "yes" -o "$PHP_FPM_BIN" = "no"; then
 		php_fpm_bin_path="$fpm_bin_prefix/php-fpm"
 	else
-		php_fpm_bin_path="$with_fpm_bin"
+		php_fpm_bin_path="$PHP_FPM_BIN"
 	fi
 	php_fpm_bin=`basename $php_fpm_bin_path`
 	php_fpm_bin_dir=`dirname $php_fpm_bin_path`
+	echo "\$php_fpm_bin=$php_fpm_bin"
+	echo "\$php_fpm_bin_dir=$php_fpm_bin_dir"
+	echo "\$php_fpm_bin_path=$php_fpm_bin_path"
+	echo "\$exec_prefix=$exec_prefix"
+	echo "\$prefix=$prefix"
 
 	if test -z "$with_fpm_port" -o "$with_fpm_port" = "yes" -o "$with_fpm_port" = "no"; then
 		php_fpm_port="9000"