]> granicus.if.org Git - php/commitdiff
- Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)
authorJerome Loyet <fat@php.net>
Wed, 23 May 2012 09:40:22 +0000 (11:40 +0200)
committerJerome Loyet <fat@php.net>
Wed, 23 May 2012 09:40:22 +0000 (11:40 +0200)
NEWS
sapi/fpm/config.m4

diff --git a/NEWS b/NEWS
index c8aa2089057aeadd8b48fb2d78078c48b9c78b82..9b0a3ac89b463c693d075d50b724fe4864ecfdae 100644 (file)
--- 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)).
index 89628100b4f15cb4b03a9d3e3251a45f27da6fb1..6c860c9a22199c72c30ff472119f3b01411ee59d 100644 (file)
@@ -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