From 99a430074f93decb596e4e34a7e132ad57cd1d1d Mon Sep 17 00:00:00 2001 From: "Frank M. Kromann" Date: Tue, 24 Jun 2008 06:01:53 +0000 Subject: [PATCH] Not sure why this file was comitted? I was running a CVS update and then I see commit messages with my user id! Reverting the changes. --- main/config.w32.h | 196 ++++++++++++++++++++++------------------------ 1 file changed, 94 insertions(+), 102 deletions(-) diff --git a/main/config.w32.h b/main/config.w32.h index 4108053d2a..a86b9cffb6 100644 --- a/main/config.w32.h +++ b/main/config.w32.h @@ -1,20 +1,26 @@ /* - Build Configuration Template for Win32. + Build Configuration for Win32. + This has only been tested with MS VisualC++ 6 (and later). + $Id$ */ /* Default PHP / PEAR directories */ -#define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):"" #define CONFIGURATION_FILE_PATH "php.ini" -#define PEAR_INSTALLDIR "C:\\php5\\pear" -#define PHP_BINDIR "C:\\php5" -#define PHP_DATADIR "C:\\php5" -#define PHP_EXTENSION_DIR "C:\\php5" -#define PHP_INCLUDE_PATH ".;C:\\php5\\pear" -#define PHP_LIBDIR "C:\\php5" -#define PHP_LOCALSTATEDIR "C:\\php5" -#define PHP_PREFIX "C:\\php5" -#define PHP_SYSCONFDIR "C:\\php5" +#define PEAR_INSTALLDIR "c:\\php5\\pear" +#define PHP_BINDIR "c:\\php5" +#define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):"" +#define PHP_CONFIG_FILE_SCAN_DIR "" +#define PHP_DATADIR "c:\\php5" +#define PHP_EXTENSION_DIR "c:\\php5" +#define PHP_INCLUDE_PATH ".;c:\\php5\\pear" +#define PHP_LIBDIR "c:\\php5" +#define PHP_LOCALSTATEDIR "c:\\php5" +#define PHP_PREFIX "c:\\php5" +#define PHP_SYSCONFDIR "c:\\php5" + +/* Enable / Disable BCMATH extension (default: enabled) */ +#define HAVE_BCMATH 1 /* Enable / Disable crypt() function (default: enabled) */ #define HAVE_CRYPT 1 @@ -23,12 +29,68 @@ #define PHP_MD5_CRYPT 1 #define PHP_BLOWFISH_CRYPT 0 +/* Enable / Disable CALENDAR extension (default: enabled) */ +#define HAVE_CALENDAR 1 + +/* Enable / Disable CTYPE extension (default: enabled) */ +#define HAVE_CTYPE 1 + +/* Enable / Disable FTP extension (default: enabled) */ +#define HAVE_FTP 1 + +/* Enable / Disable MBSTRING extension (default: disabled) */ +/* #define HAVE_MBSTRING 0 */ +/* #define HAVE_MBREGEX 0 */ +/* #define HAVE_MBSTR_CN 0 */ +/* #define HAVE_MBSTR_JA 0 */ +/* #define HAVE_MBSTR_KR 0 */ +/* #define HAVE_MBSTR_RU 0 */ +/* #define HAVE_MBSTR_TW 0 */ + +/* If you have the .Net SDK in your include path, define this + * to compile .Net support into your COM extension. */ +#define HAVE_MSCOREE_H 0 + +/* Enable / Disable ODBC extension (default: enabled) */ +#define HAVE_UODBC 1 + +/* Enable / Disable PCRE extension (default: enabled) */ +#define HAVE_BUNDLED_PCRE 1 +#define HAVE_PCRE 1 + +/* Enable / Disable SESSION extension (default: enabled) */ +#define HAVE_PHP_SESSION 1 + +/* Enable / Disable TOKENIZER extension (default: enabled) */ +#define HAVE_TOKENIZER 1 + +/* Enable / Disable WDDX extension (default: enabled) */ +#define HAVE_WDDX 1 + +/* Enable / Disable XML extensions (default: enabled) */ +#define HAVE_LIBXML 1 +#define HAVE_DOM 1 +#define HAVE_SIMPLEXML 1 +#define HAVE_XML 1 +#define HAVE_XMLREADER 1 +#define HAVE_XMLWRITER 1 +#define HAVE_LIBXML_PARSER_H 1 + +/* Enable / Disable ZLIB extension (default: enabled) */ +#define HAVE_ZLIB 1 +#define HAVE_ZLIB_H 1 + +/* Enable / Disable SQLite extension (default: enabled) */ +#define HAVE_SQLITE 1 + /* PHP Runtime Configuration */ +#define FORCE_CGI_REDIRECT 1 #define PHP_URL_FOPEN 1 #define PHP_SAFE_MODE 0 #define MAGIC_QUOTES 0 #define USE_CONFIG_FILE 1 #define DEFAULT_SHORT_OPEN_TAG "1" +#define ENABLE_PATHINFO_CHECK 1 /* Platform-Specific Configuration. Should not be changed. */ #define PHP_SIGCHILD 0 @@ -54,7 +116,6 @@ #define NEED_ISBLANK 1 #define DISCARD_PATH 0 #undef HAVE_SETITIMER -#undef HAVE_SIGSETJMP #undef HAVE_IODBC #define HAVE_LIBDL 1 #define HAVE_GETTIMEOFDAY 1 @@ -85,7 +146,7 @@ #define HAVE_LOCALECONV 1 #define HAVE_LOCALE_H 1 #ifndef HAVE_LIBBIND -# define HAVE_SETVBUF 1 +#define HAVE_SETVBUF 1 #endif #define HAVE_SHUTDOWN 1 #define HAVE_SNPRINTF 1 @@ -107,16 +168,11 @@ #undef HAVE_SYS_WAIT_H #define HAVE_SYSLOG_H 1 #undef HAVE_UNISTD_H -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDARG_H 1 -#undef HAVE_ALLOCA_H -#undef HAVE_KILL -#define HAVE_GETPID 1 +#define HAVE_LIBDL 1 #define HAVE_LIBM 1 #define HAVE_CUSERID 0 #undef HAVE_RINT #define HAVE_STRFTIME 1 -#define SIZEOF_SHORT 2 /* int and long are stll 32bit in 64bit compiles */ #define SIZEOF_INT 4 #define SIZEOF_LONG 4 @@ -135,6 +191,12 @@ #define HAVE_GLOB #define PHP_SHLIB_SUFFIX "dll" #define HAVE_SQLDATASOURCES +#define POSIX_MALLOC_THRESHOLD 10 + +/* + * defining HAVE_SOCKLEN_T prevents PHP from building with the latest platform SDK... + * #define HAVE_SOCKLEN_T + */ /* Win32 supports strcoll */ #define HAVE_STRCOLL 1 @@ -151,106 +213,36 @@ /* vs.net 2005 has a 64-bit time_t. This will likely break * 3rdParty libs that were built with older compilers; switch * back to 32-bit */ -#ifndef _WIN64 -# define _USE_32BIT_TIME_T 1 -#endif +#define _USE_32BIT_TIME_T 1 #define HAVE_STDLIB_H 1 - - -/* values determined by configure.js */ - -/* undefined */ -#define CONFIGURE_COMMAND "cscript /nologo configure.js " - /* have the arpa\nameser.h header file */ #define HAVE_ARPA_NAMESER_H 1 -/* have the wspiapi.h header file */ -#define HAVE_WSPIAPI_H 1 - -/* undefined */ -#define HAVE_GETADDRINFO 1 - /* undefined */ -#define HAVE_GAI_STRERROR 1 - -/* undefined */ -#define HAVE_IPV6 1 - -/* undefined */ -#define HAVE_USLEEP 1 - -/* undefined */ -#define HAVE_STRCOLL 1 - -/* Have BCMATH library */ -#define HAVE_BCMATH 1 - -/* Have calendar */ -#define HAVE_CALENDAR 1 +#define PHP_FASTCGI 1 /* Have COM_DOTNET support */ #define HAVE_COM_DOTNET 1 -/* Have ctype */ -#define HAVE_CTYPE 1 - /* Have date/time support */ #define HAVE_DATE 1 -/* Bundled regex */ -#define REGEX 1 - -/* Bundled regex */ -#define HSREGEX 1 - -/* Have FTP support */ -#define HAVE_FTP 1 - +/* GD support */ +#define HAVE_LIBGD 1 /* undefined */ #define HAVE_HASH_EXT 1 -/* ODBC support */ -#define HAVE_UODBC 1 - -/* Using bundled PCRE library */ -#define HAVE_BUNDLED_PCRE 1 +/* Define if iconv extension is enabled */ +#define HAVE_ICONV 1 -/* Have PCRE library */ -#define HAVE_PCRE 1 +/* Define if libiconv is available */ +#define HAVE_LIBICONV 1 -/* Reflection support enabled */ -#define HAVE_REFLECTION 1 +/* Which iconv implementation to use */ +#define PHP_ICONV_IMPL "\"libiconv\"" -/* Session support */ -#define HAVE_PHP_SESSION 1 +/* Whether iconv supports errno or not */ +#define ICONV_SUPPORTS_ERRNO 1 -/* undefined */ +/* SPL support */ #define HAVE_SPL 1 - -/* undefined */ -#define PHP_CONFIG_FILE_SCAN_DIR "" - -/* Tokenizer support */ -#define HAVE_TOKENIZER 1 - -/* ZLIB support */ -#define HAVE_ZLIB 1 - -/* have the zlib.h header file */ -#define HAVE_ZLIB_H 1 - -/* DOM support */ -#define HAVE_DOM 1 - -/* Simple XML support */ -#define HAVE_SIMPLEXML 1 - -/* WDDX support */ -#define HAVE_WDDX 1 - -/* XML support */ -#define HAVE_XML 1 - -/* XMLReader support */ -#define HAVE_XMLREADER 1 -- 2.40.0