Merge branch 'PHP-5.5'

* PHP-5.5:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used.  DTrace is part of Oracle Linux.  See https://oss.oracle.com/projects/DTrace/

diff --cc acinclude.m4
index b76bd344a757f42db49c5ca6626537537e8dcea9,3284978804fa49ee90a19e5789ee520b3aeff4c9..c25e59eef08d7fc984756f6627d9507ae8ddacca
--- 1/acinclude.m4
--- 2/acinclude.m4
+++ b/acinclude.m4
@@@ -2977,23 -3009,6 +3009,25 @@@ $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_
        CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
  
  EOF
+     ;;
+   esac
  ])
 +
 +dnl
 +dnl PHP_CHECK_STDINT_TYPES
 +dnl
 +AC_DEFUN([PHP_CHECK_STDINT_TYPES], [
 +  AC_CHECK_SIZEOF([short], 2)
 +  AC_CHECK_SIZEOF([int], 4)
 +  AC_CHECK_SIZEOF([long], 4)
 +  AC_CHECK_SIZEOF([long long], 8)
 +  AC_CHECK_TYPES([int8, int16, int32, int64, int8_t, int16_t, int32_t, int64_t, uint8, uint16, uint32, uint64, uint8_t, uint16_t, uint32_t, uint64_t, u_int8_t, u_int16_t, u_int32_t, u_int64_t], [], [], [
 +#if HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
 +#if HAVE_SYS_TYPES_H
 +# include <sys/types.h>
 +#endif
 +  ])
 +  AC_DEFINE([PHP_HAVE_STDINT_TYPES], [1], [Checked for stdint types])
 +])