From: Jerome Loyet <fat@php.net>
Date: Wed, 23 May 2012 09:40:22 +0000 (+0200)
Subject: - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)
X-Git-Tag: php-5.4.4RC2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b44f16ea2f18a08eb1249db6621840527eab5e0;p=php

- Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)
---

diff --git a/NEWS b/NEWS
index c8aa208905..9b0a3ac89b 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,7 @@ PHP                                                                        NEWS
   . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
   . Fixed bug #61295 (php-fpm should not fail with commented 'user'
     for non-root start). (fat)
+  . Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm). (fat)
 
 - Libxml:
   . Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 89628100b4..6c860c9a22 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -192,6 +192,8 @@ AC_DEFUN([AC_FPM_TRACE],
       have_ptrace=no
       have_broken_ptrace=yes
       AC_MSG_RESULT([no])
+    ], [
+      AC_MSG_RESULT([skipped (cross compiling)])
     ])
   fi
 
@@ -264,6 +266,8 @@ AC_DEFUN([AC_FPM_TRACE],
     ], [
       proc_mem_file=""
       AC_MSG_RESULT([no])
+    ], [
+      AC_MSG_RESULT([skipped (cross compiling)])
     ])
   fi