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

+Mon May  5 20:28:22 CEST 2008 (acab)

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

+  * build system: revert r3808 to allow building on *BSD - bb#1010

+

 Mon May  5 15:32:42 CEST 2008 (tk)

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

   * doc/clamdoc.tex: add a note about forking daemons (bb#906)

@@ -29,4 +29,4 @@ clamconf_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

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

-LIBS = $(top_builddir)/libclamav/libclamav.la

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

@@ -133,7 +133,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la

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

 LIBTOOL = @LIBTOOL@

 LN_S = @LN_S@

 LTLIBBZ2 = @LTLIBBZ2@

@@ -41,5 +41,5 @@ clamscan_SOURCES = \

     treewalk.h

 DEFS = @DEFS@ -DCL_NOTHREADS

-LIBS = $(top_builddir)/libclamav/libclamav.la

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

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

@@ -136,7 +136,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la

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

 LIBTOOL = @LIBTOOL@

 LN_S = @LN_S@

 LTLIBBZ2 = @LTLIBBZ2@

@@ -68,6 +68,13 @@ int main(int argc, char **argv)

 	struct optstruct *opt;

 	const char *pt;

+#if defined(C_WINDOWS) && defined(CL_THREAD_SAFE)

+    if(!pthread_win32_process_attach_np()) {

+	mprintf("!Can't start the win32 pthreads layer\n");

+	return 72;

+    }

+#endif

+

     opt = opt_parse(argc, argv, clamscan_shortopt, clamscan_longopt, NULL);

     if(!opt) {

 	mprintf("!Can't parse the command line\n");

@@ -247,6 +254,13 @@ int main(int argc, char **argv)

     opt_free(opt);

+#if defined(C_WINDOWS) && defined(CL_THREAD_SAFE)

+    if(!pthread_win32_process_detach_np()) {

+	logg("!Can't stop the win32 pthreads layer\n");

+	return 72;

+    }

+#endif

+

     return ret;

 }

@@ -51,4 +51,4 @@ freshclam_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

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

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

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

@@ -138,7 +138,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

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

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

 LIBTOOL = @LIBTOOL@

 LN_S = @LN_S@

 LTLIBBZ2 = @LTLIBBZ2@

@@ -276,6 +276,15 @@ int main(int argc, char **argv)

 	return 0;

     }

+#ifdef C_WINDOWS

+    if(!pthread_win32_process_attach_np()) {

+	mprintf("!Can't start the win32 pthreads layer\n");

+	opt_free(opt);

+	freecfg(copt);

+	return 63;

+    }

+#endif

+

     if(opt_check(opt, "http-proxy") || opt_check(opt, "proxy-user"))

 	logg("WARNING: Proxy settings are now only configurable in the config file.\n");

@@ -585,5 +594,14 @@ int main(int argc, char **argv)

     opt_free(opt);

     freecfg(copt);

+#ifdef C_WINDOWS

+    WSACleanup();

+

+    if(!pthread_win32_process_detach_np()) {

+	mprintf("!Can't stop the win32 pthreads layer\n");

+	return 63;

+    }

+#endif

+

     return(ret);

 }

@@ -42,4 +42,4 @@ sigtool_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

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

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

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

@@ -137,7 +137,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBGMP = @LIBGMP@

 LIBGMP_PREFIX = @LIBGMP_PREFIX@

 LIBOBJS = @LIBOBJS@

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

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

 LIBTOOL = @LIBTOOL@

 LN_S = @LN_S@

 LTLIBBZ2 = @LTLIBBZ2@