diff options
| author | Anatol Belski <ab@php.net> | 2015-01-21 16:26:36 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-21 16:26:36 +0100 |
| commit | 1463115e7e208bb0a7da1ca319bcb005791f3d65 (patch) | |
| tree | 6a7444cab2a3dd2619394dac0f4786f31ad8871a /ext/date/config0.m4 | |
| parent | 35bfa022f9005c22c6ff9ac3f0ca8bd23d596261 (diff) | |
| parent | 24157f396cc8c309f47440ae0c96748e0be74a73 (diff) | |
| download | php-git-1463115e7e208bb0a7da1ca319bcb005791f3d65.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix timelib build configuration
Conflicts:
ext/date/config.w32
ext/date/config0.m4
win32/build/config.w32
win32/build/config.w32.phpize.in
Diffstat (limited to 'ext/date/config0.m4')
| -rw-r--r-- | ext/date/config0.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/date/config0.m4 b/ext/date/config0.m4 index 0423f61de0..aa28890b5b 100644 --- a/ext/date/config0.m4 +++ b/ext/date/config0.m4 @@ -4,7 +4,7 @@ dnl config.m4 for date extension sinclude(ext/date/lib/timelib.m4) sinclude(lib/timelib.m4) -PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" +PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" @@ -15,6 +15,7 @@ PHP_ADD_INCLUDE([$ext_builddir/lib]) PHP_ADD_INCLUDE([$ext_srcdir/lib]) PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h]) +AC_DEFINE([HAVE_TIMELIB_CONFIG_H], [1], [Have timelib_config.h]) cat > $ext_builddir/lib/timelib_config.h <<EOF #ifdef PHP_WIN32 |