[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit a97998d294dedf0bca819496c1b55318bd025a34
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Aug 28 16:57:18 2009 +0300

    Fix build with --disable-llvm.

diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am
index aa7f0ec..1312851 100644
--- a/libclamav/Makefile.am
+++ b/libclamav/Makefile.am
@@ -346,6 +346,7 @@ libclamav_la_SOURCES += bytecode2llvm.cpp
 
 else
 
+libclamav_la_CPPFLAGS = $(AM_CPPFLAGS)
 libclamav_la_SOURCES += bytecode_nojit.c
 
 endif
diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in
index 1c86d3b..513dfc6 100644
--- a/libclamav/Makefile.in
+++ b/libclamav/Makefile.in
@@ -661,6 +661,7 @@ libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \
 @ENABLE_LLVM_TRUE at SUBDIRS = llvm
 @DEBUG_BUILD_FALSE@@ENABLE_LLVM_TRUE at LLVM_CONFIG = llvm/llvm/Release/bin/llvm-config
 @DEBUG_BUILD_TRUE@@ENABLE_LLVM_TRUE at LLVM_CONFIG = llvm/llvm/Debug/bin/llvm-config
+ at ENABLE_LLVM_FALSE@libclamav_la_CPPFLAGS = $(AM_CPPFLAGS)
 @ENABLE_LLVM_TRUE at libclamav_la_CPPFLAGS = $(AM_CPPFLAGS) `$(LLVM_CONFIG) --cppflags`
 noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la
 COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno
diff --git a/libclamav/bytecode_nojit.c b/libclamav/bytecode_nojit.c
index 507208e..d638795 100644
--- a/libclamav/bytecode_nojit.c
+++ b/libclamav/bytecode_nojit.c
@@ -20,7 +20,9 @@
  *  MA 02110-1301, USA.
  */
 
+#include "cltypes.h"
 #include "bytecode.h"
+#include "clamav.h"
 
 int cli_bytecode_prepare_jit(struct cli_bc *bc)
 {
@@ -50,3 +52,8 @@ int cli_bytecode_done_jit(struct cli_all_bc *allbc)
 void cli_bytecode_debug(int argc, char **argv) {
   // Empty
 }
+
+int bytecode_init(void)
+{
+    return 0;
+}

-- 
Debian repository for ClamAV