The Windows build can now be configures more comfortably, for instance in regard...

diff --git a/NEWS b/NEWS
index 06aee2e64814d9461e256fd755cdb675d41268fc..e9a4d5d61fbf39626bb06865e3f61db66835fba1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)

diff --git a/main/config.w32.h b/main/config.w32.h.in
similarity index 100%
rename from main/config.w32.h
rename to main/config.w32.h.in

diff --git a/win32/php4dll.dsp b/win32/php4dll.dsp
index 9c5146b8839d2826857623df5a0955390710d563..0ea1bb802724e770aa9be34d89ad5e5161baba72 100644 (file)
--- a/win32/php4dll.dsp
+++ b/win32/php4dll.dsp
@@ -229,11 +229,54 @@ SOURCE=..\main\spprintf.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\main\config.w32.h\r
+SOURCE=..\ext\standard\aggregation.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\standard\aggregation.h\r
+SOURCE=..\main\config.w32.h.in\r
+\r
+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=..\main\config.w32.h.in\r
+\r
+"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=..\main\config.w32.h.in\r
+\r
+"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
+\r
+# Begin Custom Build\r
+InputPath=..\main\config.w32.h.in\r
+\r
+"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"\r
+\r
+# Begin Custom Build\r
+InputPath=..\main\config.w32.h.in\r
+\r
+"..\main\config.w32..inh" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index be848ec9bac111f3700d17405b07da9651ff8902..0c2ca99251e35203fe56357f692c8853d1c41721 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -1,26 +1,26 @@
 # Microsoft Developer Studio Project File - Name="php4dllts" - Package Owner=<4>\r
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
+# ** NICHT BEARBEITEN **\r
 \r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
 CFG=php4dllts - Win32 Debug_TS\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE\r
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl\r
 !MESSAGE \r
 !MESSAGE NMAKE /f "php4dllts.mak".\r
 !MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben\r
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:\r
 !MESSAGE \r
 !MESSAGE NMAKE /f "php4dllts.mak" CFG="php4dllts - Win32 Debug_TS"\r
 !MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
+!MESSAGE Für die Konfiguration stehen zur Auswahl:\r
 !MESSAGE \r
-!MESSAGE "php4dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "php4dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "php4dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "php4dllts - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dllts - Win32 Debug_TS" (basierend auf  "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dllts - Win32 Release_TS" (basierend auf  "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dllts - Win32 Release_TS_inline" (basierend auf  "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dllts - Win32 Release_TSDbg" (basierend auf  "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -234,23 +234,23 @@ SOURCE=..\main\SAPI.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\streams.c\r
+SOURCE=..\main\snprintf.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\strlcat.c\r
+SOURCE=..\main\spprintf.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\strlcpy.c\r
+SOURCE=..\main\streams.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\snprintf.c\r
+SOURCE=..\main\strlcat.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\spprintf.c\r
+SOURCE=..\main\strlcpy.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -266,7 +266,50 @@ SOURCE=..\ext\standard\aggregation.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\config.w32.h\r
+SOURCE=..\main\config.w32.h.in\r
+\r
+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=..\main\config.w32.h.in\r
+\r
+"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=..\main\config.w32.h.in\r
+\r
+"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
+\r
+# Begin Custom Build\r
+InputPath=..\main\config.w32.h.in\r
+\r
+"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"\r
+\r
+# Begin Custom Build\r
+InputPath=..\main\config.w32.h.in\r
+\r
+"..\main\config.w32.h.in" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy ..\main\config.w32.h.in ..\main\config.w32.h > nul\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -342,31 +385,31 @@ SOURCE=..\main\php_streams.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\snprintf.h\r
+SOURCE=..\main\php_variables.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\spprintf.h\r
+SOURCE=..\ext\standard\quot_print.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\php_variables.h\r
+SOURCE=..\main\rfc1867.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\standard\quot_print.h\r
+SOURCE=..\main\safe_mode.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\rfc1867.h\r
+SOURCE=..\main\SAPI.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\safe_mode.h\r
+SOURCE=..\main\snprintf.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\SAPI.h\r
+SOURCE=..\main\spprintf.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -482,11 +525,11 @@ SOURCE=..\ext\mbstring\mbstring.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\mbstring\php_mbregex.c\r
+SOURCE=..\ext\overload\overload.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\overload\overload.c\r
+SOURCE=..\ext\mbstring\php_mbregex.c\r
 # End Source File\r
 # Begin Source File\r
 \r