make timelib_config.h inclusion configurable

weltling · weltling · commit bd52f4a833ea · 2015-01-21T13:48:38.000+01:00
diff --git 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`
 
diff --git a/ext/date/lib/timelib_structs.h b/ext/date/lib/timelib_structs.h
@@ -21,7 +21,9 @@
 #ifndef __TIMELIB_STRUCTS_H__
 #define __TIMELIB_STRUCTS_H__
 
-#include "timelib_config.h"
+#ifdef HAVE_TIMELIB_CONFIG_H
+# include "timelib_config.h"
+#endif
 
 #ifndef TIMELIB_OMIT_STDINT
 
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
@@ -19,6 +19,8 @@ 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
@@ -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 ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 /D HAVE_TIMELIB_CONFIG_H=1 ");
 
 if (VCVERS < 1400) {
 	// Enable automatic precompiled headers
diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
