Add HAVE_CALENDAR, HAVE_COM, HAVE_SESSION and HAVE_TOKENIZER to enable/disable these...

diff --git a/main/config.w32.h b/main/config.w32.h
index 28e51457a89cc9d8572d6cbe29815670c3ec8f57..a886b08ac08f9c1b7a79435f61ef886261fc341b 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -27,6 +27,12 @@
 #define PHP_MD5_CRYPT 0
 #define PHP_BLOWFISH_CRYPT 0
 
+/* Enable / Disable CALENDAR extension (default: enabled) */
+#define HAVE_CALENDAR 1
+
+/* Enable / Disable COM extension (default: enabled) */
+#define HAVE_COM 1
+
 /* Enable / Disable FTP extension (default: enabled) */
 #define HAVE_FTP 1
 
@@ -43,6 +49,12 @@
 #define HAVE_BUNDLED_PCRE      1
 #define HAVE_PCRE 1
 
+/* Enable / Disable SESSION extension (default: enabled) */
+#define HAVE_SESSION 1
+
+/* Enable / Disable TOKENIZER extension (default: enabled) */
+#define HAVE_TOKENIZER 1
+
 /* Enable / Disable WDDX extension (default: enabled) */
 #define HAVE_WDDX 1
 

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 26e75c25c40d9d0746a58f35e7b315b8fc8bfad6..3420b1439acd3b536ee5e221f5d41913fba4f539 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -48,8 +48,12 @@
 #include "ext/standard/php_lcg.h"
 #include "ext/standard/php_array.h"
 #include "ext/standard/php_assert.h"
+#if HAVE_CALENDAR
 #include "ext/calendar/php_calendar.h"
+#endif
+#if HAVE_COM
 #include "ext/com/php_COM.h"
+#endif
 #if HAVE_FTP
 #include "ext/ftp/php_ftp.h"
 #endif
@@ -58,7 +62,9 @@
 #if HAVE_UODBC
 #include "ext/odbc/php_odbc.h"
 #endif
+#if HAVE_SESSION
 #include "ext/session/php_session.h"
+#endif
 #if HAVE_LIBEXPAT
 #include "ext/xml/php_xml.h"
 #endif
@@ -72,18 +78,25 @@
 #if HAVE_OVERLOAD
 #include "ext/overload/php_overload.h"
 #endif
+#if HAVE_TOKENIZER
 #include "ext/tokenizer/php_tokenizer.h"
+#endif
 /* }}} */
 
 /* {{{ php_builtin_extensions[]
  */
 zend_module_entry *php_builtin_extensions[] = {
        phpext_standard_ptr,
+       phpext_pcre_ptr,
 #if WITH_BCMATH
        phpext_bcmath_ptr,
 #endif
+#if HAVE_CALENDAR
        phpext_calendar_ptr,
+#endif
+#if HAVE_COM
        phpext_com_ptr,
+#endif
 #if HAVE_FTP
        phpext_ftp_ptr,
 #endif
@@ -99,15 +112,18 @@ zend_module_entry *php_builtin_extensions[] = {
 #if HAVE_OVERLOAD
   phpext_overload_ptr,
 #endif
+#if HAVE_TOKENIZER
        phpext_tokenizer_ptr,
-       phpext_pcre_ptr,
+#endif
 #if HAVE_LIBEXPAT
        phpext_xml_ptr,
 #endif
 #if HAVE_LIBEXPAT && HAVE_WDDX
        phpext_wddx_ptr,
 #endif
+#if HAVE_SESSION
        phpext_session_ptr
+#endif
 };
 /* }}} */