Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'

Conflicts:
	ext/mysqlnd/mysqlnd.c

diff --cc acinclude.m4
index 07b1f8eb57aee72239d4cb3ad128a93a6caeb48c,1c8ca19134b6242bd0a446576cb469adb7844f71..335b1b44d022362eb0b703a24917985910b5d9f2
--- 1/acinclude.m4
--- 2/acinclude.m4
+++ b/acinclude.m4
@@@ -2962,10 -2959,14 +2962,14 @@@ dnl DTrace object
    esac
  
  dnl Generate Makefile.objects entries
+ dnl The empty $ac_provsrc command stops an implicit circular dependency
+ dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
    cat>>Makefile.objects<<EOF
  
+ $abs_srcdir/$ac_provsrc:;
+ 
  $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
 -      dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
 +      CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && cp \$[]@ \$[]@.bak && \$(SED) 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
  
  \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj