Several fixes, plus remove bindlib_w32 (it's more trouble than it's worth)

diff --git a/ext/imap/imap.dsp b/ext/imap/imap.dsp
index e7c3a8ba0ed61061e65e1c7781a763ebef9895d0..b56f29c336718e49175c47d6baa1028911d11c7d 100644 (file)
--- a/ext/imap/imap.dsp
+++ b/ext/imap/imap.dsp
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 c-client.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug_TS"\r
+# ADD LINK32 c-client.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "imap - Win32 Debug_TS"\r
 \r

diff --git a/ext/mysql/mysql.dsp b/ext/mysql/mysql.dsp
index fe5adf4f58fdf024eaf04f29652cc68b3d088f9b..20f69629f41ce0278fe5f689f5f74393d7e40f19 100644 (file)
--- a/ext/mysql/mysql.dsp
+++ b/ext/mysql/mysql.dsp
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4nts.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4nts_debug.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "mysql - Win32 Debug_TS"\r
 \r

diff --git a/main/config.w32.h b/main/config.w32.h
index 28ad26099b8216c4d8884ad25736b5caf38aabd1..5d598acb27db7720f7b56a77d6fed748b62f55c4 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -53,7 +53,6 @@
 #if !defined(COMPILE_DL)
 #define HAVE_SNMP 0
 # define HAVE_ERRMSG_H 0 /*needed for mysql 3.21.17 and up*/
-#define HAVE_LDAP 0
 #define DBASE 0
 #define NDBM 0
 #define GDBM 0

diff --git a/php4.dsw b/php4.dsw
index 85bc906451eea59da452eeab61f024d7a02a3859..f96406c5c83ecba101e2ea44e8959da33ec38a9f 100644 (file)
--- a/php4.dsw
+++ b/php4.dsw
@@ -15,18 +15,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "bindlib"=.\bindlib_w32\bindlib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "libmysql"=.\ext\mysql\libmysql\libmysql.dsp - Package Owner=<4>
 
 Package=<5>
@@ -68,9 +56,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libmysql
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name bindlib
-    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/php4dll.dsp b/php4dll.dsp
index 88c30e5bdcb4354a363519ea1bf110989dc56caa..dc07f291c6c1b54b5e71cc2825439715dcb37250 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"Debug/php4nts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug" /libpath:"Zend\Debug" /libpath:"bindlib_w32\Debug" /libpath:"ext\mysql\libmysql\Debug_TS"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"Debug/php4nts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug" /libpath:"Zend\Debug" /libpath:"..\bindlib_w32\Debug" /libpath:"ext\mysql\libmysql\Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release_TS"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release_inline"\r
 \r
@@ -107,7 +107,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"bindlib_w32\Release_inline"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"Zend\Release_inline" /libpath:"..\bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release"\r
 \r
 !ENDIF \r
 \r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 957fa984e7d4e27a18b4516943fe8433259db9ec..413acb5be5df4afdb5f5f44d5ef9a6d68d450b1d 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"Zend\Debug_TS" /libpath:"bindlib_w32\Debug_TS" /libpath:"ext\mysql\libmysql\Debug_TS"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts_debug.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"Zend\Debug_TS" /libpath:"..\bindlib_w32\Debug" /libpath:"ext\mysql\libmysql\Debug_TS"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"bindlib_w32\Release_TS" /libpath:"ext\mysql\libmysql\Release_TS"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release_TS"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
 \r
@@ -107,7 +107,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS_inline/php4ts.dll" /libpath:"TSRM\Release_TS_inline" /libpath:"Zend\Release_TS_inline" /libpath:"bindlib_w32\Release_TS_inline" /libpath:"ext\mysql\libmysql\Release_TS_inline"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS_inline/php4ts.dll" /libpath:"TSRM\Release_TS_inline" /libpath:"Zend\Release_TS_inline" /libpath:"..\bindlib_w32\Release" /libpath:"ext\mysql\libmysql\Release_TS_inline"\r
 \r
 !ENDIF \r
 \r

diff --git a/php4ts.dsw b/php4ts.dsw
index 4fbc54386d49d7671ecc0d45e9899fdf40b7adbf..82a3854d168d10c8f6c55edaf21b4dee62c3b28c 100644 (file)
--- a/php4ts.dsw
+++ b/php4ts.dsw
@@ -30,18 +30,6 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "bindlib"=.\bindlib_w32\bindlib.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
 Project: "libmysql"=.\ext\mysql\libmysql\libmysql.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r

diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw
index ecab1b710b7a251daf0c72b3442f98bfbfebcee2..64c90e9b35a0c8bf430bf2b7c6371e503f912f58 100644 (file)
--- a/win32/php_modules.dsw
+++ b/win32/php_modules.dsw
@@ -27,6 +27,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "ldap"=.\ext\ldap\ldap.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "mysql"=.\ext\mysql\mysql.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r