cvs: php4 /main config.w32.h internal_functions_win32.c

sebastian Thu Apr 18 12:34:14 2002 EDT Modified files: /php4/main config.w32.h internal_functions_win32.c Log: Add HAVE_CALENDAR, HAVE_COM, HAVE_SESSION and HAVE_TOKENIZER to enable/disable these extensions, respectively. It is now possible to build PHP on Win32 with just ext/standard and ext/pcre. The latter is needed by the former, because at least the aggregation functions use PCRE. Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.56 php4/main/config.w32.h:1.57 --- php4/main/config.w32.h:1.56 Thu Apr 18 07:58:08 2002 +++ php4/main/config.w32.h Thu Apr 18 12:34:13 2002 @@ -2,7 +2,7 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h,v 1.56 2002/04/18 11:58:08 sebastian Exp $ + $Id: config.w32.h,v 1.57 2002/04/18 16:34:13 sebastian Exp $ */ /* Default PHP / PEAR directories */ @@ -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 @@ -42,6 +48,12 @@ /* Enable / Disable PCRE extension (default: enabled) */ #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 Index: php4/main/internal_functions_win32.c diff -u php4/main/internal_functions_win32.c:1.60 php4/main/internal_functions_win32.c:1.61 --- php4/main/internal_functions_win32.c:1.60 Wed Apr 17 14:14:03 2002 +++ php4/main/internal_functions_win32.c Thu Apr 18 12:34:13 2002 @@ -16,7 +16,7 @@ | Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ - $Id: internal_functions_win32.c,v 1.60 2002/04/17 18:14:03 sebastian Exp $ + $Id: internal_functions_win32.c,v 1.61 2002/04/18 16:34:13 sebastian Exp $ */ /* {{{ includes @@ -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 @@ #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 }; /* }}} */