archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

make timelib_config.h inclusion configurable

Browse source
This commit is contained in:
Anatol Belski 2015-01-21 13:48:38 +01:00
parent bb2380edb7
commit bd52f4a833
5 changed files with 371 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -186,6 +186,8 @@ PHP_INIT_BUILD_SYSTEM
dnl We want this one before the checks, so the checks can modify CFLAGS. dnl We want this one before the checks, so the checks can modify CFLAGS.
test -z "$CFLAGS" && auto_cflags=1 test -z "$CFLAGS" && auto_cflags=1
CFLAGS="$CFLAGS -D HAVE_TIMELIB_CONFIG_H=1"
abs_srcdir=`(cd $srcdir; pwd)` abs_srcdir=`(cd $srcdir; pwd)`
abs_builddir=`pwd` abs_builddir=`pwd`

2
ext/date/lib/timelib_structs.h
View file

@ -21,7 +21,9 @@
#ifndef __TIMELIB_STRUCTS_H__ #ifndef __TIMELIB_STRUCTS_H__
#define __TIMELIB_STRUCTS_H__ #define __TIMELIB_STRUCTS_H__
#ifdef HAVE_TIMELIB_CONFIG_H
# include "timelib_config.h" # include "timelib_config.h"
#endif
#ifndef TIMELIB_OMIT_STDINT #ifndef TIMELIB_OMIT_STDINT

2
scripts/phpize.m4
View file

@ -19,6 +19,8 @@ dnl
test -z "$CFLAGS" && auto_cflags=1 test -z "$CFLAGS" && auto_cflags=1
CFLAGS="$CFLAGS -D HAVE_TIMELIB_CONFIG_H=1"
abs_srcdir=`(cd $srcdir && pwd)` abs_srcdir=`(cd $srcdir && pwd)`
abs_builddir=`pwd` abs_builddir=`pwd`

2
win32/build/config.w32
View file

@ -138,7 +138,7 @@ DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
// General CFLAGS for building objects // General CFLAGS for building objects
DEFINE("CFLAGS", "/nologo /FD $(BASE_INCLUDES) /D _WINDOWS \ DEFINE("CFLAGS", "/nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 "); /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 /D HAVE_TIMELIB_CONFIG_H=1 ");
if (VCVERS < 1400) { if (VCVERS < 1400) {
// Enable automatic precompiled headers // Enable automatic precompiled headers

2
win32/build/config.w32.phpize.in
View file

@ -122,7 +122,7 @@ DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
// General CFLAGS for building objects // General CFLAGS for building objects
DEFINE("CFLAGS", "/nologo /FD $(BASE_INCLUDES) /D _WINDOWS \ DEFINE("CFLAGS", "/nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 "); /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 /D HAVE_TIMELIB_CONFIG_H=1 ");
if (VCVERS < 1400) { if (VCVERS < 1400) {
// Enable automatic precompiled headers // Enable automatic precompiled headers