From 738b47c13e36a476d0486cf2197c491579936b9a Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sebastian@php.net>
Date: Thu, 2 May 2002 09:49:41 +0000
Subject: [PATCH] The Windows build can now be configures more comfortably, for
 instance in regard to built-in extensions.

---
 NEWS                                   |  2 +
 main/{config.w32.h => config.w32.h.in} |  0
 win32/php4dll.dsp                      | 47 ++++++++++++-
 win32/php4dllts.dsp                    | 93 +++++++++++++++++++-------
 4 files changed, 115 insertions(+), 27 deletions(-)
 rename main/{config.w32.h => config.w32.h.in} (100%)

diff --git a/NEWS b/NEWS
index 06aee2e648..e9a4d5d61f 100644
--- 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 9c5146b883..0ea1bb8027 100644
--- a/win32/php4dll.dsp
+++ b/win32/php4dll.dsp
@@ -229,11 +229,54 @@ SOURCE=..\main\spprintf.c
 # 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
 
diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index be848ec9ba..0c2ca99251 100644
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -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 @@ SOURCE=..\main\SAPI.c
 # 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 @@ SOURCE=..\ext\standard\aggregation.h
 # 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 @@ SOURCE=..\main\php_streams.h
 # 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 @@ SOURCE=..\ext\mbstring\mbstring.c
 # 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
 
-- 
2.50.1