First try at getting the Windows build working again after libxml2 got unbundled.

diff --git a/main/config.w32.h b/main/config.w32.h
index 16c26b47dad0f90c57960782e5d5ccdd0d4dfc82..8654cb2fb186405bbf338fb21743fb11837394ff 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -74,7 +74,6 @@
 
 /* Enable / Disable XML extension (default: enabled) */
 #define HAVE_LIBEXPAT 1
-#define HAVE_XML 1
 
 /* Enable / Disable ZLIB extension (default: enabled) */
 #define HAVE_ZLIB 1

diff --git a/win32/php4dll.dsp b/win32/php4dll.dsp
index ad79b5fa97e35c1eed7c1530f732250a43d518f8..8cc920e7071253f89bc91c1e570c908893327b55 100644 (file)
--- a/win32/php4dll.dsp
+++ b/win32/php4dll.dsp
@@ -141,7 +141,7 @@ SOURCE="..\main\fopen_wrappers.c"
 # Begin Source File\r
 \r
 SOURCE=..\main\internal_functions_win32.c\r
-# ADD CPP /I "..\bundle\expat\xmlparse" /I "..\bundle\expat\xmltok"\r
+# ADD CPP /I "..\ext\xml\expat\xmlparse" /I "..\ext\xml\expat\xmltok"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -897,12 +897,12 @@ SOURCE=..\ext\tokenizer\tokenizer.c
 # Begin Source File\r
 \r
 SOURCE=..\ext\wddx\wddx.c\r
-# ADD CPP /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
+# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\xml\xml.c\r
-# ADD CPP /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
+# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files No. 4"\r
@@ -1746,17 +1746,17 @@ SOURCE=..\LICENSE
 # PROP Default_Filter ".c"\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmlparse.c\r
+SOURCE=..\ext\xml\expat\xmlparse.c\r
 # ADD CPP /D "COMPILED_FROM_DSP"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmlrole.c\r
+SOURCE=..\ext\xml\expat\xmlrole.c\r
 # ADD CPP /D "COMPILED_FROM_DSP"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmltok.c\r
+SOURCE=..\ext\xml\expat\xmltok.c\r
 # ADD CPP /D "COMPILED_FROM_DSP"\r
 # End Source File\r
 # End Group\r
@@ -1765,47 +1765,47 @@ SOURCE=..\bundle\expat\xmltok.c
 # PROP Default_Filter ".h"\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\ascii.h\r
+SOURCE=..\ext\xml\expat\ascii.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\asciitab.h\r
+SOURCE=..\ext\xml\expat\asciitab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\expat.h\r
+SOURCE=..\ext\xml\expat\expat.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\iasciitab.h\r
+SOURCE=..\ext\xml\expat\iasciitab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\latin1tab.h\r
+SOURCE=..\ext\xml\expat\latin1tab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\nametab.h\r
+SOURCE=..\ext\xml\expat\nametab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\utf8tab.h\r
+SOURCE=..\ext\xml\expat\utf8tab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\winconfig.h\r
+SOURCE=..\ext\xml\expat\winconfig.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmlrole.h\r
+SOURCE=..\ext\xml\expat\xmlrole.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmltok.h\r
+SOURCE=..\ext\xml\expat\xmltok.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmltok_impl.h\r
+SOURCE=..\ext\xml\expat\xmltok_impl.h\r
 # End Source File\r
 # End Group\r
 # End Group\r

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 90f5d945aaa478c8c92c8286819c03ea0afec80a..65dc89d47715d10b94488fcc22173fbe471d041d 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -174,7 +174,7 @@ SOURCE="..\main\fopen_wrappers.c"
 # Begin Source File\r
 \r
 SOURCE=..\main\internal_functions_win32.c\r
-# ADD CPP /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
+# ADD CPP /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -474,20 +474,20 @@ SOURCE=..\ext\wddx\wddx.c
 \r
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
 \r
-# ADD CPP /I "..\bundle\expat\xmlparse" /I "..\bundle\expat\xmltok"\r
+# ADD CPP /I "..\ext\xml\expat\xmlparse" /I "..\ext\xml\expat\xmltok"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r
-# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
+# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
 \r
-# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
+# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"\r
 \r
-# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
-# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
+# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
+# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
 \r
 !ENDIF \r
 \r
@@ -498,20 +498,20 @@ SOURCE=..\ext\xml\xml.c
 \r
 !IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
 \r
-# ADD CPP /I "..\bundle\expat\xmlparse" /I "..\bundle\expat\xmltok"\r
+# ADD CPP /I "..\ext\xml\expat\xmlparse" /I "..\ext\xml\expat\xmltok"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r
-# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
+# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
 \r
-# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
+# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"\r
 \r
-# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
-# ADD CPP /I "bundle\expat\xmlparse" /I "..\bundle\expat\xmltok" /I "..\bundle\expat\xmlparse"\r
+# ADD BASE CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
+# ADD CPP /I "bundle\expat\xmlparse" /I "..\ext\xml\expat\xmltok" /I "..\ext\xml\expat\xmlparse"\r
 \r
 !ENDIF \r
 \r
@@ -2147,17 +2147,17 @@ SOURCE=..\TODO
 # PROP Default_Filter ".c"\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmlparse.c\r
+SOURCE=..\ext\xml\expat\xmlparse.c\r
 # ADD CPP /D "COMPILED_FROM_DSP"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmlrole.c\r
+SOURCE=..\ext\xml\expat\xmlrole.c\r
 # ADD CPP /D "COMPILED_FROM_DSP"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmltok.c\r
+SOURCE=..\ext\xml\expat\xmltok.c\r
 # ADD CPP /D "COMPILED_FROM_DSP"\r
 # End Source File\r
 # End Group\r
@@ -2166,47 +2166,47 @@ SOURCE=..\bundle\expat\xmltok.c
 # PROP Default_Filter ".h"\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\ascii.h\r
+SOURCE=..\ext\xml\expat\ascii.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\asciitab.h\r
+SOURCE=..\ext\xml\expat\asciitab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\expat.h\r
+SOURCE=..\ext\xml\expat\expat.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\iasciitab.h\r
+SOURCE=..\ext\xml\expat\iasciitab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\latin1tab.h\r
+SOURCE=..\ext\xml\expat\latin1tab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\nametab.h\r
+SOURCE=..\ext\xml\expat\nametab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\utf8tab.h\r
+SOURCE=..\ext\xml\expat\utf8tab.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\winconfig.h\r
+SOURCE=..\ext\xml\expat\winconfig.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmlrole.h\r
+SOURCE=..\ext\xml\expat\xmlrole.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmltok.h\r
+SOURCE=..\ext\xml\expat\xmltok.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\bundle\expat\xmltok_impl.h\r
+SOURCE=..\ext\xml\expat\xmltok_impl.h\r
 # End Source File\r
 # End Group\r
 # End Group\r