SOURCES: php-fpm.patch - http://php-fpm.anight.org/downloads/head/php-5.2.6...
glen
glen at pld-linux.org
Mon Nov 3 18:13:01 CET 2008
Author: glen Date: Mon Nov 3 17:13:01 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- http://php-fpm.anight.org/downloads/head/php-5.2.6-fpm-0.5.9.diff.gz
---- Files affected:
SOURCES:
php-fpm.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/php-fpm.patch
diff -u SOURCES/php-fpm.patch:1.1 SOURCES/php-fpm.patch:1.2
--- SOURCES/php-fpm.patch:1.1 Wed Nov 7 18:57:39 2007
+++ SOURCES/php-fpm.patch Mon Nov 3 18:12:55 2008
@@ -1,54 +1,60 @@
-diff -Nru php-5.2.4.vanilla/configure php-5.2.4.fpm/configure
---- php-5.2.4.vanilla/configure 2007-08-30 03:39:18.000000000 +0400
-+++ php-5.2.4.fpm/configure 2007-09-11 23:59:31.000000000 +0400
-@@ -1038,6 +1038,11 @@
+diff -Nru php-5.2.6.vanilla/configure php-5.2.6.fpm/configure
+--- php-5.2.6.vanilla/configure 2008-04-30 22:37:32.000000000 +0400
++++ php-5.2.6.fpm/configure 2008-09-21 17:37:43.000000000 +0400
+@@ -1038,6 +1038,17 @@
--disable-path-info-check CGI: If this is disabled, paths such as
/info.php/test?a=b will fail to work"
ac_help="$ac_help
+ --enable-fpm FastCGI: If this is enabled, the fastcgi support
+ will include experimental process manager code"
+ac_help="$ac_help
++ --with-fpm-conf=PATH Set the path for php-fpm configuration file [PREFIX/etc/php-fpm.conf]"
++ac_help="$ac_help
++ --with-fpm-log=PATH Set the path for php-fpm log file [PREFIX/logs/php-fpm.log]"
++ac_help="$ac_help
++ --with-fpm-pid=PATH Set the path for php-fpm pid file [PREFIX/logs/php-fpm.pid]"
++ac_help="$ac_help
+ --with-xml-config=PATH FPM: use xml-config in PATH to find libxml"
+ac_help="$ac_help
General settings:
"
-@@ -2149,12 +2154,12 @@
+@@ -2149,12 +2160,12 @@
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:2153: checking for Cygwin environment" >&5
-+echo "configure:2158: checking for Cygwin environment" >&5
++echo "configure:2164: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2158 "configure"
-+#line 2163 "configure"
++#line 2169 "configure"
#include "confdefs.h"
int main() {
-@@ -2165,7 +2170,7 @@
+@@ -2165,7 +2176,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:2169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
-@@ -2182,19 +2187,19 @@
+@@ -2182,19 +2193,19 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:2186: checking for mingw32 environment" >&5
-+echo "configure:2191: checking for mingw32 environment" >&5
++echo "configure:2197: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2191 "configure"
-+#line 2196 "configure"
++#line 2202 "configure"
#include "confdefs.h"
int main() {
@@ -56,345 +62,345 @@
; return 0; }
EOF
-if { (eval echo configure:2198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
-@@ -2213,7 +2218,7 @@
+@@ -2213,7 +2224,7 @@
echo $ac_n "checking for egrep""... $ac_c" 1>&6
-echo "configure:2217: checking for egrep" >&5
-+echo "configure:2222: checking for egrep" >&5
++echo "configure:2228: checking for egrep" >&5
if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -2228,7 +2233,7 @@
+@@ -2228,7 +2239,7 @@
echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
-echo "configure:2232: checking for a sed that does not truncate output" >&5
-+echo "configure:2237: checking for a sed that does not truncate output" >&5
++echo "configure:2243: checking for a sed that does not truncate output" >&5
if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -2378,7 +2383,7 @@
+@@ -2378,7 +2389,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:2382: checking host system type" >&5
-+echo "configure:2387: checking host system type" >&5
++echo "configure:2393: checking host system type" >&5
host_alias=$host
case "$host_alias" in
-@@ -2399,7 +2404,7 @@
+@@ -2399,7 +2410,7 @@
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:2403: checking target system type" >&5
-+echo "configure:2408: checking target system type" >&5
++echo "configure:2414: checking target system type" >&5
target_alias=$target
case "$target_alias" in
-@@ -2511,7 +2516,7 @@
+@@ -2511,7 +2522,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2515: checking for $ac_word" >&5
-+echo "configure:2520: checking for $ac_word" >&5
++echo "configure:2526: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -2541,7 +2546,7 @@
+@@ -2541,7 +2552,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2545: checking for $ac_word" >&5
-+echo "configure:2550: checking for $ac_word" >&5
++echo "configure:2556: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -2592,7 +2597,7 @@
+@@ -2592,7 +2603,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2596: checking for $ac_word" >&5
-+echo "configure:2601: checking for $ac_word" >&5
++echo "configure:2607: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -2624,7 +2629,7 @@
+@@ -2624,7 +2635,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2628: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:2633: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2639: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -2635,12 +2640,12 @@
+@@ -2635,12 +2646,12 @@
cat > conftest.$ac_ext << EOF
-#line 2639 "configure"
-+#line 2644 "configure"
++#line 2650 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
-@@ -2666,12 +2671,12 @@
+@@ -2666,12 +2677,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2670: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:2675: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2681: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2675: checking whether we are using GNU C" >&5
-+echo "configure:2680: checking whether we are using GNU C" >&5
++echo "configure:2686: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -2680,7 +2685,7 @@
+@@ -2680,7 +2691,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
-@@ -2699,7 +2704,7 @@
+@@ -2699,7 +2710,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2703: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:2708: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2714: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -2731,7 +2736,7 @@
+@@ -2731,7 +2742,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2735: checking how to run the C preprocessor" >&5
-+echo "configure:2740: checking how to run the C preprocessor" >&5
++echo "configure:2746: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -2746,13 +2751,13 @@
+@@ -2746,13 +2757,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2750 "configure"
-+#line 2755 "configure"
++#line 2761 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
-@@ -2763,13 +2768,13 @@
+@@ -2763,13 +2774,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2767 "configure"
-+#line 2772 "configure"
++#line 2778 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
-@@ -2780,13 +2785,13 @@
+@@ -2780,13 +2791,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2784 "configure"
-+#line 2789 "configure"
++#line 2795 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
-@@ -2813,9 +2818,9 @@
+@@ -2813,9 +2824,9 @@
ICC="no"
echo $ac_n "checking for icc""... $ac_c" 1>&6
-echo "configure:2817: checking for icc" >&5
-+echo "configure:2822: checking for icc" >&5
++echo "configure:2828: checking for icc" >&5
cat > conftest.$ac_ext <<EOF
-#line 2819 "configure"
-+#line 2824 "configure"
++#line 2830 "configure"
#include "confdefs.h"
__INTEL_COMPILER
EOF
-@@ -2835,10 +2840,10 @@
+@@ -2835,10 +2846,10 @@
if test "x$CC" != xcc; then
echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
-echo "configure:2839: checking whether $CC and cc understand -c and -o together" >&5
-+echo "configure:2844: checking whether $CC and cc understand -c and -o together" >&5
++echo "configure:2850: checking whether $CC and cc understand -c and -o together" >&5
else
echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
-echo "configure:2842: checking whether cc understands -c and -o together" >&5
-+echo "configure:2847: checking whether cc understands -c and -o together" >&5
++echo "configure:2853: checking whether cc understands -c and -o together" >&5
fi
set dummy $CC; ac_cc="`echo $2 |
sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
-@@ -2850,16 +2855,16 @@
+@@ -2850,16 +2861,16 @@
# We do the test twice because some compilers refuse to overwrite an
# existing .o file with -o, though they will create one.
ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
-if { (eval echo configure:2854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
- test -f conftest.o && { (eval echo configure:2855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-+if { (eval echo configure:2859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-+ test -f conftest.o && { (eval echo configure:2860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++if { (eval echo configure:2865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++ test -f conftest.o && { (eval echo configure:2866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
if test "x$CC" != xcc; then
# Test first that cc exists at all.
- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
ac_try='cc -c conftest.c -o conftest.o 1>&5'
- if { (eval echo configure:2862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
- test -f conftest.o && { (eval echo configure:2863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-+ if { (eval echo configure:2867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-+ test -f conftest.o && { (eval echo configure:2868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++ if { (eval echo configure:2873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++ test -f conftest.o && { (eval echo configure:2874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
then
# cc works too.
:
-@@ -2886,7 +2891,7 @@
+@@ -2886,7 +2897,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2890: checking how to run the C preprocessor" >&5
-+echo "configure:2895: checking how to run the C preprocessor" >&5
++echo "configure:2901: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -2901,13 +2906,13 @@
+@@ -2901,13 +2912,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2905 "configure"
-+#line 2910 "configure"
++#line 2916 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
-@@ -2918,13 +2923,13 @@
+@@ -2918,13 +2929,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2922 "configure"
-+#line 2927 "configure"
++#line 2933 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
-@@ -2935,13 +2940,13 @@
+@@ -2935,13 +2946,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2939 "configure"
-+#line 2944 "configure"
++#line 2950 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
-@@ -2966,9 +2971,9 @@
+@@ -2966,9 +2977,9 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2970: checking for AIX" >&5
-+echo "configure:2975: checking for AIX" >&5
++echo "configure:2981: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 2972 "configure"
-+#line 2977 "configure"
++#line 2983 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
-@@ -2990,7 +2995,7 @@
+@@ -2990,7 +3001,7 @@
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2994: checking whether ln -s works" >&5
-+echo "configure:2999: checking whether ln -s works" >&5
++echo "configure:3005: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -3015,7 +3020,7 @@
+@@ -3015,7 +3026,7 @@
php_with_libdir=lib
echo $ac_n "checking for system library directory""... $ac_c" 1>&6
-echo "configure:3019: checking for system library directory" >&5
-+echo "configure:3024: checking for system library directory" >&5
++echo "configure:3030: checking for system library directory" >&5
# Check whether --with-libdir or --without-libdir was given.
if test "${with_libdir+set}" = set; then
withval="$with_libdir"
-@@ -3041,7 +3046,7 @@
+@@ -3041,7 +3052,7 @@
php_enable_rpath=yes
echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6
-echo "configure:3045: checking whether to enable runpaths" >&5
-+echo "configure:3050: checking whether to enable runpaths" >&5
++echo "configure:3056: checking whether to enable runpaths" >&5
# Check whether --enable-rpath or --disable-rpath was given.
if test "${enable_rpath+set}" = set; then
enableval="$enable_rpath"
-@@ -3065,7 +3070,7 @@
+@@ -3065,7 +3076,7 @@
echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6
-echo "configure:3069: checking if compiler supports -R" >&5
-+echo "configure:3074: checking if compiler supports -R" >&5
++echo "configure:3080: checking if compiler supports -R" >&5
if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -3073,14 +3078,14 @@
+@@ -3073,14 +3084,14 @@
SAVE_LIBS=$LIBS
LIBS="-R /usr/$PHP_LIBDIR $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3077 "configure"
-+#line 3082 "configure"
++#line 3088 "configure"
#include "confdefs.h"
int main() {
@@ -402,25 +408,25 @@
; return 0; }
EOF
-if { (eval echo configure:3084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
php_cv_cc_dashr=yes
else
-@@ -3098,7 +3103,7 @@
+@@ -3098,7 +3109,7 @@
ld_runpath_switch=-R
else
echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
-echo "configure:3102: checking if compiler supports -Wl,-rpath," >&5
-+echo "configure:3107: checking if compiler supports -Wl,-rpath," >&5
++echo "configure:3113: checking if compiler supports -Wl,-rpath," >&5
if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -3106,14 +3111,14 @@
+@@ -3106,14 +3117,14 @@
SAVE_LIBS=$LIBS
LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3110 "configure"
-+#line 3115 "configure"
++#line 3121 "configure"
#include "confdefs.h"
int main() {
@@ -428,124 +434,124 @@
; return 0; }
EOF
-if { (eval echo configure:3117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
php_cv_cc_rpath=yes
else
-@@ -3142,7 +3147,7 @@
+@@ -3142,7 +3153,7 @@
# Extract the first word of "re2c", so it can be a program name with args.
set dummy re2c; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3146: checking for $ac_word" >&5
-+echo "configure:3151: checking for $ac_word" >&5
++echo "configure:3157: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -3170,7 +3175,7 @@
+@@ -3170,7 +3181,7 @@
if test -n "$RE2C"; then
echo $ac_n "checking for re2c version""... $ac_c" 1>&6
-echo "configure:3174: checking for re2c version" >&5
-+echo "configure:3179: checking for re2c version" >&5
++echo "configure:3185: checking for re2c version" >&5
if eval "test \"`echo '$''{'php_cv_re2c_version'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -3202,7 +3207,7 @@
+@@ -3202,7 +3213,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3206: checking for $ac_word" >&5
-+echo "configure:3211: checking for $ac_word" >&5
++echo "configure:3217: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -3243,7 +3248,7 @@
+@@ -3243,7 +3254,7 @@
;;
*)
echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6
-echo "configure:3247: checking if $AWK is broken" >&5
-+echo "configure:3252: checking if $AWK is broken" >&5
++echo "configure:3258: checking if $AWK is broken" >&5
if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then
echo "$ac_t""yes" 1>&6
{ echo "configure: error: You should install GNU awk" 1>&2; exit 1; }
-@@ -3262,7 +3267,7 @@
+@@ -3262,7 +3273,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3266: checking for $ac_word" >&5
-+echo "configure:3271: checking for $ac_word" >&5
++echo "configure:3277: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -3302,7 +3307,7 @@
+@@ -3302,7 +3313,7 @@
bison_version=none
if test "$YACC"; then
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fpm.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list