Upstream tarball 2.2.22upstream/2.2.22

5 files changed, 18 insertions, 659 deletions

diff --git a/srclib/apr-util/ldap/apr_ldap.dep b/srclib/apr-util/ldap/apr_ldap.dep
deleted file mode 100644
index 810466fc..00000000
--- a/srclib/apr-util/ldap/apr_ldap.dep
+++ /dev/null
@@ -1,37 +0,0 @@
-# Microsoft Developer Studio Generated Dependency File, included by apr_ldap.mak
-
-.\apr_ldap_init.c : \
-	"..\include\apr_ldap.h"\
-	"..\include\apr_ldap_init.h"\
-	"..\include\apr_ldap_option.h"\
-	"..\include\apr_ldap_rebind.h"\
-	"..\include\apr_ldap_url.h"\
-	"..\include\apu.h"\
-	"..\include\private\apu_config.h"\
-	"..\include\private\apu_internal.h"\
-	
-
-.\apr_ldap_option.c : \
-	"..\include\apr_ldap.h"\
-	"..\include\apr_ldap_init.h"\
-	"..\include\apr_ldap_option.h"\
-	"..\include\apr_ldap_rebind.h"\
-	"..\include\apr_ldap_url.h"\
-	"..\include\apu.h"\
-	"..\include\private\apu_config.h"\
-	
-
-.\apr_ldap_rebind.c : \
-	"..\include\apr_ldap.h"\
-	"..\include\apr_ldap_init.h"\
-	"..\include\apr_ldap_option.h"\
-	"..\include\apr_ldap_rebind.h"\
-	"..\include\apr_ldap_url.h"\
-	"..\include\apu.h"\
-	"..\include\private\apu_config.h"\
-	
-
-..\libaprutil.rc : \
-	"..\include\apu.h"\
-	"..\include\apu_version.h"\
-	
diff --git a/srclib/apr-util/ldap/apr_ldap.mak b/srclib/apr-util/ldap/apr_ldap.mak
deleted file mode 100644
index 142da4d4..00000000
--- a/srclib/apr-util/ldap/apr_ldap.mak
+++ /dev/null
@@ -1,620 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on apr_ldap.dsp
-!IF "$(CFG)" == ""
-CFG=apr_ldap - Win32 Release
-!MESSAGE No configuration specified. Defaulting to apr_ldap - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "apr_ldap - Win32 Release" && "$(CFG)" != "apr_ldap - Win32 Debug" && "$(CFG)" != "apr_ldap - x64 Release" && "$(CFG)" != "apr_ldap - x64 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_ldap.mak" CFG="apr_ldap - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_ldap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_ldap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_ldap - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apr_ldap - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_ldap - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\apr_ldap-1.res"
-	-@erase "$(INTDIR)\apr_ldap_init.obj"
-	-@erase "$(INTDIR)\apr_ldap_option.obj"
-	-@erase "$(INTDIR)\apr_ldap_rebind.obj"
-	-@erase "$(INTDIR)\apr_ldap_src.idb"
-	-@erase "$(INTDIR)\apr_ldap_src.pdb"
-	-@erase "$(OUTDIR)\apr_ldap-1.dll"
-	-@erase "$(OUTDIR)\apr_ldap-1.exp"
-	-@erase "$(OUTDIR)\apr_ldap-1.lib"
-	-@erase "$(OUTDIR)\apr_ldap-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X86 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap-1.res" \
-	"..\..\apr\Release\libapr-1.lib" \
-	"..\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Release\apr_ldap-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
-   if exist .\Release\apr_ldap-1.dll.manifest mt.exe -manifest .\Release\apr_ldap-1.dll.manifest -outputresource:.\Release\apr_ldap-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\apr_ldap-1.res"
-	-@erase "$(INTDIR)\apr_ldap_init.obj"
-	-@erase "$(INTDIR)\apr_ldap_option.obj"
-	-@erase "$(INTDIR)\apr_ldap_rebind.obj"
-	-@erase "$(INTDIR)\apr_ldap_src.idb"
-	-@erase "$(INTDIR)\apr_ldap_src.pdb"
-	-@erase "$(OUTDIR)\apr_ldap-1.dll"
-	-@erase "$(OUTDIR)\apr_ldap-1.exp"
-	-@erase "$(OUTDIR)\apr_ldap-1.lib"
-	-@erase "$(OUTDIR)\apr_ldap-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X86 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap-1.res" \
-	"..\..\apr\Debug\libapr-1.lib" \
-	"..\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\Debug\apr_ldap-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
-   if exist .\Debug\apr_ldap-1.dll.manifest mt.exe -manifest .\Debug\apr_ldap-1.dll.manifest -outputresource:.\Debug\apr_ldap-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
-
-OUTDIR=.\x64\Release
-INTDIR=.\x64\Release
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Release" "libapr - x64 Release" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 ReleaseCLEAN" "libaprutil - x64 ReleaseCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\apr_ldap-1.res"
-	-@erase "$(INTDIR)\apr_ldap_init.obj"
-	-@erase "$(INTDIR)\apr_ldap_option.obj"
-	-@erase "$(INTDIR)\apr_ldap_rebind.obj"
-	-@erase "$(INTDIR)\apr_ldap_src.idb"
-	-@erase "$(INTDIR)\apr_ldap_src.pdb"
-	-@erase "$(OUTDIR)\apr_ldap-1.dll"
-	-@erase "$(OUTDIR)\apr_ldap-1.exp"
-	-@erase "$(OUTDIR)\apr_ldap-1.lib"
-	-@erase "$(OUTDIR)\apr_ldap-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X64 /opt:ref 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap-1.res" \
-	"..\..\apr\x64\Release\libapr-1.lib" \
-	"..\x64\Release\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Release\apr_ldap-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Release
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
-   if exist .\x64\Release\apr_ldap-1.dll.manifest mt.exe -manifest .\x64\Release\apr_ldap-1.dll.manifest -outputresource:.\x64\Release\apr_ldap-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
-
-OUTDIR=.\x64\Debug
-INTDIR=.\x64\Debug
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ELSE 
-
-ALL : "libaprutil - x64 Debug" "libapr - x64 Debug" "$(OUTDIR)\apr_ldap-1.dll" "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libapr - x64 DebugCLEAN" "libaprutil - x64 DebugCLEAN" 
-!ELSE 
-CLEAN :
-!ENDIF 
-	-@erase "$(INTDIR)\apr_ldap-1.res"
-	-@erase "$(INTDIR)\apr_ldap_init.obj"
-	-@erase "$(INTDIR)\apr_ldap_option.obj"
-	-@erase "$(INTDIR)\apr_ldap_rebind.obj"
-	-@erase "$(INTDIR)\apr_ldap_src.idb"
-	-@erase "$(INTDIR)\apr_ldap_src.pdb"
-	-@erase "$(OUTDIR)\apr_ldap-1.dll"
-	-@erase "$(OUTDIR)\apr_ldap-1.exp"
-	-@erase "$(OUTDIR)\apr_ldap-1.lib"
-	-@erase "$(OUTDIR)\apr_ldap-1.pdb"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\apr_ldap_src" /FD /EHsc /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\apr_ldap.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\apr_ldap-1.pdb" /debug /out:"$(OUTDIR)\apr_ldap-1.dll" /implib:"$(OUTDIR)\apr_ldap-1.lib" /MACHINE:X64 
-LINK32_OBJS= \
-	"$(INTDIR)\apr_ldap_init.obj" \
-	"$(INTDIR)\apr_ldap_option.obj" \
-	"$(INTDIR)\apr_ldap_rebind.obj" \
-	"$(INTDIR)\apr_ldap-1.res" \
-	"..\..\apr\x64\Debug\libapr-1.lib" \
-	"..\x64\Debug\libaprutil-1.lib"
-
-"$(OUTDIR)\apr_ldap-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-TargetPath=.\x64\Debug\apr_ldap-1.dll
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-# Begin Custom Macros
-OutDir=.\x64\Debug
-# End Custom Macros
-
-"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\apr_ldap-1.dll"
-   if exist .\x64\Debug\apr_ldap-1.dll.manifest mt.exe -manifest .\x64\Debug\apr_ldap-1.dll.manifest -outputresource:.\x64\Debug\apr_ldap-1.dll;2
-	echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("apr_ldap.dep")
-!INCLUDE "apr_ldap.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "apr_ldap.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "apr_ldap - Win32 Release" || "$(CFG)" == "apr_ldap - Win32 Debug" || "$(CFG)" == "apr_ldap - x64 Release" || "$(CFG)" == "apr_ldap - x64 Debug"
-SOURCE=.\apr_ldap_init.c
-
-"$(INTDIR)\apr_ldap_init.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\apr_ldap_option.c
-
-"$(INTDIR)\apr_ldap_option.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\apr_ldap_rebind.c
-
-"$(INTDIR)\apr_ldap_rebind.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!IF  "$(CFG)" == "apr_ldap - Win32 Release"
-
-"libapr - Win32 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
-   cd "..\apr-util\ldap"
-
-"libapr - Win32 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
-
-"libapr - Win32 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
-   cd "..\apr-util\ldap"
-
-"libapr - Win32 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
-
-"libapr - x64 Release" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" 
-   cd "..\apr-util\ldap"
-
-"libapr - x64 ReleaseCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Release" RECURSE=1 CLEAN 
-   cd "..\apr-util\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
-
-"libapr - x64 Debug" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" 
-   cd "..\apr-util\ldap"
-
-"libapr - x64 DebugCLEAN" : 
-   cd ".\..\..\apr"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - x64 Debug" RECURSE=1 CLEAN 
-   cd "..\apr-util\ldap"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "apr_ldap - Win32 Release"
-
-"libaprutil - Win32 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" 
-   cd ".\ldap"
-
-"libaprutil - Win32 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release" RECURSE=1 CLEAN 
-   cd ".\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
-
-"libaprutil - Win32 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
-   cd ".\ldap"
-
-"libaprutil - Win32 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" RECURSE=1 CLEAN 
-   cd ".\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
-
-"libaprutil - x64 Release" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" 
-   cd ".\ldap"
-
-"libaprutil - x64 ReleaseCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Release" RECURSE=1 CLEAN 
-   cd ".\ldap"
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
-
-"libaprutil - x64 Debug" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" 
-   cd ".\ldap"
-
-"libaprutil - x64 DebugCLEAN" : 
-   cd ".\.."
-   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - x64 Debug" RECURSE=1 CLEAN 
-   cd ".\ldap"
-
-!ENDIF 
-
-SOURCE=..\libaprutil.rc
-
-!IF  "$(CFG)" == "apr_ldap - Win32 Release"
-
-
-"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i ".\.." /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
-
-
-"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i ".\.." /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
-
-
-"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i ".\.." /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
-
-
-"$(INTDIR)\apr_ldap-1.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"$(INTDIR)\apr_ldap-1.res" /i "../include" /i "../../apr/include" /i ".\.." /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" $(SOURCE)
-
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/srclib/apr-util/ldap/apr_ldap_init.c b/srclib/apr-util/ldap/apr_ldap_init.c
index 458f281b..8aacb2a5 100644
--- a/srclib/apr-util/ldap/apr_ldap_init.c
+++ b/srclib/apr-util/ldap/apr_ldap_init.c
@@ -156,13 +156,29 @@ APU_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool,
     *result_err = result;
 
 #if APR_HAS_LDAPSSL_INIT
+#if APR_HAS_SOLARIS_LDAPSDK
+    /*
+     * Using the secure argument should aways be possible.  But as LDAP SDKs
+     * tend to have different quirks and bugs, this needs to be tested for
+     * for each of them, first. For Solaris LDAP it works, and the method
+     * with ldap_set_option doesn't.
+     */
+    *ldap = ldapssl_init(hostname, portno, secure == APR_LDAP_SSL);
+#else
     *ldap = ldapssl_init(hostname, portno, 0);
+#endif
 #elif APR_HAS_LDAP_SSLINIT
     *ldap = ldap_sslinit((char *)hostname, portno, 0);
 #else
     *ldap = ldap_init((char *)hostname, portno);
 #endif
+
     if (*ldap != NULL) {
+#if APR_HAS_SOLARIS_LDAPSDK
+        if (secure == APR_LDAP_SSL)
+            return APR_SUCCESS;
+        else
+#endif
         return apr_ldap_set_option(pool, *ldap, APR_LDAP_OPT_TLS, &secure, result_err);
     }
     else {
diff --git a/srclib/apr-util/ldap/apr_ldap_rebind.c b/srclib/apr-util/ldap/apr_ldap_rebind.c
index 51aa4a18..1f91b2bb 100644
--- a/srclib/apr-util/ldap/apr_ldap_rebind.c
+++ b/srclib/apr-util/ldap/apr_ldap_rebind.c
@@ -81,11 +81,11 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool)
     get_apd
 #endif
 
+#if APR_HAS_THREADS
     /* run after apr_thread_mutex_create cleanup */
     apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
                               apr_pool_cleanup_null);
 
-#if APR_HAS_THREADS
     if (apr_ldap_xref_lock == NULL) {
         retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
     }
diff --git a/srclib/apr-util/ldap/apr_ldap_stub.c b/srclib/apr-util/ldap/apr_ldap_stub.c
index c0758861..97c15514 100644
--- a/srclib/apr-util/ldap/apr_ldap_stub.c
+++ b/srclib/apr-util/ldap/apr_ldap_stub.c
@@ -50,7 +50,7 @@ static apr_status_t load_ldap(apr_pool_t *pool)
 #else
     modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".so";
 #endif
-    rv = apu_dso_load(&symbol, modname, "apr__ldap_fns", pool);
+    rv = apu_dso_load(NULL, &symbol, modname, "apr__ldap_fns", pool);
     if (rv == APR_SUCCESS) {
         lfn = symbol;
     }