fix timelib build configuration

diff --git a/configure.in b/configure.in
index 2323acdd8c7ae357e7b62faa65367a81b9714669..ae07fc38f9cd376a07ca31c7eae986103fd032e2 100644 (file)
--- 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 2f25c72ebdd960d74cf6b3cdb53466722106340c..26d583bfbf31876c59acf9a5ca89399f69837200 100755 (executable)
--- 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");
+EXTENSION("date", "php_date.c", false, "/Iext/date/lib /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 79e12ec8a8f556554da22f43326342c9eeaaa895..b83f9bc0d47b3ad8d3dc0d10da67191a889a3d8e 100644 (file)
--- 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"
+PHP_DATE_CFLAGS="-I@ext_builddir@/lib -D HAVE_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 617976cc3a3fd15d952b6b4d919d7264d63baaef..d745ca744381eaaa39a3ba6040212df79bb0dc74 100644 (file)
--- 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/config.w32 b/win32/build/config.w32
index a7080d040918c7306b6f5a9ff8ffe2a38b906bb1..564cea2dcc65bfa114393dee9e9e5afbdd95db1c 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -138,7 +138,7 @@ DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
 
 // General CFLAGS for building objects
 DEFINE("CFLAGS", "/nologo /FD $(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 (VCVERS < 1400) {
        // Enable automatic precompiled headers

diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index 2091b74f249fb082290c02ad948e72ab6d1d21a8..5b211f804ec91297be1aad465f8ffa50dbeaee83 100644 (file)
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -122,7 +122,7 @@ DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
 
 // General CFLAGS for building objects
 DEFINE("CFLAGS", "/nologo /FD $(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 (VCVERS < 1400) {
        // Enable automatic precompiled headers