1. clamav-devel
  2. Commit 099cf13cd43342fa744ea5899ed970a5ad13125c
Browse code

minor cleanup and fix for bb#260

git-svn: trunk@2671

Tomasz Kojm authored on 2007/02/03 07:40:47
Showing 23 changed files
clamav-devel/ChangeLog
History View file @ 099cf13
... ... 
@@ -1,3 +1,7 @@
1 
+Fri Feb  2 23:38:12 CET 2007 (tk)
2 
+---------------------------------
3 
+  * configure/make: minor cleanup and fix for bb#260
4 
+
1 5 
 Thu Feb  1 12:42:56 GMT 2007 (njh)
2 6 
 ----------------------------------
3 7 
   * libclamav:	Remove some warnings from icc
clamav-devel/Makefile.in
History View file @ 099cf13
... ... 
@@ -112,7 +112,6 @@ GZIP_ENV = --best
112 112 
 distuninstallcheck_listfiles = find . -type f -print
113 113 
 distcleancheck_listfiles = find . -type f -print
114 114 
 ACLOCAL = @ACLOCAL@
115 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
116 115 
 AMDEP_FALSE = @AMDEP_FALSE@
117 116 
 AMDEP_TRUE = @AMDEP_TRUE@
118 117 
 AMTAR = @AMTAR@
... ... 
@@ -182,6 +181,7 @@ RANLIB = @RANLIB@
182 182 
 SET_MAKE = @SET_MAKE@
183 183 
 SHELL = @SHELL@
184 184 
 STRIP = @STRIP@
185 
+THREAD_LIBS = @THREAD_LIBS@
185 186 
 TH_SAFE = @TH_SAFE@
186 187 
 VERSION = @VERSION@
187 188 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/clamav-milter/Makefile.am
History View file @ 099cf13
... ... 
@@ -42,6 +42,6 @@ man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
42 42 
 endif
43 43 
 endif
44 44
45 
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@
45 
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
46 46 
 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
47 47 
 EXTRA_DIST = clamav-milter.c INSTALL
clamav-devel/clamav-milter/Makefile.in
History View file @ 099cf13
... ... 
@@ -107,7 +107,6 @@ ETAGS = etags
107 107 
 CTAGS = ctags
108 108 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
109 109 
 ACLOCAL = @ACLOCAL@
110 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
111 110 
 AMDEP_FALSE = @AMDEP_FALSE@
112 111 
 AMDEP_TRUE = @AMDEP_TRUE@
113 112 
 AMTAR = @AMTAR@
... ... 
@@ -157,7 +156,7 @@ LDFLAGS = @LDFLAGS@
157 157 
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
158 158 
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
159 159 
 LIBOBJS = @LIBOBJS@
160 
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@
160 
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
161 161 
 LIBTOOL = @LIBTOOL@
162 162 
 LN_S = @LN_S@
163 163 
 LTLIBOBJS = @LTLIBOBJS@
... ... 
@@ -177,6 +176,7 @@ RANLIB = @RANLIB@
177 177 
 SET_MAKE = @SET_MAKE@
178 178 
 SHELL = @SHELL@
179 179 
 STRIP = @STRIP@
180 
+THREAD_LIBS = @THREAD_LIBS@
180 181 
 TH_SAFE = @TH_SAFE@
181 182 
 VERSION = @VERSION@
182 183 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/clamconf/Makefile.am
History View file @ 099cf13
... ... 
@@ -30,4 +30,4 @@ clamconf_SOURCES = \
30 30 
     clamconf.c
31 31
32 32 
 INCLUDES = -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
33 
-LIBS = $(top_builddir)/libclamav/libclamav.la
33 
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
clamav-devel/clamconf/Makefile.in
History View file @ 099cf13
... ... 
@@ -90,7 +90,6 @@ ETAGS = etags
90 90 
 CTAGS = ctags
91 91 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
92 92 
 ACLOCAL = @ACLOCAL@
93 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
94 93 
 AMDEP_FALSE = @AMDEP_FALSE@
95 94 
 AMDEP_TRUE = @AMDEP_TRUE@
96 95 
 AMTAR = @AMTAR@
... ... 
@@ -140,7 +139,7 @@ LDFLAGS = @LDFLAGS@
140 140 
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
141 141 
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
142 142 
 LIBOBJS = @LIBOBJS@
143 
-LIBS = $(top_builddir)/libclamav/libclamav.la
143 
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
144 144 
 LIBTOOL = @LIBTOOL@
145 145 
 LN_S = @LN_S@
146 146 
 LTLIBOBJS = @LTLIBOBJS@
... ... 
@@ -160,6 +159,7 @@ RANLIB = @RANLIB@
160 160 
 SET_MAKE = @SET_MAKE@
161 161 
 SHELL = @SHELL@
162 162 
 STRIP = @STRIP@
163 
+THREAD_LIBS = @THREAD_LIBS@
163 164 
 TH_SAFE = @TH_SAFE@
164 165 
 VERSION = @VERSION@
165 166 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/clamd/Makefile.am
History View file @ 099cf13
... ... 
@@ -62,5 +62,5 @@ clamd_SOURCES = \
62 62
63 63 
 endif
64 64
65 
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @ADDITIONAL_LIBS@
65 
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
66 66 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
clamav-devel/clamd/Makefile.in
History View file @ 099cf13
... ... 
@@ -112,7 +112,6 @@ ETAGS = etags
112 112 
 CTAGS = ctags
113 113 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
114 114 
 ACLOCAL = @ACLOCAL@
115 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
116 115 
 AMDEP_FALSE = @AMDEP_FALSE@
117 116 
 AMDEP_TRUE = @AMDEP_TRUE@
118 117 
 AMTAR = @AMTAR@
... ... 
@@ -162,7 +161,7 @@ LDFLAGS = @LDFLAGS@
162 162 
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
163 163 
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
164 164 
 LIBOBJS = @LIBOBJS@
165 
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @ADDITIONAL_LIBS@
165 
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
166 166 
 LIBTOOL = @LIBTOOL@
167 167 
 LN_S = @LN_S@
168 168 
 LTLIBOBJS = @LTLIBOBJS@
... ... 
@@ -182,6 +181,7 @@ RANLIB = @RANLIB@
182 182 
 SET_MAKE = @SET_MAKE@
183 183 
 SHELL = @SHELL@
184 184 
 STRIP = @STRIP@
185 
+THREAD_LIBS = @THREAD_LIBS@
185 186 
 TH_SAFE = @TH_SAFE@
186 187 
 VERSION = @VERSION@
187 188 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/clamdscan/Makefile.am
History View file @ 099cf13
... ... 
@@ -40,6 +40,5 @@ clamdscan_SOURCES = \
40 40
41 41 
 endif
42 42
43 
-DEFS = @DEFS@ -DCL_NOTHREADS
44 43 
 INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
45 
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
44 
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
clamav-devel/clamdscan/Makefile.in
History View file @ 099cf13
... ... 
@@ -101,7 +101,6 @@ ETAGS = etags
101 101 
 CTAGS = ctags
102 102 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
103 103 
 ACLOCAL = @ACLOCAL@
104 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
105 104 
 AMDEP_FALSE = @AMDEP_FALSE@
106 105 
 AMDEP_TRUE = @AMDEP_TRUE@
107 106 
 AMTAR = @AMTAR@
... ... 
@@ -128,7 +127,7 @@ CXXDEPMODE = @CXXDEPMODE@
128 128 
 CXXFLAGS = @CXXFLAGS@
129 129 
 CYGPATH_W = @CYGPATH_W@
130 130 
 DBDIR = @DBDIR@
131 
-DEFS = @DEFS@ -DCL_NOTHREADS
131 
+DEFS = @DEFS@
132 132 
 DEPDIR = @DEPDIR@
133 133 
 ECHO = @ECHO@
134 134 
 ECHO_C = @ECHO_C@
... ... 
@@ -151,7 +150,7 @@ LDFLAGS = @LDFLAGS@
151 151 
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
152 152 
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
153 153 
 LIBOBJS = @LIBOBJS@
154 
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
154 
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
155 155 
 LIBTOOL = @LIBTOOL@
156 156 
 LN_S = @LN_S@
157 157 
 LTLIBOBJS = @LTLIBOBJS@
... ... 
@@ -171,6 +170,7 @@ RANLIB = @RANLIB@
171 171 
 SET_MAKE = @SET_MAKE@
172 172 
 SHELL = @SHELL@
173 173 
 STRIP = @STRIP@
174 
+THREAD_LIBS = @THREAD_LIBS@
174 175 
 TH_SAFE = @TH_SAFE@
175 176 
 VERSION = @VERSION@
176 177 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/clamscan/Makefile.am
History View file @ 099cf13
... ... 
@@ -42,6 +42,5 @@ clamscan_SOURCES = \
42 42 
     treewalk.c \
43 43 
     treewalk.h
44 44
45 
-DEFS = @DEFS@ -DCL_NOTHREADS
46 
-LIBS = $(top_builddir)/libclamav/libclamav.la @ADDITIONAL_LIBS@
45 
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
47 46 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
clamav-devel/clamscan/Makefile.in
History View file @ 099cf13
... ... 
@@ -93,7 +93,6 @@ ETAGS = etags
93 93 
 CTAGS = ctags
94 94 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
95 95 
 ACLOCAL = @ACLOCAL@
96 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
97 96 
 AMDEP_FALSE = @AMDEP_FALSE@
98 97 
 AMDEP_TRUE = @AMDEP_TRUE@
99 98 
 AMTAR = @AMTAR@
... ... 
@@ -120,7 +119,7 @@ CXXDEPMODE = @CXXDEPMODE@
120 120 
 CXXFLAGS = @CXXFLAGS@
121 121 
 CYGPATH_W = @CYGPATH_W@
122 122 
 DBDIR = @DBDIR@
123 
-DEFS = @DEFS@ -DCL_NOTHREADS
123 
+DEFS = @DEFS@
124 124 
 DEPDIR = @DEPDIR@
125 125 
 ECHO = @ECHO@
126 126 
 ECHO_C = @ECHO_C@
... ... 
@@ -143,7 +142,7 @@ LDFLAGS = @LDFLAGS@
143 143 
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
144 144 
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
145 145 
 LIBOBJS = @LIBOBJS@
146 
-LIBS = $(top_builddir)/libclamav/libclamav.la @ADDITIONAL_LIBS@
146 
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
147 147 
 LIBTOOL = @LIBTOOL@
148 148 
 LN_S = @LN_S@
149 149 
 LTLIBOBJS = @LTLIBOBJS@
... ... 
@@ -163,6 +162,7 @@ RANLIB = @RANLIB@
163 163 
 SET_MAKE = @SET_MAKE@
164 164 
 SHELL = @SHELL@
165 165 
 STRIP = @STRIP@
166 
+THREAD_LIBS = @THREAD_LIBS@
166 167 
 TH_SAFE = @TH_SAFE@
167 168 
 VERSION = @VERSION@
168 169 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/configure
History View file @ 099cf13
... ... 
@@ -883,7 +883,7 @@ CLAMD_LIBS
883 883 
 CLAMAV_MILTER_LIBS
884 884 
 FRESHCLAM_LIBS
885 885 
 TH_SAFE
886 
-ADDITIONAL_LIBS
886 
+THREAD_LIBS
887 887 
 BUILD_CLAMD_TRUE
888 888 
 BUILD_CLAMD_FALSE
889 889 
 HAVE_MILTER_TRUE
... ... 
@@ -23023,7 +23023,7 @@ cat >>confdefs.h <<\_ACEOF
23023 23023 
 _ACEOF
23024 23024
23025 23025 
     if test "$have_pthreads" = "yes"; then
23026 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23026 
+	THREAD_LIBS="-lpthread"
23027 23027 
 	TH_SAFE="-thread-safe"
23028 23028
23029 23029 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23035,8 +23035,6 @@ cat >>confdefs.h <<\_ACEOF
23035 23035 
 #define _REENTRANT 1
23036 23036 
 _ACEOF
23037 23037
23038 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
23039 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
23040 23038 
 	if test "$want_clamuko" = "yes"; then
23041 23039
23042 23040 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23044,7 +23042,6 @@ cat >>confdefs.h <<\_ACEOF
23044 23044 
 _ACEOF
23045 23045
23046 23046 
 	fi
23047 
-	CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
23048 23047 
     fi
23049 23048 
     case `uname -r` in
23050 23049 
     1.*|2.0.*)
... ... 
@@ -23063,7 +23060,7 @@ cat >>confdefs.h <<\_ACEOF
23063 23063 
 _ACEOF
23064 23064
23065 23065 
     if test "$have_pthreads" = "yes"; then
23066 
-       LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23066 
+       THREAD_LIBS="-lpthread"
23067 23067 
        TH_SAFE="-thread-safe"
23068 23068
23069 23069 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23075,8 +23072,6 @@ cat >>confdefs.h <<\_ACEOF
23075 23075 
 #define _REENTRANT 1
23076 23076 
 _ACEOF
23077 23077
23078 
-       CLAMD_LIBS="$CLAMD_LIBS -lpthread"
23079 
-       CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
23080 23078 
        if test "$want_clamuko" = "yes"; then
23081 23079
23082 23080 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23084,7 +23079,6 @@ cat >>confdefs.h <<\_ACEOF
23084 23084 
 _ACEOF
23085 23085
23086 23086 
        fi
23087 
-       CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
23088 23087 
     fi
23089 23088 
     ;;
23090 23089 
 cygwin*)
... ... 
@@ -23099,7 +23093,7 @@ _ACEOF
23099 23099 
 	fi
23100 23100 
     fi
23101 23101 
     if test "$have_pthreads" = "yes"; then
23102 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23102 
+	THREAD_LIBS="-lpthread"
23103 23103 
 	TH_SAFE="-thread-safe"
23104 23104
23105 23105 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23117,9 +23111,9 @@ _ACEOF
23117 23117 
 solaris*)
23118 23118 
     FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
23119 23119 
     if test "$have_pthreads" = "yes"; then
23120 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23121 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread -lresolv"
23122 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lresolv"
23120 
+	THREAD_LIBS="-lpthread"
23121 
+	CLAMD_LIBS="$CLAMD_LIBS -lresolv"
23122 
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
23123 23123 
 	TH_SAFE="-thread-safe"
23124 23124
23125 23125 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23140,9 +23134,7 @@ _ACEOF
23140 23140 
     ;;
23141 23141 
 freebsd*)
23142 23142 
     if test "$have_pthreads" = "yes"; then
23143 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
23144 
-	CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
23145 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
23143 
+	THREAD_LIBS="-lpthread -lc_r"
23146 23144 
 	TH_SAFE="-thread-safe"
23147 23145
23148 23146 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23171,9 +23163,7 @@ _ACEOF
23171 23171 
     ;;
23172 23172 
 dragonfly*)
23173 23173 
     if test "$have_pthreads" = "yes"; then
23174 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
23175 
-	CLAMD_LIBS="$CLAMD_LIBS -pthread"
23176 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
23174 
+	THREAD_LIBS="-pthread"
23177 23175 
 	TH_SAFE="-thread-safe"
23178 23176
23179 23177 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23202,13 +23192,10 @@ _ACEOF
23202 23202 
     ;;
23203 23203 
 openbsd*)
23204 23204 
     if test "$have_pthreads" = "yes"; then
23205 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
23206 23205 
 	if test "$use_cr" = "no"; then
23207 
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread"
23208 
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
23206 
+	    THREAD_LIBS="-pthread"
23209 23207 
 	else
23210 
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
23211 
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
23208 
+	    THREAD_LIBS="-pthread -lc_r"
23212 23209 
 	fi
23213 23210 
 	TH_SAFE="-thread-safe"
23214 23211
... ... 
@@ -23231,9 +23218,7 @@ _ACEOF
23231 23231 
     ;;
23232 23232 
 bsdi*)
23233 23233 
     if test "$have_pthreads" = "yes"; then
23234 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
23235 
-	CLAMD_LIBS="$CLAMD_LIBS -pthread"
23236 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
23234 
+	THREAD_LIBS="-pthread"
23237 23235 
 	TH_SAFE="-thread-safe"
23238 23236
23239 23237 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23255,9 +23240,7 @@ _ACEOF
23255 23255 
     ;;
23256 23256 
 netbsd*)
23257 23257 
      if test "$have_pthreads" = "yes"; then
23258 
- 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23259 
- 	CLAMD_LIBS="-lpthread"
23260 
- 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
23258 
+	THREAD_LIBS="-lpthread"
23261 23259
23262 23260 
 cat >>confdefs.h <<\_ACEOF
23263 23261 
 #define CL_THREAD_SAFE 1
... ... 
@@ -23268,7 +23251,6 @@ cat >>confdefs.h <<\_ACEOF
23268 23268 
 #define _REENTRANT 1
23269 23269 
 _ACEOF
23270 23270
23271 
-	ADDITIONAL_LIBS="$LIBS -lpthread"
23272 23271 
      fi
23273 23272
23274 23273 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23322,9 +23304,7 @@ os2*)
23322 23322 
     CLAMD_LIBS="$CLAMD_LIBS -lsyslog"
23323 23323 
     CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsyslog"
23324 23324 
     if test "$have_pthreads" = "yes"; then
23325 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23326 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
23327 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
23325 
+	THREAD_LIBS="-lpthread"
23328 23326 
 	TH_SAFE="-thread-safe"
23329 23327
23330 23328 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23347,9 +23327,7 @@ sco*)
23347 23347 
                     ;;
23348 23348 
 hpux*)
23349 23349 
     if test "$have_pthreads" = "yes"; then
23350 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23351 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
23352 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
23350 
+	THREAD_LIBS="-lpthread"
23353 23351 
 	TH_SAFE="-thread-safe"
23354 23352
23355 23353 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23370,9 +23348,7 @@ _ACEOF
23370 23370 
     ;;
23371 23371 
 aix*)
23372 23372 
     if test "$have_pthreads" = "yes"; then
23373 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23374 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
23375 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
23373 
+	THREAD_LIBS="-lpthread"
23376 23374 
 	TH_SAFE="-thread-safe"
23377 23375
23378 23376 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23412,9 +23388,7 @@ _ACEOF
23412 23412 
     ;;
23413 23413 
 irix*)
23414 23414 
     if test "$have_pthreads" = "yes"; then
23415 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23416 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
23417 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
23415 
+	THREAD_LIBS="-lpthread"
23418 23416 
 	TH_SAFE="-thread-safe"
23419 23417
23420 23418 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -23445,7 +23419,7 @@ _ACEOF
23445 23445 
 	fi
23446 23446 
     fi
23447 23447 
     if test "$have_pthreads" = "yes"; then
23448 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
23448 
+	THREAD_LIBS="-lpthread"
23449 23449 
 	TH_SAFE="-thread-safe"
23450 23450
23451 23451 
 cat >>confdefs.h <<\_ACEOF
... ... 
@@ -26674,7 +26648,7 @@ CLAMD_LIBS!$CLAMD_LIBS$ac_delim
26674 26674 
 CLAMAV_MILTER_LIBS!$CLAMAV_MILTER_LIBS$ac_delim
26675 26675 
 FRESHCLAM_LIBS!$FRESHCLAM_LIBS$ac_delim
26676 26676 
 TH_SAFE!$TH_SAFE$ac_delim
26677 
-ADDITIONAL_LIBS!$ADDITIONAL_LIBS$ac_delim
26677 
+THREAD_LIBS!$THREAD_LIBS$ac_delim
26678 26678 
 BUILD_CLAMD_TRUE!$BUILD_CLAMD_TRUE$ac_delim
26679 26679 
 BUILD_CLAMD_FALSE!$BUILD_CLAMD_FALSE$ac_delim
26680 26680 
 HAVE_MILTER_TRUE!$HAVE_MILTER_TRUE$ac_delim
clamav-devel/configure.in
History View file @ 099cf13
... ... 
@@ -391,16 +391,13 @@ case "$target_os" in
391 391 
 linux*)
392 392 
     AC_DEFINE(C_LINUX,1,[target is linux])
393 393 
     if test "$have_pthreads" = "yes"; then
394 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
394 
+	THREAD_LIBS="-lpthread"
395 395 
 	TH_SAFE="-thread-safe"
396 396 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
397 397 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
398 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
399 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
400 398 
 	if test "$want_clamuko" = "yes"; then
401 399 
 	    AC_DEFINE(CLAMUKO,1,[enable clamuko])
402 400 
 	fi
403 
-	CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
404 401 
     fi
405 402 
     case `uname -r` in
406 403 
     1.*|2.0.*)
... ... 
@@ -411,16 +408,13 @@ linux*)
411 411 
 kfreebsd*-gnu)
412 412 
     AC_DEFINE(C_KFREEBSD_GNU,1,[target is kfreebsd-gnu])
413 413 
     if test "$have_pthreads" = "yes"; then
414 
-       LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
414 
+       THREAD_LIBS="-lpthread"
415 415 
        TH_SAFE="-thread-safe"
416 416 
        AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
417 417 
        AC_DEFINE(_REENTRANT,1,[thread safe])
418 
-       CLAMD_LIBS="$CLAMD_LIBS -lpthread"
419 
-       CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
420 418 
        if test "$want_clamuko" = "yes"; then
421 419 
            AC_DEFINE(CLAMUKO,1,[enable clamuko])
422 420 
        fi
423 
-       CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
424 421 
     fi
425 422 
     ;;
426 423 
 cygwin*)
... ... 
@@ -431,7 +425,7 @@ cygwin*)
431 431 
 	fi
432 432 
     fi
433 433 
     if test "$have_pthreads" = "yes"; then
434 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
434 
+	THREAD_LIBS="-lpthread"
435 435 
 	TH_SAFE="-thread-safe"
436 436 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
437 437 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -441,9 +435,9 @@ cygwin*)
441 441 
 solaris*)
442 442 
     FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
443 443 
     if test "$have_pthreads" = "yes"; then
444 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
445 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread -lresolv"
446 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lresolv"
444 
+	THREAD_LIBS="-lpthread"
445 
+	CLAMD_LIBS="$CLAMD_LIBS -lresolv"
446 
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
447 447 
 	TH_SAFE="-thread-safe"
448 448 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
449 449 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -452,9 +446,7 @@ solaris*)
452 452 
     ;;
453 453 
 freebsd*)
454 454 
     if test "$have_pthreads" = "yes"; then
455 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
456 
-	CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
457 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
455 
+	THREAD_LIBS="-lpthread -lc_r"
458 456 
 	TH_SAFE="-thread-safe"
459 457 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
460 458 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -467,9 +459,7 @@ freebsd*)
467 467 
     ;;
468 468 
 dragonfly*)
469 469 
     if test "$have_pthreads" = "yes"; then
470 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
471 
-	CLAMD_LIBS="$CLAMD_LIBS -pthread"
472 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
470 
+	THREAD_LIBS="-pthread"
473 471 
 	TH_SAFE="-thread-safe"
474 472 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
475 473 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -482,13 +472,10 @@ dragonfly*)
482 482 
     ;;
483 483 
 openbsd*)
484 484 
     if test "$have_pthreads" = "yes"; then
485 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
486 485 
 	if test "$use_cr" = "no"; then
487 
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread"
488 
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
486 
+	    THREAD_LIBS="-pthread"
489 487 
 	else
490 
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
491 
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
488 
+	    THREAD_LIBS="-pthread -lc_r"
492 489 
 	fi
493 490 
 	TH_SAFE="-thread-safe"
494 491 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
... ... 
@@ -499,9 +486,7 @@ openbsd*)
499 499 
     ;;
500 500 
 bsdi*)
501 501 
     if test "$have_pthreads" = "yes"; then
502 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
503 
-	CLAMD_LIBS="$CLAMD_LIBS -pthread"
504 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
502 
+	THREAD_LIBS="-pthread"
505 503 
 	TH_SAFE="-thread-safe"
506 504 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
507 505 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -511,12 +496,9 @@ bsdi*)
511 511 
     ;;
512 512 
 netbsd*)
513 513 
      if test "$have_pthreads" = "yes"; then
514 
- 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
515 
- 	CLAMD_LIBS="-lpthread"
516 
- 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
514 
+	THREAD_LIBS="-lpthread"
517 515 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
518 516 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
519 
-	ADDITIONAL_LIBS="$LIBS -lpthread"
520 517 
      fi
521 518 
     AC_DEFINE(C_BSD,1,[os is NetBSD])
522 519 
     use_gethostbyname_r="no"
... ... 
@@ -544,9 +526,7 @@ os2*)
544 544 
     CLAMD_LIBS="$CLAMD_LIBS -lsyslog"
545 545 
     CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsyslog"
546 546 
     if test "$have_pthreads" = "yes"; then
547 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
548 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
549 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
547 
+	THREAD_LIBS="-lpthread"
550 548 
 	TH_SAFE="-thread-safe"
551 549 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
552 550 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -561,9 +541,7 @@ sco*)
561 561 
     ;;
562 562 
 hpux*)
563 563 
     if test "$have_pthreads" = "yes"; then
564 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
565 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
566 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
564 
+	THREAD_LIBS="-lpthread"
567 565 
 	TH_SAFE="-thread-safe"
568 566 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
569 567 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -572,9 +550,7 @@ hpux*)
572 572 
     ;;
573 573 
 aix*)
574 574 
     if test "$have_pthreads" = "yes"; then
575 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
576 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
577 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
575 
+	THREAD_LIBS="-lpthread"
578 576 
 	TH_SAFE="-thread-safe"
579 577 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
580 578 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -590,9 +566,7 @@ nto-qnx*)
590 590 
     ;;
591 591 
 irix*)
592 592 
     if test "$have_pthreads" = "yes"; then
593 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
594 
-	CLAMD_LIBS="$CLAMD_LIBS -lpthread"
595 
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
593 
+	THREAD_LIBS="-lpthread"
596 594 
 	TH_SAFE="-thread-safe"
597 595 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
598 596 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -607,7 +581,7 @@ interix*)
607 607 
 	fi
608 608 
     fi
609 609 
     if test "$have_pthreads" = "yes"; then
610 
-	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
610 
+	THREAD_LIBS="-lpthread"
611 611 
 	TH_SAFE="-thread-safe"
612 612 
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
613 613 
 	AC_DEFINE(_REENTRANT,1,[thread safe])
... ... 
@@ -622,7 +596,7 @@ AC_SUBST(CLAMD_LIBS)
622 622 
 AC_SUBST(CLAMAV_MILTER_LIBS)
623 623 
 AC_SUBST(FRESHCLAM_LIBS)
624 624 
 AC_SUBST(TH_SAFE)
625 
-AC_SUBST(ADDITIONAL_LIBS)
625 
+AC_SUBST(THREAD_LIBS)
626 626
627 627 
 dnl --enable-milter
628 628 
 if test "$have_milter" = "yes"; then
clamav-devel/database/Makefile.in
History View file @ 099cf13
... ... 
@@ -70,7 +70,6 @@ SOURCES =
70 70 
 DIST_SOURCES =
71 71 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
72 72 
 ACLOCAL = @ACLOCAL@
73 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
74 73 
 AMDEP_FALSE = @AMDEP_FALSE@
75 74 
 AMDEP_TRUE = @AMDEP_TRUE@
76 75 
 AMTAR = @AMTAR@
... ... 
@@ -140,6 +139,7 @@ RANLIB = @RANLIB@
140 140 
 SET_MAKE = @SET_MAKE@
141 141 
 SHELL = @SHELL@
142 142 
 STRIP = @STRIP@
143 
+THREAD_LIBS = @THREAD_LIBS@
143 144 
 TH_SAFE = @TH_SAFE@
144 145 
 VERSION = @VERSION@
145 146 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/docs/Makefile.in
History View file @ 099cf13
... ... 
@@ -75,7 +75,6 @@ NROFF = nroff
75 75 
 MANS = $(man_MANS)
76 76 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
77 77 
 ACLOCAL = @ACLOCAL@
78 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
79 78 
 AMDEP_FALSE = @AMDEP_FALSE@
80 79 
 AMDEP_TRUE = @AMDEP_TRUE@
81 80 
 AMTAR = @AMTAR@
... ... 
@@ -145,6 +144,7 @@ RANLIB = @RANLIB@
145 145 
 SET_MAKE = @SET_MAKE@
146 146 
 SHELL = @SHELL@
147 147 
 STRIP = @STRIP@
148 
+THREAD_LIBS = @THREAD_LIBS@
148 149 
 TH_SAFE = @TH_SAFE@
149 150 
 VERSION = @VERSION@
150 151 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/etc/Makefile.in
History View file @ 099cf13
... ... 
@@ -68,7 +68,6 @@ SOURCES =
68 68 
 DIST_SOURCES =
69 69 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
70 70 
 ACLOCAL = @ACLOCAL@
71 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
72 71 
 AMDEP_FALSE = @AMDEP_FALSE@
73 72 
 AMDEP_TRUE = @AMDEP_TRUE@
74 73 
 AMTAR = @AMTAR@
... ... 
@@ -138,6 +137,7 @@ RANLIB = @RANLIB@
138 138 
 SET_MAKE = @SET_MAKE@
139 139 
 SHELL = @SHELL@
140 140 
 STRIP = @STRIP@
141 
+THREAD_LIBS = @THREAD_LIBS@
141 142 
 TH_SAFE = @TH_SAFE@
142 143 
 VERSION = @VERSION@
143 144 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/freshclam/Makefile.am
History View file @ 099cf13
... ... 
@@ -50,4 +50,4 @@ freshclam_SOURCES = \
50 50
51 51 
 DEFS = @DEFS@ -DCL_NOTHREADS
52 52 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
53 
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
53 
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
clamav-devel/freshclam/Makefile.in
History View file @ 099cf13
... ... 
@@ -94,7 +94,6 @@ ETAGS = etags
94 94 
 CTAGS = ctags
95 95 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
96 96 
 ACLOCAL = @ACLOCAL@
97 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
98 97 
 AMDEP_FALSE = @AMDEP_FALSE@
99 98 
 AMDEP_TRUE = @AMDEP_TRUE@
100 99 
 AMTAR = @AMTAR@
... ... 
@@ -144,7 +143,7 @@ LDFLAGS = @LDFLAGS@
144 144 
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
145 145 
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
146 146 
 LIBOBJS = @LIBOBJS@
147 
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
147 
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
148 148 
 LIBTOOL = @LIBTOOL@
149 149 
 LN_S = @LN_S@
150 150 
 LTLIBOBJS = @LTLIBOBJS@
... ... 
@@ -164,6 +163,7 @@ RANLIB = @RANLIB@
164 164 
 SET_MAKE = @SET_MAKE@
165 165 
 SHELL = @SHELL@
166 166 
 STRIP = @STRIP@
167 
+THREAD_LIBS = @THREAD_LIBS@
167 168 
 TH_SAFE = @TH_SAFE@
168 169 
 VERSION = @VERSION@
169 170 
 ac_ct_CC = @ac_ct_CC@
clamav-devel/libclamav/Makefile.am
History View file @ 099cf13
... ... 
@@ -19,7 +19,7 @@
19 19
20 20 
 INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar
21 21
22 
-libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
22 
+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@
23 23
24 24 
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
25 25
clamav-devel/libclamav/Makefile.in
History View file @ 099cf13
... ... 
@@ -110,7 +110,6 @@ ETAGS = etags
110 110 
 CTAGS = ctags
111 111 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
112 112 
 ACLOCAL = @ACLOCAL@
113 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
114 113 
 AMDEP_FALSE = @AMDEP_FALSE@
115 114 
 AMDEP_TRUE = @AMDEP_TRUE@
116 115 
 AMTAR = @AMTAR@
... ... 
@@ -180,6 +179,7 @@ RANLIB = @RANLIB@
180 180 
 SET_MAKE = @SET_MAKE@
181 181 
 SHELL = @SHELL@
182 182 
 STRIP = @STRIP@
183 
+THREAD_LIBS = @THREAD_LIBS@
183 184 
 TH_SAFE = @TH_SAFE@
184 185 
 VERSION = @VERSION@
185 186 
 ac_ct_CC = @ac_ct_CC@
... ... 
@@ -235,7 +235,7 @@ target_cpu = @target_cpu@
235 235 
 target_os = @target_os@
236 236 
 target_vendor = @target_vendor@
237 237 
 INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar
238 
-libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
238 
+libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@
239 239 
 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
240 240 
 include_HEADERS = clamav.h
241 241 
 libclamav_la_SOURCES = \
clamav-devel/sigtool/Makefile.am
History View file @ 099cf13
... ... 
@@ -41,4 +41,4 @@ sigtool_SOURCES = \
41 41
42 42 
 DEFS = @DEFS@ -DCL_NOTHREADS
43 43 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
44 
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
44 
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
clamav-devel/sigtool/Makefile.in
History View file @ 099cf13
... ... 
@@ -92,7 +92,6 @@ ETAGS = etags
92 92 
 CTAGS = ctags
93 93 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
94 94 
 ACLOCAL = @ACLOCAL@
95 
-ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
96 95 
 AMDEP_FALSE = @AMDEP_FALSE@
97 96 
 AMDEP_TRUE = @AMDEP_TRUE@
98 97 
 AMTAR = @AMTAR@
... ... 
@@ -144,7 +143,7 @@ LDFLAGS = @LDFLAGS@
144 144 
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
145 145 
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
146 146 
 LIBOBJS = @LIBOBJS@
147 
-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
147 
+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
148 148 
 LIBTOOL = @LIBTOOL@
149 149 
 LN_S = @LN_S@
150 150 
 LTLIBOBJS = @LTLIBOBJS@
... ... 
@@ -164,6 +163,7 @@ RANLIB = @RANLIB@
164 164 
 SET_MAKE = @SET_MAKE@
165 165 
 SHELL = @SHELL@
166 166 
 STRIP = @STRIP@
167 
+THREAD_LIBS = @THREAD_LIBS@
167 168 
 TH_SAFE = @TH_SAFE@
168 169 
 VERSION = @VERSION@
169 170 
 ac_ct_CC = @ac_ct_CC@