1. clamav-devel
  2. Commit b070a1d264de9329e3e0fa26623e81dcad836ba0
Browse code

fix build on platforms where pthread in not part of libc (bb #1470).

git-svn: trunk@4946

Török Edvin authored on 2009/03/14 23:31:49
Showing 10 changed files
ChangeLog
History View file @ b070a1d
... ... 
@@ -1,3 +1,8 @@
1 
+Sat Mar 14 16:18:00 EET 2009 (edwin)
2 
+------------------------------------
3 
+ * clamconf/, clamdscan/, clamdtop/, libclamav/: fix build on
4 
+ platforms where pthread in not part of libc (bb #1470).
5 
+
1 6 
 Fri Mar 13 20:10:39 EET 2009 (edwin)
2 7 
 ------------------------------------
3 8 
  * clamd/scanner.c: typo
clamconf/Makefile.am
History View file @ b070a1d
... ... 
@@ -29,5 +29,5 @@ clamconf_SOURCES = \
29 29
30 30 
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
31 31 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared
32 
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la
32 
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
33 33 
 CLEANFILES=*.gcda *.gcno
clamconf/Makefile.in
History View file @ b070a1d
... ... 
@@ -151,7 +151,7 @@ LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
151 151 
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
152 152 
 LIBLTDL = @LIBLTDL@
153 153 
 LIBOBJS = @LIBOBJS@
154 
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la
154 
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
155 155 
 LIBTOOL = @LIBTOOL@
156 156 
 LIPO = @LIPO@
157 157 
 LN_S = @LN_S@
clamdscan/Makefile.am
History View file @ b070a1d
... ... 
@@ -41,7 +41,7 @@ endif
41 41
42 42 
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
43 43 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
44 
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @FRESHCLAM_LIBS@
44 
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la  @FRESHCLAM_LIBS@
45 45
46 46 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT)
47 47 
 CLEANFILES=*.gcda *.gcno
clamdscan/Makefile.in
History View file @ b070a1d
... ... 
@@ -162,7 +162,7 @@ LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
162 162 
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
163 163 
 LIBLTDL = @LIBLTDL@
164 164 
 LIBOBJS = @LIBOBJS@
165 
-LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @FRESHCLAM_LIBS@
165 
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la  @FRESHCLAM_LIBS@
166 166 
 LIBTOOL = @LIBTOOL@
167 167 
 LIPO = @LIPO@
168 168 
 LN_S = @LN_S@
clamdtop/Makefile.am
History View file @ b070a1d
... ... 
@@ -11,7 +11,7 @@ clamdtop_SOURCES = \
11 11 
     clamdtop.c
12 12
13 13 
 AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@
14 
-clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils.la
14 
+clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
15 15 
 endif
16 16 
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
17 17 
 EXTRA_DIST = clamdtop.c
clamdtop/Makefile.in
History View file @ b070a1d
... ... 
@@ -61,7 +61,7 @@ am__clamdtop_SOURCES_DIST = $(top_srcdir)/shared/optparser.c \
61 61 
 @HAVE_CURSES_TRUE@	getopt.$(OBJEXT) misc.$(OBJEXT) \
62 62 
 @HAVE_CURSES_TRUE@	clamdtop.$(OBJEXT)
63 63 
 clamdtop_OBJECTS = $(am_clamdtop_OBJECTS)
64 
-@HAVE_CURSES_TRUE@clamdtop_DEPENDENCIES = $(top_builddir)/libclamav/libclamav_internal_utils.la
64 
+@HAVE_CURSES_TRUE@clamdtop_DEPENDENCIES = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
65 65 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
66 66 
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
67 67 
 am__depfiles_maybe = depfiles
... ... 
@@ -248,7 +248,7 @@ top_srcdir = @top_srcdir@
248 248 
 @HAVE_CURSES_TRUE@    clamdtop.c
249 249
250 250 
 @HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@
251 
-@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils.la
251 
+@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
252 252 
 EXTRA_DIST = clamdtop.c
253 253 
 all: all-am
254 254
libclamav/Makefile.am
History View file @ b070a1d
... ... 
@@ -74,10 +74,10 @@ IFACELIBADD = -dlopen libclamunrar_iface.la
74 74 
 IFACEDEP = libclamunrar_iface.la
75 75 
 endif
76 76
77 
-libclamav_internal_utils_la_SOURCES=str.c \
78 
-				    str.h \
79 
-				    md5.c \
80 
-				    md5.h \
77 
+libclamav_internal_utils_la_SOURCES=str.c\
78 
+				    str.h\
79 
+				    md5.c\
80 
+				    md5.h\
81 81 
 				    others_common.c \
82 82 
 				    others.h \
83 83 
 				    regex/strlcpy.c \
... ... 
@@ -89,17 +89,31 @@ libclamav_internal_utils_la_SOURCES=str.c \
89 89 
 				    regex/cname.h \
90 90 
 				    regex/regex.h \
91 91 
 				    regex/regex2.h \
92 
-				    regex/utils.h \
93 
-				    bignum.h
94 
-
95 
-if !LINK_TOMMATH
96 
-libclamav_internal_utils_la_SOURCES += bignum.c \
97 
-				    bignum_class.h
98 
-endif
92 
+				    regex/utils.h
99 93
100 94 
 libclamav_internal_utils_la_LDFLAGS=-static
101 95 
 libclamav_internal_utils_la_CFLAGS=  -fPIC -DPIC
102 96
97 
+libclamav_internal_utils_nothreads_la_SOURCES=str.c\
98 
+				    str.h\
99 
+				    md5.c\
100 
+				    md5.h\
101 
+				    others_common.c \
102 
+				    others.h \
103 
+				    regex/strlcpy.c \
104 
+				    regex/regcomp.c \
105 
+				    regex/regerror.c \
106 
+				    regex/regexec.c \
107 
+				    regex/regfree.c \
108 
+				    regex/cclass.h \
109 
+				    regex/cname.h \
110 
+				    regex/regex.h \
111 
+				    regex/regex2.h \
112 
+				    regex/utils.h
113 
+
114 
+libclamav_internal_utils_nothreads_la_LDFLAGS=-static
115 
+libclamav_internal_utils_nothreads_la_CFLAGS=-DCL_NOTHREADS
116 
+
103 117 
 libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) lzma/liblzma.la libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
104 118 
 libclamav_la_DEPENDENCIES =  @LTDLDEPS@ $(IFACEDEP) libclamav_internal_utils.la
105 119 
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
... ... 
@@ -269,7 +283,13 @@ libclamav_la_SOURCES = \
269 269 
 	mpool.h \
270 270 
 	default.h\
271 271 
 	sha256.c\
272 
-	sha256.h
272 
+	sha256.h\
273 
+	bignum.h
274 
+
275 
+if !LINK_TOMMATH
276 
+libclamav_la_SOURCES += bignum.c \
277 
+		     bignum_class.h
278 
+endif
273 279
274 280 
 .PHONY: version.h.tmp
275 281 
 version.lo: version.h
... ... 
@@ -297,7 +317,7 @@ version.h.tmp:
297 297 
 	fi
298 298
299 299 
 lib_LTLIBRARIES += libclamav.la
300 
-noinst_LTLIBRARIES = libclamav_internal_utils.la
300 
+noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la
301 301 
 EXTRA_DIST += regex/engine.c libclamav.map \
302 302 
 	     jsparse/generated/operators.h jsparse/generated/keywords.h jsparse/future_reserved_words.list\
303 303 
 	     jsparse/keywords.list jsparse/special_keywords.list jsparse/operators.gperf
libclamav/Makefile.in
History View file @ b070a1d
... ... 
@@ -60,10 +60,10 @@ target_triplet = @target@
60 60 
 @ENABLE_UNRAR_TRUE@	@top_srcdir@/libclamunrar/libclamunrar.map \
61 61 
 @ENABLE_UNRAR_TRUE@	@top_srcdir@/libclamunrar_iface/libclamunrar_iface.map
62 62 
 @ENABLE_UNRAR_TRUE@@VERSIONSCRIPT_TRUE@am__append_5 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamunrar_iface/libclamunrar_iface.map
63 
-@LINK_TOMMATH_FALSE@am__append_6 = bignum.c \
64 
-@LINK_TOMMATH_FALSE@				    bignum_class.h
63 
+@VERSIONSCRIPT_TRUE@am__append_6 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
64 
+@LINK_TOMMATH_FALSE@am__append_7 = bignum.c \
65 
+@LINK_TOMMATH_FALSE@		     bignum_class.h
65 66
66 
-@VERSIONSCRIPT_TRUE@am__append_7 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
67 67 
 subdir = libclamav
68 68 
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
69 69 
 	$(srcdir)/Makefile.in
... ... 
@@ -91,6 +91,37 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
91 91 
 libLTLIBRARIES_INSTALL = $(INSTALL)
92 92 
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
93 93 
 @ENABLE_UNRAR_TRUE@am__DEPENDENCIES_1 = libclamunrar_iface.la
94 
+am__libclamav_la_SOURCES_DIST = clamav.h matcher-ac.c matcher-ac.h \
95 
+	matcher-bm.c matcher-bm.h matcher.c matcher.h others.c \
96 
+	others.h readdb.c readdb.h cvd.c cvd.h dsig.c dsig.h \
97 
+	scanners.c scanners.h textdet.c textdet.h filetypes.c \
98 
+	filetypes.h filetypes_int.h rtf.c rtf.h blob.c blob.h mbox.c \
99 
+	mbox.h message.c message.h table.c table.h text.c text.h \
100 
+	ole2_extract.c ole2_extract.h vba_extract.c vba_extract.h \
101 
+	cltypes.h msexpand.c msexpand.h pe.c pe.h disasm.c disasm.h \
102 
+	disasmpriv.h upx.c upx.h htmlnorm.c htmlnorm.h chmunpack.c \
103 
+	chmunpack.h rebuildpe.c rebuildpe.h petite.c petite.h \
104 
+	wwunpack.c wwunpack.h unsp.c unsp.h aspack.c aspack.h \
105 
+	packlibs.c packlibs.h fsg.c fsg.h mew.c mew.h upack.c upack.h \
106 
+	line.c line.h untar.c untar.h unzip.c unzip.h inflate64.c \
107 
+	inflate64.h inffixed64.h inflate64_priv.h special.c special.h \
108 
+	binhex.c binhex.h is_tar.c is_tar.h tnef.c tnef.h autoit.c \
109 
+	autoit.h unarj.c unarj.h nsis/bzlib.c nsis/bzlib_private.h \
110 
+	nsis/nsis_bzlib.h nsis/nulsft.c nsis/nulsft.h nsis/infblock.c \
111 
+	nsis/nsis_zconf.h nsis/nsis_zlib.h nsis/nsis_zutil.h pdf.c \
112 
+	pdf.h spin.c spin.h yc.c yc.h elf.c elf.h execs.h sis.c sis.h \
113 
+	uuencode.c uuencode.h phishcheck.c phishcheck.h \
114 
+	phish_domaincheck_db.c phish_domaincheck_db.h \
115 
+	phish_whitelist.c phish_whitelist.h iana_cctld.h iana_tld.h \
116 
+	regex_list.c regex_list.h regex_suffix.c regex_suffix.h \
117 
+	mspack.c mspack.h cab.c cab.h entconv.c entconv.h entitylist.h \
118 
+	encoding_aliases.h hashtab.c hashtab.h dconf.c dconf.h \
119 
+	lzma_iface.c lzma_iface.h explode.c explode.h textnorm.c \
120 
+	textnorm.h dlp.c dlp.h jsparse/js-norm.c jsparse/js-norm.h \
121 
+	jsparse/lexglobal.h jsparse/textbuf.h uniq.c uniq.h version.c \
122 
+	version.h mpool.c mpool.h default.h sha256.c sha256.h bignum.h \
123 
+	bignum.c bignum_class.h
124 
+@LINK_TOMMATH_FALSE@am__objects_1 = bignum.lo
94 125 
 am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \
95 126 
 	others.lo readdb.lo cvd.lo dsig.lo scanners.lo textdet.lo \
96 127 
 	filetypes.lo rtf.lo blob.lo mbox.lo message.lo table.lo \
... ... 
@@ -104,19 +135,12 @@ am_libclamav_la_OBJECTS = matcher-ac.lo matcher-bm.lo matcher.lo \
104 104 
 	phish_whitelist.lo regex_list.lo regex_suffix.lo mspack.lo \
105 105 
 	cab.lo entconv.lo hashtab.lo dconf.lo lzma_iface.lo explode.lo \
106 106 
 	textnorm.lo dlp.lo js-norm.lo uniq.lo version.lo mpool.lo \
107 
-	sha256.lo
107 
+	sha256.lo $(am__objects_1)
108 108 
 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)
109 109 
 libclamav_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
110 110 
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
111 111 
 	$(libclamav_la_LDFLAGS) $(LDFLAGS) -o $@
112 112 
 libclamav_internal_utils_la_LIBADD =
113 
-am__libclamav_internal_utils_la_SOURCES_DIST = str.c str.h md5.c md5.h \
114 
-	others_common.c others.h regex/strlcpy.c regex/regcomp.c \
115 
-	regex/regerror.c regex/regexec.c regex/regfree.c \
116 
-	regex/cclass.h regex/cname.h regex/regex.h regex/regex2.h \
117 
-	regex/utils.h bignum.h bignum.c bignum_class.h
118 
-@LINK_TOMMATH_FALSE@am__objects_1 =  \
119 
-@LINK_TOMMATH_FALSE@	libclamav_internal_utils_la-bignum.lo
120 113 
 am_libclamav_internal_utils_la_OBJECTS =  \
121 114 
 	libclamav_internal_utils_la-str.lo \
122 115 
 	libclamav_internal_utils_la-md5.lo \
... ... 
@@ -125,13 +149,30 @@ am_libclamav_internal_utils_la_OBJECTS =  \
125 125 
 	libclamav_internal_utils_la-regcomp.lo \
126 126 
 	libclamav_internal_utils_la-regerror.lo \
127 127 
 	libclamav_internal_utils_la-regexec.lo \
128 
-	libclamav_internal_utils_la-regfree.lo $(am__objects_1)
128 
+	libclamav_internal_utils_la-regfree.lo
129 129 
 libclamav_internal_utils_la_OBJECTS =  \
130 130 
 	$(am_libclamav_internal_utils_la_OBJECTS)
131 131 
 libclamav_internal_utils_la_LINK = $(LIBTOOL) --tag=CC \
132 132 
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
133 133 
 	$(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) \
134 134 
 	$(libclamav_internal_utils_la_LDFLAGS) $(LDFLAGS) -o $@
135 
+libclamav_internal_utils_nothreads_la_LIBADD =
136 
+am_libclamav_internal_utils_nothreads_la_OBJECTS =  \
137 
+	libclamav_internal_utils_nothreads_la-str.lo \
138 
+	libclamav_internal_utils_nothreads_la-md5.lo \
139 
+	libclamav_internal_utils_nothreads_la-others_common.lo \
140 
+	libclamav_internal_utils_nothreads_la-strlcpy.lo \
141 
+	libclamav_internal_utils_nothreads_la-regcomp.lo \
142 
+	libclamav_internal_utils_nothreads_la-regerror.lo \
143 
+	libclamav_internal_utils_nothreads_la-regexec.lo \
144 
+	libclamav_internal_utils_nothreads_la-regfree.lo
145 
+libclamav_internal_utils_nothreads_la_OBJECTS =  \
146 
+	$(am_libclamav_internal_utils_nothreads_la_OBJECTS)
147 
+libclamav_internal_utils_nothreads_la_LINK = $(LIBTOOL) --tag=CC \
148 
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
149 
+	$(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) \
150 
+	$(libclamav_internal_utils_nothreads_la_LDFLAGS) $(LDFLAGS) -o \
151 
+	$@
135 152 
 libclamunrar_la_LIBADD =
136 153 
 am__libclamunrar_la_SOURCES_DIST = ../libclamunrar/unrar15.c \
137 154 
 	../libclamunrar/unrar20.h ../libclamunrar/unrar.h \
... ... 
@@ -175,9 +216,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
175 175 
 	$(LDFLAGS) -o $@
176 176 
 SOURCES = $(libclamav_la_SOURCES) \
177 177 
 	$(libclamav_internal_utils_la_SOURCES) \
178 
+	$(libclamav_internal_utils_nothreads_la_SOURCES) \
178 179 
 	$(libclamunrar_la_SOURCES) $(libclamunrar_iface_la_SOURCES)
179 
-DIST_SOURCES = $(libclamav_la_SOURCES) \
180 
-	$(am__libclamav_internal_utils_la_SOURCES_DIST) \
180 
+DIST_SOURCES = $(am__libclamav_la_SOURCES_DIST) \
181 
+	$(libclamav_internal_utils_la_SOURCES) \
182 
+	$(libclamav_internal_utils_nothreads_la_SOURCES) \
181 183 
 	$(am__libclamunrar_la_SOURCES_DIST) \
182 184 
 	$(am__libclamunrar_iface_la_SOURCES_DIST)
183 185 
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
... ... 
@@ -390,180 +433,79 @@ EXTRA_DIST = $(am__append_4) regex/engine.c libclamav.map \
390 390
391 391 
 @ENABLE_UNRAR_TRUE@IFACELIBADD = -dlopen libclamunrar_iface.la
392 392 
 @ENABLE_UNRAR_TRUE@IFACEDEP = libclamunrar_iface.la
393 
-libclamav_internal_utils_la_SOURCES = str.c str.h md5.c md5.h \
394 
-	others_common.c others.h regex/strlcpy.c regex/regcomp.c \
395 
-	regex/regerror.c regex/regexec.c regex/regfree.c \
396 
-	regex/cclass.h regex/cname.h regex/regex.h regex/regex2.h \
397 
-	regex/utils.h bignum.h $(am__append_6)
393 
+libclamav_internal_utils_la_SOURCES = str.c\
394 
+				    str.h\
395 
+				    md5.c\
396 
+				    md5.h\
397 
+				    others_common.c \
398 
+				    others.h \
399 
+				    regex/strlcpy.c \
400 
+				    regex/regcomp.c \
401 
+				    regex/regerror.c \
402 
+				    regex/regexec.c \
403 
+				    regex/regfree.c \
404 
+				    regex/cclass.h \
405 
+				    regex/cname.h \
406 
+				    regex/regex.h \
407 
+				    regex/regex2.h \
408 
+				    regex/utils.h
409 
+
398 410 
 libclamav_internal_utils_la_LDFLAGS = -static
399 411 
 libclamav_internal_utils_la_CFLAGS = -fPIC -DPIC
412 
+libclamav_internal_utils_nothreads_la_SOURCES = str.c\
413 
+				    str.h\
414 
+				    md5.c\
415 
+				    md5.h\
416 
+				    others_common.c \
417 
+				    others.h \
418 
+				    regex/strlcpy.c \
419 
+				    regex/regcomp.c \
420 
+				    regex/regerror.c \
421 
+				    regex/regexec.c \
422 
+				    regex/regfree.c \
423 
+				    regex/cclass.h \
424 
+				    regex/cname.h \
425 
+				    regex/regex.h \
426 
+				    regex/regex2.h \
427 
+				    regex/utils.h
428 
+
429 
+libclamav_internal_utils_nothreads_la_LDFLAGS = -static
430 
+libclamav_internal_utils_nothreads_la_CFLAGS = -DCL_NOTHREADS
400 431 
 libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) lzma/liblzma.la libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
401 432 
 libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) libclamav_internal_utils.la
402 433 
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \
403 
-	-no-undefined $(am__append_7)
434 
+	-no-undefined $(am__append_6)
404 435 
 include_HEADERS = clamav.h
405 
-libclamav_la_SOURCES = \
406 
-	clamav.h \
407 
-        matcher-ac.c \
408 
-        matcher-ac.h \
409 
-        matcher-bm.c \
410 
-        matcher-bm.h \
411 
-        matcher.c \
412 
-        matcher.h \
413 
-        others.c \
414 
-        others.h \
415 
-        readdb.c \
416 
-	readdb.h \
417 
-	cvd.c \
418 
-	cvd.h \
419 
-	dsig.c \
420 
-	dsig.h \
421 
-	scanners.c \
422 
-	scanners.h \
423 
-	textdet.c \
424 
-	textdet.h \
425 
-	filetypes.c \
426 
-	filetypes.h \
427 
-	filetypes_int.h \
428 
-	rtf.c \
429 
-	rtf.h \
430 
-	blob.c \
431 
-	blob.h \
432 
-	mbox.c \
433 
-	mbox.h \
434 
-	message.c \
435 
-	message.h \
436 
-	table.c \
437 
-	table.h \
438 
-	text.c \
439 
-	text.h \
440 
-	ole2_extract.c \
441 
-	ole2_extract.h \
442 
-	vba_extract.c \
443 
-	vba_extract.h \
444 
-	cltypes.h \
445 
-	msexpand.c \
446 
-	msexpand.h \
447 
-	pe.c \
448 
-	pe.h \
449 
-	disasm.c \
450 
-	disasm.h \
451 
-	disasmpriv.h \
452 
-	upx.c \
453 
-	upx.h \
454 
-	htmlnorm.c \
455 
-	htmlnorm.h \
456 
-	chmunpack.c \
457 
-	chmunpack.h \
458 
-	rebuildpe.c \
459 
-	rebuildpe.h \
460 
-	petite.c \
461 
-	petite.h \
462 
-	wwunpack.c \
463 
-	wwunpack.h \
464 
-	unsp.c \
465 
-	unsp.h \
466 
-	aspack.c \
467 
-	aspack.h \
468 
-	packlibs.c \
469 
-	packlibs.h \
470 
-	fsg.c \
471 
-	fsg.h \
472 
-	mew.c \
473 
-	mew.h \
474 
-	upack.c \
475 
-	upack.h \
476 
-	line.c \
477 
-	line.h \
478 
-	untar.c \
479 
-	untar.h \
480 
-	unzip.c \
481 
-	unzip.h \
482 
-	inflate64.c \
483 
-	inflate64.h \
484 
-	inffixed64.h \
485 
-	inflate64_priv.h \
486 
-	special.c \
487 
-	special.h \
488 
-	binhex.c \
489 
-	binhex.h \
490 
-	is_tar.c \
491 
-	is_tar.h \
492 
-	tnef.c \
493 
-	tnef.h \
494 
-	autoit.c \
495 
-	autoit.h \
496 
-	unarj.c \
497 
-	unarj.h \
498 
-	nsis/bzlib.c \
499 
-	nsis/bzlib_private.h \
500 
-	nsis/nsis_bzlib.h \
501 
-	nsis/nulsft.c \
502 
-	nsis/nulsft.h \
503 
-	nsis/infblock.c \
504 
-	nsis/nsis_zconf.h \
505 
-	nsis/nsis_zlib.h \
506 
-	nsis/nsis_zutil.h \
507 
-	pdf.c \
508 
-	pdf.h \
509 
-	spin.c \
510 
-	spin.h \
511 
-	yc.c \
512 
-	yc.h \
513 
-	elf.c \
514 
-	elf.h \
515 
-	execs.h \
516 
-	sis.c \
517 
-	sis.h \
518 
-	uuencode.c \
519 
-	uuencode.h \
520 
-	phishcheck.c \
521 
-	phishcheck.h \
522 
-	phish_domaincheck_db.c \
523 
-	phish_domaincheck_db.h \
524 
-	phish_whitelist.c \
525 
-	phish_whitelist.h \
526 
-	iana_cctld.h \
527 
-	iana_tld.h \
528 
-	regex_list.c \
529 
-	regex_list.h \
530 
-	regex_suffix.c \
531 
-	regex_suffix.h \
532 
-	mspack.c \
533 
-	mspack.h \
534 
-	cab.c \
535 
-	cab.h \
536 
-	entconv.c \
537 
-	entconv.h \
538 
-	entitylist.h \
539 
-	encoding_aliases.h \
540 
-	hashtab.c \
541 
-	hashtab.h \
542 
-	dconf.c \
543 
-	dconf.h \
544 
-	lzma_iface.c \
545 
-	lzma_iface.h \
546 
-	explode.c \
547 
-	explode.h \
548 
-	textnorm.c \
549 
-	textnorm.h \
550 
-	dlp.c \
551 
-	dlp.h \
552 
-	jsparse/js-norm.c \
553 
-	jsparse/js-norm.h \
554 
-	jsparse/lexglobal.h \
555 
-	jsparse/textbuf.h \
556 
-	uniq.c \
557 
-	uniq.h \
558 
-	version.c\
559 
-	version.h\
560 
-	mpool.c\
561 
-	mpool.h \
562 
-	default.h\
563 
-	sha256.c\
564 
-	sha256.h
565 
-
566 
-noinst_LTLIBRARIES = libclamav_internal_utils.la
436 
+libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \
437 
+	matcher-bm.h matcher.c matcher.h others.c others.h readdb.c \
438 
+	readdb.h cvd.c cvd.h dsig.c dsig.h scanners.c scanners.h \
439 
+	textdet.c textdet.h filetypes.c filetypes.h filetypes_int.h \
440 
+	rtf.c rtf.h blob.c blob.h mbox.c mbox.h message.c message.h \
441 
+	table.c table.h text.c text.h ole2_extract.c ole2_extract.h \
442 
+	vba_extract.c vba_extract.h cltypes.h msexpand.c msexpand.h \
443 
+	pe.c pe.h disasm.c disasm.h disasmpriv.h upx.c upx.h \
444 
+	htmlnorm.c htmlnorm.h chmunpack.c chmunpack.h rebuildpe.c \
445 
+	rebuildpe.h petite.c petite.h wwunpack.c wwunpack.h unsp.c \
446 
+	unsp.h aspack.c aspack.h packlibs.c packlibs.h fsg.c fsg.h \
447 
+	mew.c mew.h upack.c upack.h line.c line.h untar.c untar.h \
448 
+	unzip.c unzip.h inflate64.c inflate64.h inffixed64.h \
449 
+	inflate64_priv.h special.c special.h binhex.c binhex.h \
450 
+	is_tar.c is_tar.h tnef.c tnef.h autoit.c autoit.h unarj.c \
451 
+	unarj.h nsis/bzlib.c nsis/bzlib_private.h nsis/nsis_bzlib.h \
452 
+	nsis/nulsft.c nsis/nulsft.h nsis/infblock.c nsis/nsis_zconf.h \
453 
+	nsis/nsis_zlib.h nsis/nsis_zutil.h pdf.c pdf.h spin.c spin.h \
454 
+	yc.c yc.h elf.c elf.h execs.h sis.c sis.h uuencode.c \
455 
+	uuencode.h phishcheck.c phishcheck.h phish_domaincheck_db.c \
456 
+	phish_domaincheck_db.h phish_whitelist.c phish_whitelist.h \
457 
+	iana_cctld.h iana_tld.h regex_list.c regex_list.h \
458 
+	regex_suffix.c regex_suffix.h mspack.c mspack.h cab.c cab.h \
459 
+	entconv.c entconv.h entitylist.h encoding_aliases.h hashtab.c \
460 
+	hashtab.h dconf.c dconf.h lzma_iface.c lzma_iface.h explode.c \
461 
+	explode.h textnorm.c textnorm.h dlp.c dlp.h jsparse/js-norm.c \
462 
+	jsparse/js-norm.h jsparse/lexglobal.h jsparse/textbuf.h uniq.c \
463 
+	uniq.h version.c version.h mpool.c mpool.h default.h sha256.c \
464 
+	sha256.h bignum.h $(am__append_7)
465 
+noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la
567 466 
 COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno lzma/*.gcda lzma/*.gcno
568 467 
 @MAINTAINER_MODE_TRUE@BUILT_SOURCES = jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf
569 468 
 @MAINTAINER_MODE_TRUE@GPERF_FLAGS = -E -t -L ANSI-C -C -F ', TOK_ERROR' -c
... ... 
@@ -643,6 +585,8 @@ libclamav.la: $(libclamav_la_OBJECTS) $(libclamav_la_DEPENDENCIES)
643 643 
 	$(libclamav_la_LINK) -rpath $(libdir) $(libclamav_la_OBJECTS) $(libclamav_la_LIBADD) $(LIBS)
644 644 
 libclamav_internal_utils.la: $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_DEPENDENCIES)
645 645 
 	$(libclamav_internal_utils_la_LINK)  $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_LIBADD) $(LIBS)
646 
+libclamav_internal_utils_nothreads.la: $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_DEPENDENCIES)
647 
+	$(libclamav_internal_utils_nothreads_la_LINK)  $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_LIBADD) $(LIBS)
646 648 
 libclamunrar.la: $(libclamunrar_la_OBJECTS) $(libclamunrar_la_DEPENDENCIES)
647 649 
 	$(libclamunrar_la_LINK) $(am_libclamunrar_la_rpath) $(libclamunrar_la_OBJECTS) $(libclamunrar_la_LIBADD) $(LIBS)
648 650 
 libclamunrar_iface.la: $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_DEPENDENCIES)
... ... 
@@ -656,6 +600,7 @@ distclean-compile:
656 656
657 657 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aspack.Plo@am__quote@
658 658 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autoit.Plo@am__quote@
659 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bignum.Plo@am__quote@
659 660 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binhex.Plo@am__quote@
660 661 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blob.Plo@am__quote@
661 662 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bzlib.Plo@am__quote@
... ... 
@@ -677,7 +622,6 @@ distclean-compile:
677 677 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate64.Plo@am__quote@
678 678 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/is_tar.Plo@am__quote@
679 679 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/js-norm.Plo@am__quote@
680 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-bignum.Plo@am__quote@
681 680 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-md5.Plo@am__quote@
682 681 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-others_common.Plo@am__quote@
683 682 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regcomp.Plo@am__quote@
... ... 
@@ -686,6 +630,14 @@ distclean-compile:
686 686 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-regfree.Plo@am__quote@
687 687 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-str.Plo@am__quote@
688 688 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_la-strlcpy.Plo@am__quote@
689 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Plo@am__quote@
690 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-others_common.Plo@am__quote@
691 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Plo@am__quote@
692 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Plo@am__quote@
693 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo@am__quote@
694 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo@am__quote@
695 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Plo@am__quote@
696 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo@am__quote@
689 697 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line.Plo@am__quote@
690 698 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzma_iface.Plo@am__quote@
691 699 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matcher-ac.Plo@am__quote@
... ... 
@@ -849,12 +801,61 @@ libclamav_internal_utils_la-regfree.lo: regex/regfree.c
849 849 
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
850 850 
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
851 851
852 
-libclamav_internal_utils_la-bignum.lo: bignum.c
853 
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-bignum.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-bignum.Tpo -c -o libclamav_internal_utils_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c
854 
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_la-bignum.Tpo $(DEPDIR)/libclamav_internal_utils_la-bignum.Plo
855 
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bignum.c' object='libclamav_internal_utils_la-bignum.lo' libtool=yes @AMDEPBACKSLASH@
852 
+libclamav_internal_utils_nothreads_la-str.lo: str.c
853 
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-str.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Tpo -c -o libclamav_internal_utils_nothreads_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c
854 
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-str.Plo
855 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='str.c' object='libclamav_internal_utils_nothreads_la-str.lo' libtool=yes @AMDEPBACKSLASH@
856 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
857 
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c
858 
+
859 
+libclamav_internal_utils_nothreads_la-md5.lo: md5.c
860 
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-md5.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Tpo -c -o libclamav_internal_utils_nothreads_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
861 
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-md5.Plo
862 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5.c' object='libclamav_internal_utils_nothreads_la-md5.lo' libtool=yes @AMDEPBACKSLASH@
863 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
864 
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
865 
+
866 
+libclamav_internal_utils_nothreads_la-others_common.lo: others_common.c
867 
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-others_common.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-others_common.Tpo -c -o libclamav_internal_utils_nothreads_la-others_common.lo `test -f 'others_common.c' || echo '$(srcdir)/'`others_common.c
868 
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_nothreads_la-others_common.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-others_common.Plo
869 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='others_common.c' object='libclamav_internal_utils_nothreads_la-others_common.lo' libtool=yes @AMDEPBACKSLASH@
870 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
871 
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-others_common.lo `test -f 'others_common.c' || echo '$(srcdir)/'`others_common.c
872 
+
873 
+libclamav_internal_utils_nothreads_la-strlcpy.lo: regex/strlcpy.c
874 
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-strlcpy.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Tpo -c -o libclamav_internal_utils_nothreads_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
875 
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-strlcpy.Plo
876 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/strlcpy.c' object='libclamav_internal_utils_nothreads_la-strlcpy.lo' libtool=yes @AMDEPBACKSLASH@
877 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
878 
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-strlcpy.lo `test -f 'regex/strlcpy.c' || echo '$(srcdir)/'`regex/strlcpy.c
879 
+
880 
+libclamav_internal_utils_nothreads_la-regcomp.lo: regex/regcomp.c
881 
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-regcomp.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Tpo -c -o libclamav_internal_utils_nothreads_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
882 
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regcomp.Plo
883 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regcomp.c' object='libclamav_internal_utils_nothreads_la-regcomp.lo' libtool=yes @AMDEPBACKSLASH@
884 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
885 
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-regcomp.lo `test -f 'regex/regcomp.c' || echo '$(srcdir)/'`regex/regcomp.c
886 
+
887 
+libclamav_internal_utils_nothreads_la-regerror.lo: regex/regerror.c
888 
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-regerror.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Tpo -c -o libclamav_internal_utils_nothreads_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
889 
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regerror.Plo
890 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regerror.c' object='libclamav_internal_utils_nothreads_la-regerror.lo' libtool=yes @AMDEPBACKSLASH@
891 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
892 
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-regerror.lo `test -f 'regex/regerror.c' || echo '$(srcdir)/'`regex/regerror.c
893 
+
894 
+libclamav_internal_utils_nothreads_la-regexec.lo: regex/regexec.c
895 
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-regexec.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Tpo -c -o libclamav_internal_utils_nothreads_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
896 
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regexec.Plo
897 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regexec.c' object='libclamav_internal_utils_nothreads_la-regexec.lo' libtool=yes @AMDEPBACKSLASH@
898 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
899 
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-regexec.lo `test -f 'regex/regexec.c' || echo '$(srcdir)/'`regex/regexec.c
900 
+
901 
+libclamav_internal_utils_nothreads_la-regfree.lo: regex/regfree.c
902 
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_nothreads_la-regfree.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Tpo -c -o libclamav_internal_utils_nothreads_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
903 
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Tpo $(DEPDIR)/libclamav_internal_utils_nothreads_la-regfree.Plo
904 
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='regex/regfree.c' object='libclamav_internal_utils_nothreads_la-regfree.lo' libtool=yes @AMDEPBACKSLASH@
856 905 
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
857 
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c
906 
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_internal_utils_nothreads_la_CFLAGS) $(CFLAGS) -c -o libclamav_internal_utils_nothreads_la-regfree.lo `test -f 'regex/regfree.c' || echo '$(srcdir)/'`regex/regfree.c
858 907
859 908 
 unrar15.lo: ../libclamunrar/unrar15.c
860 909 
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unrar15.lo -MD -MP -MF $(DEPDIR)/unrar15.Tpo -c -o unrar15.lo `test -f '../libclamunrar/unrar15.c' || echo '$(srcdir)/'`../libclamunrar/unrar15.c
libclamav/others_common.c
History View file @ b070a1d
... ... 
@@ -73,6 +73,10 @@
73 73
74 74 
 static unsigned char name_salt[16] = { 16, 38, 97, 12, 8, 4, 72, 196, 217, 144, 33, 124, 18, 11, 17, 253 };
75 75
76 
+#ifdef CL_NOTHREADS
77 
+#undef CL_THREAD_SAFE
78 
+#endif
79 
+
76 80 
 #ifdef CL_THREAD_SAFE
77 81 
 #  include <pthread.h>
78 82