cvs: php4 / NEWS /main config.w32.h config.w32.h.in /win32 php4dll.dsp php4dllts.dsp
| From: | Sebastian Bergmann | Date: | Thu, 02 May 2002 09:49:41 +0000 |
| Subject: | cvs: php4 / NEWS /main config.w32.h config.w32.h.in /win32 php4dll.dsp php4dllts.dsp | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11612@lists.php.net to get a copy of this message | ||
sebastian Thu May 2 05:49:41 2002 EDT
Added files:
/php4/main config.w32.h.in
Removed files:
/php4/main config.w32.h
Modified files:
/php4 NEWS
/php4/win32 php4dll.dsp php4dllts.dsp
Log:
The Windows build can now be configures more comfortably, for instance in regard to built-in
extensions.
Index: php4/NEWS diff -u php4/NEWS:1.966 php4/NEWS:1.967 --- php4/NEWS:1.966 Thu May 2 04:30:29 2002 +++ php4/NEWS Thu May 2 05:49:38 2002 @@ -1,6 +1,8 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2002, Version 4.3.0 +- The Windows build can now be configures more comfortably, for instance in + regard to built-in extensions. (Sebastian) - Added optional 3rd parameter to mysql_select_db() which makes it return the previously selected database name. (Jani) - Set Content-Length header whenever possible. (thies, Yasuo) Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.29 php4/win32/php4dll.dsp:1.30 --- php4/win32/php4dll.dsp:1.29 Tue Apr 30 10:29:10 2002 +++ php4/win32/php4dll.dsp Thu May 2 05:49:39 2002 @@ -229,11 +229,54 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=..\main\config.w32.h +SOURCE=..\ext\standard\aggregation.h # End Source File # Begin Source File -SOURCE=..\ext\standard\aggregation.h +SOURCE=..\main\config.w32.h.in + +!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32..inh" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ENDIF + # End Source File # Begin Source File Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.64 php4/win32/php4dllts.dsp:1.65 --- php4/win32/php4dllts.dsp:1.64 Tue Apr 30 10:29:10 2002 +++ php4/win32/php4dllts.dsp Thu May 2 05:49:39 2002 @@ -1,26 +1,26 @@ # Microsoft Developer Studio Project File - Name="php4dllts" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** +# ** NICHT BEARBEITEN ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=php4dllts - Win32 Debug_TS -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run +!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE +!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl !MESSAGE !MESSAGE NMAKE /f "php4dllts.mak". !MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben +!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: !MESSAGE !MESSAGE NMAKE /f "php4dllts.mak" CFG="php4dllts - Win32 Debug_TS" !MESSAGE -!MESSAGE Possible choices for configuration are: +!MESSAGE Für die Konfiguration stehen zur Auswahl: !MESSAGE -!MESSAGE "php4dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4dllts - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dllts - Win32 Debug_TS" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dllts - Win32 Release_TS" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dllts - Win32 Release_TS_inline" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dllts - Win32 Release_TSDbg" (basierend auf "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -234,23 +234,23 @@ # End Source File # Begin Source File -SOURCE=..\main\streams.c +SOURCE=..\main\snprintf.c # End Source File # Begin Source File -SOURCE=..\main\strlcat.c +SOURCE=..\main\spprintf.c # End Source File # Begin Source File -SOURCE=..\main\strlcpy.c +SOURCE=..\main\streams.c # End Source File # Begin Source File -SOURCE=..\main\snprintf.c +SOURCE=..\main\strlcat.c # End Source File # Begin Source File -SOURCE=..\main\spprintf.c +SOURCE=..\main\strlcpy.c # End Source File # Begin Source File @@ -266,7 +266,50 @@ # End Source File # Begin Source File -SOURCE=..\main\config.w32.h +SOURCE=..\main\config.w32.h.in + +!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ENDIF + # End Source File # Begin Source File @@ -342,31 +385,31 @@ # End Source File # Begin Source File -SOURCE=..\main\snprintf.h +SOURCE=..\main\php_variables.h # End Source File # Begin Source File -SOURCE=..\main\spprintf.h +SOURCE=..\ext\standard\quot_print.h # End Source File # Begin Source File -SOURCE=..\main\php_variables.h +SOURCE=..\main\rfc1867.h # End Source File # Begin Source File -SOURCE=..\ext\standard\quot_print.h +SOURCE=..\main\safe_mode.h # End Source File # Begin Source File -SOURCE=..\main\rfc1867.h +SOURCE=..\main\SAPI.h # End Source File # Begin Source File -SOURCE=..\main\safe_mode.h +SOURCE=..\main\snprintf.h # End Source File # Begin Source File -SOURCE=..\main\SAPI.h +SOURCE=..\main\spprintf.h # End Source File # Begin Source File @@ -482,11 +525,11 @@ # End Source File # Begin Source File -SOURCE=..\ext\mbstring\php_mbregex.c +SOURCE=..\ext\overload\overload.c # End Source File # Begin Source File -SOURCE=..\ext\overload\overload.c +SOURCE=..\ext\mbstring\php_mbregex.c # End Source File # Begin Source File Index: php4/main/config.w32.h.in +++ php4/main/config.w32.h.in /* Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). $Id: config.w32.h.in,v 1.1 2002/05/02 09:49:41 sebastian Exp $ */ /* Default PHP / PEAR directories */ #define CONFIGURATION_FILE_PATH "php.ini" #define PHP_BINDIR "c:\\php4" #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):"" #define PHP_DATADIR "c:\\php4" #define PHP_EXTENSION_DIR "c:\\php4" #define PHP_INCLUDE_PATH ".;c:\\php4\\pear" #define PHP_LIBDIR "c:\\php4" #define PHP_LOCALSTATEDIR "c:\\php4" #define PHP_SYSCONFDIR "c:\\php4" #define PEAR_INSTALLDIR "c:\\php4\\pear" /* Enable / Disable BCMATH extension (default: enabled) */ #define WITH_BCMATH 1 /* Enable / Disable crypt() function (default: enabled) */ #define HAVE_CRYPT 1 #define PHP_STD_DES_CRYPT 1 #define PHP_EXT_DES_CRYPT 0 #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 CTYPE extension (default: enabled) */ #define HAVE_CTYPE 1 /* Enable / Disable FTP extension (default: enabled) */ #define HAVE_FTP 1 /* Enable / Disable MBSTRING extension (default: enabled) */ #define HAVE_MBSTRING 1 #define HAVE_MBREGEX 1 #define HAVE_MBSTR_CN 1 #define HAVE_MBSTR_JA 1 #define HAVE_MBSTR_KR 1 #define HAVE_MBSTR_TW 1 /* Enable / Disable MySQL extension (default: enabled) */ #define HAVE_MYSQL 1 /* Enable / Disable ODBC extension (default: enabled) */ #define HAVE_UODBC 1 /* Enable / Disable OVERLOAD extension (default: enabled) */ #define HAVE_OVERLOAD 1 /* 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 /* Enable / Disable XML extension (default: enabled) */ #define HAVE_LIBEXPAT 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" /* Platform-Specific Configuration. Should not be changed. */ #define PHP_SIGCHILD 0 #define HAVE_LIBBIND 1 #define HAVE_GETSERVBYNAME 1 #define HAVE_GETSERVBYPORT 1 #define HAVE_GETPROTOBYNAME 1 #define HAVE_GETPROTOBYNUMBER 1 #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 #define HAVE_ERRMSG_H 0 #undef HAVE_ADABAS #undef HAVE_SOLID #undef HAVE_LINK #undef HAVE_SYMLINK #undef HAVE_USLEEP #define HAVE_GETCWD 1 #define HAVE_POSIX_READDIR_R 1 #define NEED_ISBLANK 1 #define DISCARD_PATH 0 #undef HAVE_SETITIMER #undef HAVE_IODBC #define HAVE_LIBDL 1 #define HAVE_SENDMAIL 1 #define HAVE_GETTIMEOFDAY 1 #define HAVE_PUTENV 1 #define HAVE_LIMITS_H 1 #define HAVE_TZSET 1 #define HAVE_TZNAME 1 #undef HAVE_FLOCK #define HAVE_ALLOCA 1 #undef HAVE_SYS_TIME_H #define HAVE_SIGNAL_H 1 #undef HAVE_ST_BLKSIZE #undef HAVE_ST_BLOCKS #define HAVE_ST_RDEV 1 #define HAVE_UTIME_NULL 1 #define HAVE_VPRINTF 1 #define STDC_HEADERS 1 #define REGEX 1 #define HSREGEX 1 #define HAVE_GCVT 1 #define HAVE_GETLOGIN 1 #define HAVE_GETTIMEOFDAY 1 #define HAVE_MEMCPY 1 #define HAVE_MEMMOVE 1 #define HAVE_PUTENV 1 #define HAVE_REGCOMP 1 #define HAVE_SETLOCALE 1 #define HAVE_LOCALECONV 1 #define HAVE_LOCALE_H 1 #ifndef HAVE_LIBBIND #define HAVE_SETVBUF 1 #endif #define HAVE_SHUTDOWN 1 #define HAVE_SNPRINTF 1 #define HAVE_VSNPRINTF 1 #define HAVE_STRCASECMP 1 #define HAVE_STRDUP 1 #define HAVE_STRERROR 1 #define HAVE_STRSTR 1 #define HAVE_TEMPNAM 1 #define HAVE_UTIME 1 #undef HAVE_DIRENT_H #define HAVE_ASSERT_H 1 #define HAVE_FCNTL_H 1 #define HAVE_GRP_H 0 #define HAVE_PWD_H 1 #define HAVE_STRING_H 1 #undef HAVE_SYS_FILE_H #undef HAVE_SYS_SOCKET_H #undef HAVE_SYS_WAIT_H #define HAVE_SYSLOG_H 1 #undef HAVE_UNISTD_H #define HAVE_LIBDL 1 #define HAVE_LIBM 1 #define HAVE_CUSERID 0 #undef HAVE_RINT #define HAVE_STRFTIME 1 #define SIZEOF_INT 4
Index: php4/NEWS diff -u php4/NEWS:1.966 php4/NEWS:1.967 --- php4/NEWS:1.966 Thu May 2 04:30:29 2002 +++ php4/NEWS Thu May 2 05:49:38 2002 @@ -1,6 +1,8 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2002, Version 4.3.0 +- The Windows build can now be configures more comfortably, for instance in + regard to built-in extensions. (Sebastian) - Added optional 3rd parameter to mysql_select_db() which makes it return the previously selected database name. (Jani) - Set Content-Length header whenever possible. (thies, Yasuo) Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.29 php4/win32/php4dll.dsp:1.30 --- php4/win32/php4dll.dsp:1.29 Tue Apr 30 10:29:10 2002 +++ php4/win32/php4dll.dsp Thu May 2 05:49:39 2002 @@ -229,11 +229,54 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=..\main\config.w32.h +SOURCE=..\ext\standard\aggregation.h # End Source File # Begin Source File -SOURCE=..\ext\standard\aggregation.h +SOURCE=..\main\config.w32.h.in + +!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32..inh" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ENDIF + # End Source File # Begin Source File Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.64 php4/win32/php4dllts.dsp:1.65 --- php4/win32/php4dllts.dsp:1.64 Tue Apr 30 10:29:10 2002 +++ php4/win32/php4dllts.dsp Thu May 2 05:49:39 2002 @@ -1,26 +1,26 @@ # Microsoft Developer Studio Project File - Name="php4dllts" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** +# ** NICHT BEARBEITEN ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=php4dllts - Win32 Debug_TS -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run +!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE +!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl !MESSAGE !MESSAGE NMAKE /f "php4dllts.mak". !MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben +!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: !MESSAGE !MESSAGE NMAKE /f "php4dllts.mak" CFG="php4dllts - Win32 Debug_TS" !MESSAGE -!MESSAGE Possible choices for configuration are: +!MESSAGE Für die Konfiguration stehen zur Auswahl: !MESSAGE -!MESSAGE "php4dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "php4dllts - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dllts - Win32 Debug_TS" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dllts - Win32 Release_TS" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dllts - Win32 Release_TS_inline" (basierend auf "Win32 (x86) Dynamic-Link Library") +!MESSAGE "php4dllts - Win32 Release_TSDbg" (basierend auf "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -234,23 +234,23 @@ # End Source File # Begin Source File -SOURCE=..\main\streams.c +SOURCE=..\main\snprintf.c # End Source File # Begin Source File -SOURCE=..\main\strlcat.c +SOURCE=..\main\spprintf.c # End Source File # Begin Source File -SOURCE=..\main\strlcpy.c +SOURCE=..\main\streams.c # End Source File # Begin Source File -SOURCE=..\main\snprintf.c +SOURCE=..\main\strlcat.c # End Source File # Begin Source File -SOURCE=..\main\spprintf.c +SOURCE=..\main\strlcpy.c # End Source File # Begin Source File @@ -266,7 +266,50 @@ # End Source File # Begin Source File -SOURCE=..\main\config.w32.h +SOURCE=..\main\config.w32.h.in + +!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" + +# Begin Custom Build +InputPath=..\main\config.w32.h.in + +"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy ..\main\config.w32.h.in ..\main\config.w32.h > nul + +# End Custom Build + +!ENDIF + # End Source File # Begin Source File @@ -342,31 +385,31 @@ # End Source File # Begin Source File -SOURCE=..\main\snprintf.h +SOURCE=..\main\php_variables.h # End Source File # Begin Source File -SOURCE=..\main\spprintf.h +SOURCE=..\ext\standard\quot_print.h # End Source File # Begin Source File -SOURCE=..\main\php_variables.h +SOURCE=..\main\rfc1867.h # End Source File # Begin Source File -SOURCE=..\ext\standard\quot_print.h +SOURCE=..\main\safe_mode.h # End Source File # Begin Source File -SOURCE=..\main\rfc1867.h +SOURCE=..\main\SAPI.h # End Source File # Begin Source File -SOURCE=..\main\safe_mode.h +SOURCE=..\main\snprintf.h # End Source File # Begin Source File -SOURCE=..\main\SAPI.h +SOURCE=..\main\spprintf.h # End Source File # Begin Source File @@ -482,11 +525,11 @@ # End Source File # Begin Source File -SOURCE=..\ext\mbstring\php_mbregex.c +SOURCE=..\ext\overload\overload.c # End Source File # Begin Source File -SOURCE=..\ext\overload\overload.c +SOURCE=..\ext\mbstring\php_mbregex.c # End Source File # Begin Source File Index: php4/main/config.w32.h.in +++ php4/main/config.w32.h.in /* Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). $Id: config.w32.h.in,v 1.1 2002/05/02 09:49:41 sebastian Exp $ */ /* Default PHP / PEAR directories */ #define CONFIGURATION_FILE_PATH "php.ini" #define PHP_BINDIR "c:\\php4" #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):"" #define PHP_DATADIR "c:\\php4" #define PHP_EXTENSION_DIR "c:\\php4" #define PHP_INCLUDE_PATH ".;c:\\php4\\pear" #define PHP_LIBDIR "c:\\php4" #define PHP_LOCALSTATEDIR "c:\\php4" #define PHP_SYSCONFDIR "c:\\php4" #define PEAR_INSTALLDIR "c:\\php4\\pear" /* Enable / Disable BCMATH extension (default: enabled) */ #define WITH_BCMATH 1 /* Enable / Disable crypt() function (default: enabled) */ #define HAVE_CRYPT 1 #define PHP_STD_DES_CRYPT 1 #define PHP_EXT_DES_CRYPT 0 #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 CTYPE extension (default: enabled) */ #define HAVE_CTYPE 1 /* Enable / Disable FTP extension (default: enabled) */ #define HAVE_FTP 1 /* Enable / Disable MBSTRING extension (default: enabled) */ #define HAVE_MBSTRING 1 #define HAVE_MBREGEX 1 #define HAVE_MBSTR_CN 1 #define HAVE_MBSTR_JA 1 #define HAVE_MBSTR_KR 1 #define HAVE_MBSTR_TW 1 /* Enable / Disable MySQL extension (default: enabled) */ #define HAVE_MYSQL 1 /* Enable / Disable ODBC extension (default: enabled) */ #define HAVE_UODBC 1 /* Enable / Disable OVERLOAD extension (default: enabled) */ #define HAVE_OVERLOAD 1 /* 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 /* Enable / Disable XML extension (default: enabled) */ #define HAVE_LIBEXPAT 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" /* Platform-Specific Configuration. Should not be changed. */ #define PHP_SIGCHILD 0 #define HAVE_LIBBIND 1 #define HAVE_GETSERVBYNAME 1 #define HAVE_GETSERVBYPORT 1 #define HAVE_GETPROTOBYNAME 1 #define HAVE_GETPROTOBYNUMBER 1 #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 #define HAVE_ERRMSG_H 0 #undef HAVE_ADABAS #undef HAVE_SOLID #undef HAVE_LINK #undef HAVE_SYMLINK #undef HAVE_USLEEP #define HAVE_GETCWD 1 #define HAVE_POSIX_READDIR_R 1 #define NEED_ISBLANK 1 #define DISCARD_PATH 0 #undef HAVE_SETITIMER #undef HAVE_IODBC #define HAVE_LIBDL 1 #define HAVE_SENDMAIL 1 #define HAVE_GETTIMEOFDAY 1 #define HAVE_PUTENV 1 #define HAVE_LIMITS_H 1 #define HAVE_TZSET 1 #define HAVE_TZNAME 1 #undef HAVE_FLOCK #define HAVE_ALLOCA 1 #undef HAVE_SYS_TIME_H #define HAVE_SIGNAL_H 1 #undef HAVE_ST_BLKSIZE #undef HAVE_ST_BLOCKS #define HAVE_ST_RDEV 1 #define HAVE_UTIME_NULL 1 #define HAVE_VPRINTF 1 #define STDC_HEADERS 1 #define REGEX 1 #define HSREGEX 1 #define HAVE_GCVT 1 #define HAVE_GETLOGIN 1 #define HAVE_GETTIMEOFDAY 1 #define HAVE_MEMCPY 1 #define HAVE_MEMMOVE 1 #define HAVE_PUTENV 1 #define HAVE_REGCOMP 1 #define HAVE_SETLOCALE 1 #define HAVE_LOCALECONV 1 #define HAVE_LOCALE_H 1 #ifndef HAVE_LIBBIND #define HAVE_SETVBUF 1 #endif #define HAVE_SHUTDOWN 1 #define HAVE_SNPRINTF 1 #define HAVE_VSNPRINTF 1 #define HAVE_STRCASECMP 1 #define HAVE_STRDUP 1 #define HAVE_STRERROR 1 #define HAVE_STRSTR 1 #define HAVE_TEMPNAM 1 #define HAVE_UTIME 1 #undef HAVE_DIRENT_H #define HAVE_ASSERT_H 1 #define HAVE_FCNTL_H 1 #define HAVE_GRP_H 0 #define HAVE_PWD_H 1 #define HAVE_STRING_H 1 #undef HAVE_SYS_FILE_H #undef HAVE_SYS_SOCKET_H #undef HAVE_SYS_WAIT_H #define HAVE_SYSLOG_H 1 #undef HAVE_UNISTD_H #define HAVE_LIBDL 1 #define HAVE_LIBM 1 #define HAVE_CUSERID 0 #undef HAVE_RINT #define HAVE_STRFTIME 1 #define SIZEOF_INT 4