 |
 |
 |
 |
|
|
Date: 08/30/98
- Next message: shane: "[PHP-DEV] CVS update: php3/functions"
- Previous message: teg <email protected>: "[PHP-DEV] Bug #707: typo - wrong range in strftime"
- Next in thread: zeev: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Sunday August 30, 1998 @ 15:06
Author: shane
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv26260
Modified Files:
config.w32.h ldap.dsp
Log Message:
Backport ldap changes from 3.1 tree. This only effects windows compilation,
should be no effect on unix. Tested with NS Ldap 3.0 library.
Index: php3/config.w32.h
diff -c php3/config.w32.h:1.70 php3/config.w32.h:1.71
*** php3/config.w32.h:1.70 Fri Aug 14 16:13:46 1998
--- php3/config.w32.h Sun Aug 30 15:06:37 1998
***************
*** 65,70 ****
--- 65,71 ----
#define HAVE_LIBGD 1
#define HAVE_LIBGD13 1
#define HAVE_LIBTTF 1
+ #define HAVE_IMAP 1
#else
#define HAVE_SNMP 0
Index: php3/ldap.dsp
diff -c php3/ldap.dsp:1.7 php3/ldap.dsp:1.8
*** php3/ldap.dsp:1.7 Fri Aug 14 17:57:44 1998
--- php3/ldap.dsp Sun Aug 30 15:06:38 1998
***************
*** 42,48 ****
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GX /O2 /I "\src\include" /I "\src\phpcvs\php3" /D "NDEBUG" /D "COMPILE_DL" /D "MSVC5" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
--- 42,48 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GX /O2 /I "\src\nspr\mozilla\dist\public\ldap" /I "\src\include" /I "\src\phpcvs\php3" /D "NDEBUG" /D "COMPILE_DL" /D "MSVC5" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
***************
*** 52,58 ****
# ADD BSC32 /nologo
LINK32=link.exe
# 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 /subsystem:windows /dll /machine:I386
! # ADD LINK32 php.lib nsldap32v11.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 /nologo /subsystem:windows /dll /machine:I386 /out:"module_Release/php3_ldap.dll" /libpath:"\src\lib" /libpath:"\src\phpcvs\php3\cgi_release"
!ELSEIF "$(CFG)" == "ldap - Win32 Debug"
--- 52,58 ----
# ADD BSC32 /nologo
LINK32=link.exe
# 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 /subsystem:windows /dll /machine:I386
! # ADD LINK32 php.lib nsldap32v30.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 /nologo /subsystem:windows /dll /machine:I386 /out:"module_Release/php3_ldap.dll" /libpath:"\src\nspr\mozilla\dist\win32_d.obj\lib" /libpath:"\src\lib" /libpath:"\src\phpcvs\php3\cgi_release"
!ELSEIF "$(CFG)" == "ldap - Win32 Debug"
***************
*** 68,74 ****
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "\src\include" /I "\src\phpcvs\php3" /D "_DEBUG" /D "COMPILE_DL" /D "MSVC5" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
--- 68,74 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "\src\nspr\mozilla\dist\public\ldap" /I "\src\phpcvs\php3" /D "_DEBUG" /D "COMPILE_DL" /D "MSVC5" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
***************
*** 78,84 ****
# ADD BSC32 /nologo
LINK32=link.exe
# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 php.lib nsldap32v11.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 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"module_Debug/php3_ldap.dll" /pdbtype:sept /libpath:"\src\lib" /libpath:"\src\phpcvs\php3\cgi_debug"
!ENDIF
--- 78,84 ----
# ADD BSC32 /nologo
LINK32=link.exe
# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 php.lib nsldap32v30.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 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"module_Debug/php3_ldap.dll" /pdbtype:sept /libpath:"\src\nspr\mozilla\dist\win32_d.obj\lib" /libpath:"\src\lib" /libpath:"\src\phpcvs\php3\cgi_debug"
!ENDIF
-- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe <email protected> For help: php-dev-help <email protected>
- Next message: shane: "[PHP-DEV] CVS update: php3/functions"
- Previous message: teg <email protected>: "[PHP-DEV] Bug #707: typo - wrong range in strftime"
- Next in thread: zeev: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]