Browse code

OpenBSD uses -pthread, we explicitly need to add @THREAD_LIBS@ to linker line. Use LIBS, because LDADD gets confused by -pthread.

git-svn: trunk@3732

Török Edvin authored on 2008/03/21 07:29:12
Showing 2 changed files
... ...
@@ -2,4 +2,4 @@ TESTS = check_clamav
2 2
 bin_PROGRAMS = check_clamav
3 3
 check_clamav_SOURCES = check_clamav.c $(top_builddir)/libclamav/libclamav.h
4 4
 check_clamav_CFLAGS = 
5
-check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la
5
+LIBS =  $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
... ...
@@ -51,7 +51,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
51 51
 PROGRAMS = $(bin_PROGRAMS)
52 52
 am_check_clamav_OBJECTS = check_clamav-check_clamav.$(OBJEXT)
53 53
 check_clamav_OBJECTS = $(am_check_clamav_OBJECTS)
54
-check_clamav_DEPENDENCIES = $(top_builddir)/libclamav/libclamav.la
54
+check_clamav_LDADD = $(LDADD)
55 55
 check_clamav_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
56 56
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_clamav_CFLAGS) \
57 57
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
... ...
@@ -117,7 +117,7 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
117 117
 LIBGMP = @LIBGMP@
118 118
 LIBGMP_PREFIX = @LIBGMP_PREFIX@
119 119
 LIBOBJS = @LIBOBJS@
120
-LIBS = @LIBS@
120
+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
121 121
 LIBTOOL = @LIBTOOL@
122 122
 LN_S = @LN_S@
123 123
 LTLIBBZ2 = @LTLIBBZ2@
... ...
@@ -200,7 +200,6 @@ top_builddir = @top_builddir@
200 200
 top_srcdir = @top_srcdir@
201 201
 check_clamav_SOURCES = check_clamav.c $(top_builddir)/libclamav/libclamav.h
202 202
 check_clamav_CFLAGS = 
203
-check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la
204 203
 all: all-am
205 204
 
206 205
 .SUFFIXES: