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

Commit: 2251e4369a77eab540db6e08e01fb941b3a62ba7 Author: Christopher Jones <sixd@php.net> Fri, 16 Aug 2013 10:57:55 -0700 Parents: 30502dbc75fb604eb1741d5b735f86c16f5dd0b1 4b4ffaf703a243db6bb1026a339376d089dec72d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2251e4369a77eab540db6e08e01fb941b3a62ba7 Log: 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/ Changed paths: MM acinclude.m4 Diff: diff --cc acinclude.m4 index b76bd34,3284978..c25e59e --- a/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]) +])