diff options
| author | Anatol Belski <ab@php.net> | 2015-01-21 13:55:07 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-21 13:55:07 +0100 |
| commit | 35bfa022f9005c22c6ff9ac3f0ca8bd23d596261 (patch) | |
| tree | 8f76ad67419c9b2fcbcf84e30076550a011c1ee5 /configure.in | |
| parent | 71aa0d35663fd732e11edfe3b021f7f27395eed9 (diff) | |
| parent | bd52f4a833ea653d915a27ba07ec83d3e3b74c78 (diff) | |
| download | php-git-35bfa022f9005c22c6ff9ac3f0ca8bd23d596261.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
make timelib_config.h inclusion configurable
Conflicts:
win32/build/config.w32
win32/build/config.w32.phpize.in
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 06db0a7c50..3720d0f53d 100644 --- a/configure.in +++ b/configure.in @@ -186,6 +186,8 @@ 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` |