@@ -1,3 +1,7 @@

+Sat Feb 24 19:40:01 CET 2007 (tk)

+---------------------------------

+  * clamscan, clamdscan, clamconf: compile with CL_NOTHREADS defined

+

 Sat Feb 24 17:47:54 CET 2007 (tk)

 ---------------------------------

   * libclamav: fix memory leaks in db handling code

@@ -29,5 +29,6 @@ clamconf_SOURCES = \

     $(top_srcdir)/shared/getopt.h \

     clamconf.c

+DEFS = @DEFS@ -DCL_NOTHREADS

 INCLUDES = -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

@@ -116,7 +116,7 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

-DEFS = @DEFS@

+DEFS = @DEFS@ -DCL_NOTHREADS

 DEPDIR = @DEPDIR@

 ECHO = @ECHO@

 ECHO_C = @ECHO_C@

@@ -40,5 +40,6 @@ clamdscan_SOURCES = \

 endif

+DEFS = @DEFS@ -DCL_NOTHREADS

 INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

@@ -127,7 +127,7 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

-DEFS = @DEFS@

+DEFS = @DEFS@ -DCL_NOTHREADS

 DEPDIR = @DEPDIR@

 ECHO = @ECHO@

 ECHO_C = @ECHO_C@

@@ -42,5 +42,6 @@ clamscan_SOURCES = \

     treewalk.c \

     treewalk.h

+DEFS = @DEFS@ -DCL_NOTHREADS

 LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@@ -119,7 +119,7 @@ CXXDEPMODE = @CXXDEPMODE@

 CXXFLAGS = @CXXFLAGS@

 CYGPATH_W = @CYGPATH_W@

 DBDIR = @DBDIR@

-DEFS = @DEFS@

+DEFS = @DEFS@ -DCL_NOTHREADS

 DEPDIR = @DEPDIR@

 ECHO = @ECHO@

 ECHO_C = @ECHO_C@

@@ -41,6 +41,10 @@

 #include <netdb.h>

 #endif

+#ifdef CL_NOTHREADS

+#undef CL_THREAD_SAFE

+#endif

+

 #ifdef  CL_THREAD_SAFE

 #include <pthread.h>

 #endif