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 | |
| 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
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | ext/date/config.w32 | 3 | ||||
| -rw-r--r-- | ext/date/config0.m4 | 3 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 3720d0f53d..06db0a7c50 100644 --- a/configure.in +++ b/configure.in @@ -186,8 +186,6 @@ PHP_INIT_BUILD_SYSTEM dnl We want this one before the checks, so the checks can modify CFLAGS. test -z "$CFLAGS" && auto_cflags=1 -CFLAGS="$CFLAGS -D HAVE_TIMELIB_CONFIG_H=1" - abs_srcdir=`(cd $srcdir; pwd)` abs_builddir=`pwd` diff --git a/ext/date/config.w32 b/ext/date/config.w32 index 62f0abd9c3..d4dd1bd366 100755 --- a/ext/date/config.w32 +++ b/ext/date/config.w32 @@ -1,7 +1,7 @@ // $Id$ // vim:ft=javascript -EXTENSION("date", "php_date.c", false, "/Iext/date/lib /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); +EXTENSION("date", "php_date.c", false, "/Iext/date/lib /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 /DHAVE_TIMELIB_CONFIG_H=1"); ADD_SOURCES("ext/date/lib", "astro.c timelib.c dow.c parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c parse_iso_intervals.c interval.c", "date"); AC_DEFINE('HAVE_DATE', 1, 'Have date/time support'); @@ -14,3 +14,4 @@ tl_config.WriteLine("#define TIMELIB_OMIT_STDINT 1"); tl_config.Close(); 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') 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 diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index 617976cc3a..d745ca7443 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -19,8 +19,6 @@ dnl test -z "$CFLAGS" && auto_cflags=1 -CFLAGS="$CFLAGS -D HAVE_TIMELIB_CONFIG_H=1" - abs_srcdir=`(cd $srcdir && pwd)` abs_builddir=`pwd` diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 135dd69ad5..2569ab33a3 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2583,7 +2583,7 @@ function toolset_setup_common_cflags() // General CFLAGS for building objects DEFINE("CFLAGS", "/nologo $(BASE_INCLUDES) /D _WINDOWS \ - /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 /D HAVE_TIMELIB_CONFIG_H=1"); + /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3"); if (VS_TOOLSET) { ADD_FLAG("CFLAGS", " /FD "); |