com php-src: Merge branch 'PHP-5.4' into PHP-5.5: acinclude.m4

Commit: b90b551228c7dcc8399030c2cb0a12c72e9440f6 Author: Christopher Jones <sixd@php.net> Mon, 5 Aug 2013 14:27:54 -0700 Parents: 963c1be38db3fd4b31303ae28e72933c5873103f ec4019e8f693fb68c8e282bb540812a10d99cba1 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b90b551228c7dcc8399030c2cb0a12c72e9440f6 Log: 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 Bugs: https://bugs.php.net/61268 Changed paths: MM acinclude.m4 Diff: diff --cc acinclude.m4 index 07b1f8e,1c8ca19..335b1b4 --- a/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