[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
aCaB
acab at clamav.net
Sun Apr 4 01:17:16 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 50e261ac2c7926e34225354373ee47cae5b1d14d
Author: aCaB <acab at clamav.net>
Date: Tue Jan 26 19:42:52 2010 +0100
win32 build system refactor complete
diff --git a/ChangeLog b/ChangeLog
index 2f211de..08a8a07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 26 19:39:18 CET 2010 (acab)
+-----------------------------------
+ * win32: automatically check and regenerate vcprojs,
+ drop support and tblgen from llvm as these are now prebuilt and
+ shipped
+
Mon Jan 25 13:27:44 CET 2010 (tk)
---------------------------------
* libclamav: handle digitally signed .info files
diff --git a/win32/.gitignore b/win32/.gitignore
index 6025265..85e1169 100644
--- a/win32/.gitignore
+++ b/win32/.gitignore
@@ -1,4 +1,5 @@
!platform.h
+!clamav-config.h
build
*.ncb
*.suo
diff --git a/win32/ClamAV.sln b/win32/ClamAV.sln
index 43e8fe8..7904148 100644
--- a/win32/ClamAV.sln
+++ b/win32/ClamAV.sln
@@ -33,7 +33,6 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamavcxx", "libclamavcxx.vcproj", "{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}"
ProjectSection(ProjectDependencies) = postProject
{7472FD2F-DDE7-44B1-91FB-65C0BE81932B} = {7472FD2F-DDE7-44B1-91FB-65C0BE81932B}
- {4DDFCA45-7793-428D-A4D8-07C60722F487} = {4DDFCA45-7793-428D-A4D8-07C60722F487}
{28710655-9C06-4803-8752-55A99115773F} = {28710655-9C06-4803-8752-55A99115773F}
{B174EBB8-99AE-4371-9A54-79DC309730DA} = {B174EBB8-99AE-4371-9A54-79DC309730DA}
{6D7B62E9-883D-406C-B6F8-1636D3962772} = {6D7B62E9-883D-406C-B6F8-1636D3962772}
@@ -41,31 +40,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamavcxx", "libclamavcx
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMsystem", "LLVMsystem.vcproj", "{B174EBB8-99AE-4371-9A54-79DC309730DA}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMsupport", "LLVMsupport.vcproj", "{4DDFCA45-7793-428D-A4D8-07C60722F487}"
- ProjectSection(ProjectDependencies) = postProject
- {B174EBB8-99AE-4371-9A54-79DC309730DA} = {B174EBB8-99AE-4371-9A54-79DC309730DA}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMtblgen", "LLVMtblgen.vcproj", "{39487174-E012-444A-8592-3CDAFA2A1869}"
- ProjectSection(ProjectDependencies) = postProject
- {4DDFCA45-7793-428D-A4D8-07C60722F487} = {4DDFCA45-7793-428D-A4D8-07C60722F487}
- {B174EBB8-99AE-4371-9A54-79DC309730DA} = {B174EBB8-99AE-4371-9A54-79DC309730DA}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMx86codegen", "LLVMx86codegen.vcproj", "{28710655-9C06-4803-8752-55A99115773F}"
- ProjectSection(ProjectDependencies) = postProject
- {39487174-E012-444A-8592-3CDAFA2A1869} = {39487174-E012-444A-8592-3CDAFA2A1869}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMjit", "LLVMjit.vcproj", "{6D7B62E9-883D-406C-B6F8-1636D3962772}"
- ProjectSection(ProjectDependencies) = postProject
- {39487174-E012-444A-8592-3CDAFA2A1869} = {39487174-E012-444A-8592-3CDAFA2A1869}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMcodegen", "LLVMcodegen.vcproj", "{7472FD2F-DDE7-44B1-91FB-65C0BE81932B}"
- ProjectSection(ProjectDependencies) = postProject
- {39487174-E012-444A-8592-3CDAFA2A1869} = {39487174-E012-444A-8592-3CDAFA2A1869}
- EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -109,12 +88,6 @@ Global
{B174EBB8-99AE-4371-9A54-79DC309730DA}.Debug|Win32.Build.0 = Debug|Win32
{B174EBB8-99AE-4371-9A54-79DC309730DA}.Release|Win32.ActiveCfg = Release|Win32
{B174EBB8-99AE-4371-9A54-79DC309730DA}.Release|Win32.Build.0 = Release|Win32
- {4DDFCA45-7793-428D-A4D8-07C60722F487}.Debug|Win32.ActiveCfg = Debug|Win32
- {4DDFCA45-7793-428D-A4D8-07C60722F487}.Debug|Win32.Build.0 = Debug|Win32
- {4DDFCA45-7793-428D-A4D8-07C60722F487}.Release|Win32.ActiveCfg = Release|Win32
- {4DDFCA45-7793-428D-A4D8-07C60722F487}.Release|Win32.Build.0 = Release|Win32
- {39487174-E012-444A-8592-3CDAFA2A1869}.Debug|Win32.ActiveCfg = Debug|Win32
- {39487174-E012-444A-8592-3CDAFA2A1869}.Release|Win32.ActiveCfg = Release|Win32
{28710655-9C06-4803-8752-55A99115773F}.Debug|Win32.ActiveCfg = Debug|Win32
{28710655-9C06-4803-8752-55A99115773F}.Debug|Win32.Build.0 = Debug|Win32
{28710655-9C06-4803-8752-55A99115773F}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/win32/LLVMsupport.vcproj b/win32/LLVMsupport.vcproj
deleted file mode 100644
index 064a043..0000000
--- a/win32/LLVMsupport.vcproj
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- Keyword="Win32Proj"
- Name="LLVMsupport"
- ProjectGUID="{4DDFCA45-7793-428D-A4D8-07C60722F487}"
- ProjectType="Visual C++"
- RootNamespace="LLVMsupport"
- TargetFrameworkVersion="196613"
- Version="9.00"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- CharacterSet="1"
- ConfigurationType="4"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..""
- BasicRuntimeChecks="3"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
- ExceptionHandling="1"
- MinimalRebuild="true"
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- CharacterSet="1"
- ConfigurationType="4"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..""
- DebugInformationFormat="0"
- DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
- EnableFunctionLevelLinking="false"
- EnableIntrinsicFunctions="true"
- ExceptionHandling="1"
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- WholeProgramOptimization="false"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- Name="Source Files"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Allocator.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\APFloat.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\APInt.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\APSInt.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\circular_raw_ostream.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\CommandLine.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\ConstantRange.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Debug.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\DeltaAlgorithm.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Dwarf.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\ErrorHandling.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\FileUtilities.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\FoldingSet.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\FormattedStream.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\GraphWriter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\IsInf.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\IsNAN.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\ManagedStatic.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\MemoryBuffer.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\MemoryObject.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\PluginLoader.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\PrettyStackTrace.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\raw_os_ostream.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\raw_ostream.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\regcomp.c"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\regerror.c"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Regex.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\regexec.c"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\regfree.c"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\regstrlcpy.c"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\SlowOperationInformer.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\SmallPtrSet.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\SmallVector.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\SourceMgr.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Statistic.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\StringExtras.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\StringMap.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\StringPool.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\StringRef.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\SystemUtils.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\TargetRegistry.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Timer.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Triple.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Twine.cpp"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/win32/LLVMtblgen.vcproj b/win32/LLVMtblgen.vcproj
deleted file mode 100644
index 0f40d91..0000000
--- a/win32/LLVMtblgen.vcproj
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="LLVMtblgen"
- ProjectGUID="{39487174-E012-444A-8592-3CDAFA2A1869}"
- RootNamespace="LLVMtblgen"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..""
- PreprocessorDefinitions="_DEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Post build event"
- CommandLine=""$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" -gen-intrinsic -o "$(SolutionDir)..\libclamav\c++\llvm\include\llvm\Intrinsics.gen" "$(SolutionDir)..\libclamav\c++\llvm\include\llvm\Intrinsics.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-register-desc-header -o "$(SolutionDir)..\libclamav\c++\X86GenRegisterInfo.h.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-register-enums -o "$(SolutionDir)..\libclamav\c++\X86GenRegisterNames.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-register-desc -o "$(SolutionDir)..\libclamav\c++\X86GenRegisterInfo.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-instr-enums -o "$(SolutionDir)..\libclamav\c++\X86GenInstrNames.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-instr-desc -o "$(SolutionDir)..\libclamav\c++\X86GenInstrInfo.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-asm-writer -o "$(SolutionDir)..\libclamav\c++\X86GenAsmWriter.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-asm-writer -asmwriternum=1 -o "$(SolutionDir)..\libclamav\c++\X86GenAsmWriter1.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-asm-matcher -o "$(SolutionDir)..\libclamav\c++\X86GenAsmMatcher.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-dag-isel -o "$(SolutionDir)..\libclamav\c++\X86GenDAGISel.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-fast-isel -o "$(SolutionDir)..\libclamav\c++\X86GenFastISel.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-callingconv -o "$(SolutionDir)..\libclamav\c++\X86GenCallingConv.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-subtarget -o "$(SolutionDir)..\libclamav\c++\X86GenSubtarget.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..""
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="false"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="0"
- DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- Description="Post build event"
- CommandLine=""$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" -gen-intrinsic -o "$(SolutionDir)..\libclamav\c++\llvm\include\llvm\Intrinsics.gen" "$(SolutionDir)..\libclamav\c++\llvm\include\llvm\Intrinsics.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-register-desc-header -o "$(SolutionDir)..\libclamav\c++\X86GenRegisterInfo.h.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-register-enums -o "$(SolutionDir)..\libclamav\c++\X86GenRegisterNames.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-register-desc -o "$(SolutionDir)..\libclamav\c++\X86GenRegisterInfo.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-instr-enums -o "$(SolutionDir)..\libclamav\c++\X86GenInstrNames.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-instr-desc -o "$(SolutionDir)..\libclamav\c++\X86GenInstrInfo.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-asm-writer -o "$(SolutionDir)..\libclamav\c++\X86GenAsmWriter.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-asm-writer -asmwriternum=1 -o "$(SolutionDir)..\libclamav\c++\X86GenAsmWriter1.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-asm-matcher -o "$(SolutionDir)..\libclamav\c++\X86GenAsmMatcher.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-dag-isel -o "$(SolutionDir)..\libclamav\c++\X86GenDAGISel.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-fast-isel -o "$(SolutionDir)..\libclamav\c++\X86GenFastISel.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-callingconv -o "$(SolutionDir)..\libclamav\c++\X86GenCallingConv.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"$(TargetPath)" "-I$(SolutionDir)..\libclamav\c++\llvm\include" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target" "-I$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86" -gen-subtarget -o "$(SolutionDir)..\libclamav\c++\X86GenSubtarget.inc" "$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86\X86.td"
"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\AsmMatcherEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\AsmWriterEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\CallingConvEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\ClangDiagnosticsEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\CodeEmitterGen.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\CodeGenDAGPatterns.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\CodeGenInstruction.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\CodeGenTarget.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\DAGISelEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\DisassemblerEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\FastISelEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\InstrEnumEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\InstrInfoEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\IntrinsicEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\LLVMCConfigurationEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\OptParserEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\Record.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\RegisterInfoEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\SubtargetEmitter.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\TableGen.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\TableGenBackend.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\TGLexer.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\TGParser.cpp"
- >
- </File>
- <File
- RelativePath="..\libclamav\c++\llvm\utils\TableGen\TGValueTypes.cpp"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/clamav-config.h.in b/win32/clamav-config.h
similarity index 66%
copy from clamav-config.h.in
copy to win32/clamav-config.h
index 5b9339d..d6bff18 100644
--- a/clamav-config.h.in
+++ b/win32/clamav-config.h
@@ -1,500 +1,502 @@
+/* clamav-config.h. Generated from clamav-config.h.in by update-win32. */
+
/* clamav-config.h.in. Generated from configure.in by autoheader. */
/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
/* mmap flag for anonymous maps */
-#undef ANONYMOUS_MAP
+/* #undef ANONYMOUS_MAP */
/* enable bind8 compatibility */
-#undef BIND_8_COMPAT
+/* #undef BIND_8_COMPAT */
/* "build clamd" */
-#undef BUILD_CLAMD
+#define BUILD_CLAMD 1
/* name of the clamav group */
-#undef CLAMAVGROUP
+#define CLAMAVGROUP "clamav"
/* name of the clamav user */
-#undef CLAMAVUSER
+#define CLAMAVUSER "clamav"
/* enable clamuko */
-#undef CLAMUKO
+/* #undef CLAMUKO */
/* enable debugging */
-#undef CL_DEBUG
+/* #undef CL_DEBUG */
/* enable experimental code */
-#undef CL_EXPERIMENTAL
+/* #undef CL_EXPERIMENTAL */
/* thread safe */
-#undef CL_THREAD_SAFE
+#define CL_THREAD_SAFE 1
/* where to look for the config file */
-#undef CONFDIR
+#define CONFDIR "C:\\ClamAV"
/* curses header location */
-#undef CURSES_INCLUDE
+/* #undef CURSES_INCLUDE */
/* os is aix */
-#undef C_AIX
+/* #undef C_AIX */
/* os is beos */
-#undef C_BEOS
+/* #undef C_BEOS */
/* Increase thread stack size. */
-#undef C_BIGSTACK
+/* #undef C_BIGSTACK */
/* os is bsd flavor */
-#undef C_BSD
+/* #undef C_BSD */
/* os is darwin */
-#undef C_DARWIN
+/* #undef C_DARWIN */
/* target is gnu-hurd */
-#undef C_GNU_HURD
+/* #undef C_GNU_HURD */
/* os is hpux */
-#undef C_HPUX
+/* #undef C_HPUX */
/* os is interix */
-#undef C_INTERIX
+/* #undef C_INTERIX */
/* os is irix */
-#undef C_IRIX
+/* #undef C_IRIX */
/* target is kfreebsd-gnu */
-#undef C_KFREEBSD_GNU
+/* #undef C_KFREEBSD_GNU */
/* target is linux */
-#undef C_LINUX
+/* #undef C_LINUX */
/* os is OS/2 */
-#undef C_OS2
+/* #undef C_OS2 */
/* os is osf/tru64 */
-#undef C_OSF
+/* #undef C_OSF */
/* os is QNX 6.x.x */
-#undef C_QNX6
+/* #undef C_QNX6 */
/* os is solaris */
-#undef C_SOLARIS
+/* #undef C_SOLARIS */
/* Path to virus database directory. */
-#undef DATADIR
+#define DATADIR "C:\\ClamAV\\db"
/* "default FD_SETSIZE value" */
-#undef DEFAULT_FD_SETSIZE
+#define DEFAULT_FD_SETSIZE 1024
/* whether _XOPEN_SOURCE needs to be defined for fd passing to work */
-#undef FDPASS_NEED_XOPEN
+/* #undef FDPASS_NEED_XOPEN */
/* file i/o buffer size */
-#undef FILEBUFF
+#define FILEBUFF 8192
/* FPU byte ordering is little endian */
-#undef FPU_WORDS_BIGENDIAN
+#define FPU_WORDS_BIGENDIAN 0
/* enable workaround for broken DNS servers */
-#undef FRESHCLAM_DNS_FIX
+/* #undef FRESHCLAM_DNS_FIX */
/* use "Cache-Control: no-cache" in freshclam */
-#undef FRESHCLAM_NO_CACHE
+/* #undef FRESHCLAM_NO_CACHE */
/* Define to 1 if you have the `argz_add' function. */
-#undef HAVE_ARGZ_ADD
+/* #undef HAVE_ARGZ_ADD */
/* Define to 1 if you have the `argz_append' function. */
-#undef HAVE_ARGZ_APPEND
+/* #undef HAVE_ARGZ_APPEND */
/* Define to 1 if you have the `argz_count' function. */
-#undef HAVE_ARGZ_COUNT
+/* #undef HAVE_ARGZ_COUNT */
/* Define to 1 if you have the `argz_create_sep' function. */
-#undef HAVE_ARGZ_CREATE_SEP
+/* #undef HAVE_ARGZ_CREATE_SEP */
/* Define to 1 if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
+/* #undef HAVE_ARGZ_H */
/* Define to 1 if you have the `argz_insert' function. */
-#undef HAVE_ARGZ_INSERT
+/* #undef HAVE_ARGZ_INSERT */
/* Define to 1 if you have the `argz_next' function. */
-#undef HAVE_ARGZ_NEXT
+/* #undef HAVE_ARGZ_NEXT */
/* Define to 1 if you have the `argz_stringify' function. */
-#undef HAVE_ARGZ_STRINGIFY
+/* #undef HAVE_ARGZ_STRINGIFY */
/* attrib aligned */
-#undef HAVE_ATTRIB_ALIGNED
+/* #undef HAVE_ATTRIB_ALIGNED */
/* attrib packed */
-#undef HAVE_ATTRIB_PACKED
+/* #undef HAVE_ATTRIB_PACKED */
/* have bzip2 */
-#undef HAVE_BZLIB_H
+#define HAVE_BZLIB_H 1
/* Define to 1 if you have the `closedir' function. */
-#undef HAVE_CLOSEDIR
+#define HAVE_CLOSEDIR 1
/* Define to 1 if you have the `ctime_r' function. */
-#undef HAVE_CTIME_R
+#define HAVE_CTIME_R 1
/* ctime_r takes 2 arguments */
-#undef HAVE_CTIME_R_2
+#define HAVE_CTIME_R_2 1
/* ctime_r takes 3 arguments */
-#undef HAVE_CTIME_R_3
+/* #undef HAVE_CTIME_R_3 */
/* Define to 1 if you have the declaration of `cygwin_conv_path', and to 0 if
you don't. */
-#undef HAVE_DECL_CYGWIN_CONV_PATH
+/* #undef HAVE_DECL_CYGWIN_CONV_PATH */
/* Define to 1 if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+#define HAVE_DIRENT_H 1
/* Define if you have the GNU dld library. */
-#undef HAVE_DLD
+/* #undef HAVE_DLD */
/* Define to 1 if you have the <dld.h> header file. */
-#undef HAVE_DLD_H
+/* #undef HAVE_DLD_H */
/* Define to 1 if you have the `dlerror' function. */
-#undef HAVE_DLERROR
+/* #undef HAVE_DLERROR */
/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+#define HAVE_DLFCN_H 1
/* Define to 1 if you have the <dl.h> header file. */
-#undef HAVE_DL_H
+/* #undef HAVE_DL_H */
/* Define if you have the _dyld_func_lookup function. */
-#undef HAVE_DYLD
+/* #undef HAVE_DYLD */
/* Define to 1 if the system has the type `error_t'. */
-#undef HAVE_ERROR_T
+/* #undef HAVE_ERROR_T */
/* have working file descriptor passing support */
-#undef HAVE_FD_PASSING
+/* #undef HAVE_FD_PASSING */
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-#undef HAVE_FSEEKO
+#define HAVE_FSEEKO 1
/* have getaddrinfo() */
-#undef HAVE_GETADDRINFO
+#define HAVE_GETADDRINFO 1
/* Define to 1 if getpagesize() is available */
-#undef HAVE_GETPAGESIZE
+#define HAVE_GETPAGESIZE 1
/* Define to 1 if you have the <grp.h> header file. */
-#undef HAVE_GRP_H
+/* #undef HAVE_GRP_H */
/* iconv() available */
-#undef HAVE_ICONV
+/* #undef HAVE_ICONV */
/* Define to 1 if you have the `inet_ntop' function. */
-#undef HAVE_INET_NTOP
+#define HAVE_INET_NTOP 1
/* Define to 1 if you have the `initgroups' function. */
-#undef HAVE_INITGROUPS
+/* #undef HAVE_INITGROUPS */
/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
+/* #undef HAVE_INTTYPES_H */
/* in_addr_t is defined */
-#undef HAVE_IN_ADDR_T
+/* #undef HAVE_IN_ADDR_T */
/* in_port_t is defined */
-#undef HAVE_IN_PORT_T
+#define HAVE_IN_PORT_T 1
/* Define to '1' if you have the check.h library */
-#undef HAVE_LIBCHECK
+/* #undef HAVE_LIBCHECK */
/* Define if you have the libdl library or equivalent. */
-#undef HAVE_LIBDL
+#define HAVE_LIBDL 1
/* Define if libdlloader will be built on this platform */
-#undef HAVE_LIBDLLOADER
+#define HAVE_LIBDLLOADER 1
/* Define to 1 if you have the <libmilter/mfapi.h> header file. */
-#undef HAVE_LIBMILTER_MFAPI_H
+/* #undef HAVE_LIBMILTER_MFAPI_H */
/* Define to '1' if you have the ncurses.h library */
-#undef HAVE_LIBNCURSES
+/* #undef HAVE_LIBNCURSES */
/* Define to '1' if you have the curses.h library */
-#undef HAVE_LIBPDCURSES
+/* #undef HAVE_LIBPDCURSES */
/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
+#define HAVE_LIBZ 1
/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
+#define HAVE_LIMITS_H 1
/* Define this if a modern libltdl is already installed */
-#undef HAVE_LTDL
+#define HAVE_LTDL 1
/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-#undef HAVE_MACH_O_DYLD_H
+/* #undef HAVE_MACH_O_DYLD_H */
/* Define to 1 if you have the `madvise' function. */
-#undef HAVE_MADVISE
+/* #undef HAVE_MADVISE */
/* Define to 1 if you have the `mallinfo' function. */
-#undef HAVE_MALLINFO
+/* #undef HAVE_MALLINFO */
/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
+#define HAVE_MALLOC_H 1
/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
+#define HAVE_MEMCPY 1
/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
+#define HAVE_MKSTEMP 1
/* Define to 1 if you have a working `mmap' system call that supports
MAP_PRIVATE. */
-#undef HAVE_MMAP
+/* #undef HAVE_MMAP */
/* Define to 1 if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
+/* #undef HAVE_NDIR_H */
/* Define to 1 if you have the `opendir' function. */
-#undef HAVE_OPENDIR
+#define HAVE_OPENDIR 1
/* Define to 1 if you have the `poll' function. */
-#undef HAVE_POLL
+#define HAVE_POLL 1
/* Define to 1 if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
+#define HAVE_POLL_H 1
/* "pragma pack" */
-#undef HAVE_PRAGMA_PACK
+#define HAVE_PRAGMA_PACK 1
/* "pragma pack hppa/hp-ux style" */
-#undef HAVE_PRAGMA_PACK_HPPA
+/* #undef HAVE_PRAGMA_PACK_HPPA */
/* Define if libtool can extract symbol lists from object files. */
-#undef HAVE_PRELOADED_SYMBOLS
+/* #undef HAVE_PRELOADED_SYMBOLS */
/* Define to 1 if you have the `pthread_yield' function. */
-#undef HAVE_PTHREAD_YIELD
+#define HAVE_PTHREAD_YIELD 1
/* Define to 1 if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+/* #undef HAVE_PWD_H */
/* Define to 1 if you have the `readdir' function. */
-#undef HAVE_READDIR
+#define HAVE_READDIR 1
/* readdir_r takes 2 arguments */
-#undef HAVE_READDIR_R_2
+/* #undef HAVE_READDIR_R_2 */
/* readdir_r takes 3 arguments */
-#undef HAVE_READDIR_R_3
+/* #undef HAVE_READDIR_R_3 */
/* Define to 1 if you have the `recvmsg' function. */
-#undef HAVE_RECVMSG
+#define HAVE_RECVMSG 1
/* have resolv.h */
-#undef HAVE_RESOLV_H
+#define HAVE_RESOLV_H 1
/* Define signed right shift implementation */
-#undef HAVE_SAR
+#define HAVE_SAR 1
/* Define to 1 if you have the `sched_yield' function. */
-#undef HAVE_SCHED_YIELD
+/* #undef HAVE_SCHED_YIELD */
/* Define to 1 if you have the `sendmsg' function. */
-#undef HAVE_SENDMSG
+#define HAVE_SENDMSG 1
/* Define to 1 if you have the `setgroups' function. */
-#undef HAVE_SETGROUPS
+/* #undef HAVE_SETGROUPS */
/* Define to 1 if you have the `setsid' function. */
-#undef HAVE_SETSID
+#define HAVE_SETSID 1
/* Define if you have the shl_load function. */
-#undef HAVE_SHL_LOAD
+/* #undef HAVE_SHL_LOAD */
/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
+#define HAVE_SNPRINTF 1
/* Define to 1 if you have the <stdbool.h> header file. */
-#undef HAVE_STDBOOL_H
+/* #undef HAVE_STDBOOL_H */
/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
+/* #undef HAVE_STDINT_H */
/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
/* Define to 1 if you have the `strcasestr' function. */
-#undef HAVE_STRCASESTR
+/* #undef HAVE_STRCASESTR */
/* Define to 1 if you have the `strerror_r' function. */
-#undef HAVE_STRERROR_R
+#define HAVE_STRERROR_R 1
/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
+/* #undef HAVE_STRINGS_H */
/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+#define HAVE_STRING_H 1
/* Define to 1 if you have the `strlcat' function. */
-#undef HAVE_STRLCAT
+/* #undef HAVE_STRLCAT */
/* Define to 1 if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
+/* #undef HAVE_STRLCPY */
/* Define to 1 if sysconf(_SC_PAGESIZE) is available */
-#undef HAVE_SYSCONF_SC_PAGESIZE
+/* #undef HAVE_SYSCONF_SC_PAGESIZE */
/* link against system-wide libtommath */
-#undef HAVE_SYSTEM_TOMMATH
+/* #undef HAVE_SYSTEM_TOMMATH */
/* Define to 1 if you have the <sys/dl.h> header file. */
-#undef HAVE_SYS_DL_H
+/* #undef HAVE_SYS_DL_H */
/* Define to 1 if you have the <sys/filio.h> header file. */
-#undef HAVE_SYS_FILIO_H
+/* #undef HAVE_SYS_FILIO_H */
/* Define to 1 if you have the <sys/inttypes.h> header file. */
-#undef HAVE_SYS_INTTYPES_H
+/* #undef HAVE_SYS_INTTYPES_H */
/* Define to 1 if you have the <sys/int_types.h> header file. */
-#undef HAVE_SYS_INT_TYPES_H
+/* #undef HAVE_SYS_INT_TYPES_H */
/* Define to 1 if you have the <sys/mman.h> header file. */
-#undef HAVE_SYS_MMAN_H
+/* #undef HAVE_SYS_MMAN_H */
/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+/* #undef HAVE_SYS_PARAM_H */
/* "have <sys/select.h>" */
-#undef HAVE_SYS_SELECT_H
+/* #undef HAVE_SYS_SELECT_H */
/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
+#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
+#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <sys/uio.h> header file. */
-#undef HAVE_SYS_UIO_H
+/* #undef HAVE_SYS_UIO_H */
/* Define to 1 if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
+/* #undef HAVE_TERMIOS_H */
/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+/* #undef HAVE_UNISTD_H */
/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
+#define HAVE_VSNPRINTF 1
/* This value is set to 1 to indicate that the system argz facility works */
-#undef HAVE_WORKING_ARGZ
+/* #undef HAVE_WORKING_ARGZ */
/* "Full library version number" */
-#undef LIBCLAMAV_FULLVER
+#define LIBCLAMAV_FULLVER "6.0.4"
/* "Major library version number" */
-#undef LIBCLAMAV_MAJORVER
+#define LIBCLAMAV_MAJORVER 6
/* Define if the OS needs help to load dependent libraries for dlopen(). */
-#undef LTDL_DLOPEN_DEPLIBS
+/* #undef LTDL_DLOPEN_DEPLIBS */
/* Define to the system default library search path. */
-#undef LT_DLSEARCH_PATH
+#define LT_DLSEARCH_PATH ""
/* The archive extension */
-#undef LT_LIBEXT
+#define LT_LIBEXT "dll"
/* Define to the extension used for runtime loadable modules, say, ".so". */
-#undef LT_MODULE_EXT
+#define LT_MODULE_EXT ".dll"
/* Define to the name of the environment variable that determines the run-time
module search path. */
-#undef LT_MODULE_PATH_VAR
+#define LT_MODULE_PATH_VAR "LD_LIBRARY_PATH"
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
-#undef LT_OBJDIR
+#define LT_OBJDIR ""
/* disable assertions */
-#undef NDEBUG
+#define NDEBUG 1
/* Define if dlsym() requires a leading underscore in symbol names. */
-#undef NEED_USCORE
+/* #undef NEED_USCORE */
/* bzip funtions do not have bz2 prefix */
-#undef NOBZ2PREFIX
+/* #undef NOBZ2PREFIX */
/* "no fd_set" */
-#undef NO_FD_SET
+/* #undef NO_FD_SET */
/* Name of package */
-#undef PACKAGE
+#define PACKAGE PACKAGE_NAME
/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
+#define PACKAGE_BUGREPORT "http://bugs.clamav.net/"
/* Define to the full name of this package. */
-#undef PACKAGE_NAME
+#define PACKAGE_NAME "ClamAV"
/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
+#define PACKAGE_STRING "ClamAV devel"
/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
+#define PACKAGE_TARNAME "clamav"
/* Define to the home page for this package. */
-#undef PACKAGE_URL
+#define PACKAGE_URL "http://www.clamav.net/"
/* Define to the version of this package. */
-#undef PACKAGE_VERSION
+#define PACKAGE_VERSION "devel"
/* scan buffer size */
-#undef SCANBUFF
+#define SCANBUFF 131072
/* Define to 1 if the `setpgrp' function takes no argument. */
-#undef SETPGRP_VOID
+#define SETPGRP_VOID 1
/* The number of bytes in type int */
-#undef SIZEOF_INT
+#define SIZEOF_INT 4
/* The number of bytes in type long */
-#undef SIZEOF_LONG
+#define SIZEOF_LONG 4
/* The number of bytes in type long long */
-#undef SIZEOF_LONG_LONG
+#define SIZEOF_LONG_LONG 8
/* The number of bytes in type short */
-#undef SIZEOF_SHORT
+#define SIZEOF_SHORT 2
/* The number of bytes in type void * */
-#undef SIZEOF_VOID_P
+#define SIZEOF_VOID_P 4
/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
+#define STDC_HEADERS 1
/* Support for IPv6 */
-#undef SUPPORT_IPv6
+/* #undef SUPPORT_IPv6 */
/* enable memory pools */
-#undef USE_MPOOL
+/* #undef USE_MPOOL */
/* use syslog */
-#undef USE_SYSLOG
+/* #undef USE_SYSLOG */
/* Version number of package */
-#undef VERSION
+#define VERSION "devel-r5076-689-gb957384"
/* Version suffix for package */
-#undef VERSION_SUFFIX
+#define VERSION_SUFFIX ""
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -504,44 +506,44 @@
# endif
#else
# ifndef WORDS_BIGENDIAN
-# undef WORDS_BIGENDIAN
+#define WORDS_BIGENDIAN 0
# endif
#endif
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
+/* #undef _LARGEFILE_SOURCE */
/* POSIX compatibility */
-#undef _POSIX_PII_SOCKET
+/* #undef _POSIX_PII_SOCKET */
/* thread safe */
-#undef _REENTRANT
+#define _REENTRANT 1
/* thread safe */
-#undef _THREAD_SAFE
+/* #undef _THREAD_SAFE */
/* Define so that glibc/gnulib argp.h does not typedef error_t. */
-#undef __error_t_defined
+/* #undef __error_t_defined */
/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+/* #undef const */
/* Define to a type to use for `error_t' if it is not otherwise available. */
-#undef error_t
+/* #undef error_t */
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
-#undef inline
+#define inline _inline
#endif
/* Define to `long int' if <sys/types.h> does not define. */
-#undef off_t
+/* #undef off_t */
/* Define to the equivalent of the C99 'restrict' keyword, or to
nothing if this is not supported. Do not define if restrict is
supported directly. */
-#undef restrict
+/* #undef restrict */
/* Work around a bug in Sun C++: it does not support _Restrict or
__restrict__, even though the corresponding Sun C compiler ends up with
"#define restrict _Restrict" or "#define restrict __restrict__" in the
@@ -553,6 +555,6 @@
#endif
/* Define to "int" if <sys/socket.h> does not define. */
-#undef socklen_t
+/* #undef socklen_t */
#include "platform.h"
diff --git a/win32/update-win32.pl b/win32/update-win32.pl
old mode 100644
new mode 100755
index fe8020e..0116fb3
--- a/win32/update-win32.pl
+++ b/win32/update-win32.pl
@@ -13,7 +13,7 @@ use File::Temp 'tempfile';
use constant DEBUG => 0;
-# CLAMAV-CONFIG.H MACROES
+### CLAMAV-CONFIG.H MACROES ###
# - Set to the proper win32 value or -1 to undef - #
my %CONF = (
'AC_APPLE_UNIVERSAL_BUILD' => -1,
@@ -194,7 +194,7 @@ my %CONF = (
);
-# PROJECT FILES #
+### PROJECT FILES ###
# - makefile: path to Makefile.am from the root of the repo
# - sections: section of Makefile.am to parse (without _SOURCES or _la_SOURCES)
# - output: path to the output vcproj file
@@ -229,9 +229,6 @@ my @PROJECTS = (
# LLVMsystem #
{makefile => 'libclamav/c++', sections => ['libllvmsystem'], output => 'win32/LLVMsystem.vcproj'},
- # LLVMsupport #
- {makefile => 'libclamav/c++', sections => ['libllvmsupport'], output => 'win32/LLVMsupport.vcproj'},
-
# LLVMcodgen #
{makefile => 'libclamav/c++', sections => ['libllvmcodegen'], output => 'win32/LLVMcodegen.vcproj'},
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list