Browse code

-lcheck needs to be conditional, use @LCHECK@. Regenerate Makefiles.

git-svn: trunk@3774

Török Edvin authored on 2008/04/08 21:57:55
Showing 20 changed files
... ...
@@ -157,6 +157,7 @@ INSTALL_DATA = @INSTALL_DATA@
157 157
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
158 158
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
159 159
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
160
+LCHECK = @LCHECK@
160 161
 LDFLAGS = @LDFLAGS@
161 162
 LIBBZ2 = @LIBBZ2@
162 163
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -139,6 +139,7 @@ INSTALL_DATA = @INSTALL_DATA@
139 139
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
140 140
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
141 141
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
142
+LCHECK = @LCHECK@
142 143
 LDFLAGS = @LDFLAGS@
143 144
 LIBBZ2 = @LIBBZ2@
144 145
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -124,6 +124,7 @@ INSTALL_DATA = @INSTALL_DATA@
124 124
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
125 125
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
126 126
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
127
+LCHECK = @LCHECK@
127 128
 LDFLAGS = @LDFLAGS@
128 129
 LIBBZ2 = @LIBBZ2@
129 130
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -144,6 +144,7 @@ INSTALL_DATA = @INSTALL_DATA@
144 144
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
145 145
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
146 146
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
147
+LCHECK = @LCHECK@
147 148
 LDFLAGS = @LDFLAGS@
148 149
 LIBBZ2 = @LIBBZ2@
149 150
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -133,6 +133,7 @@ INSTALL_DATA = @INSTALL_DATA@
133 133
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
134 134
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
135 135
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
136
+LCHECK = @LCHECK@
136 137
 LDFLAGS = @LDFLAGS@
137 138
 LIBBZ2 = @LIBBZ2@
138 139
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -127,6 +127,7 @@ INSTALL_DATA = @INSTALL_DATA@
127 127
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
128 128
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
129 129
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
130
+LCHECK = @LCHECK@
130 131
 LDFLAGS = @LDFLAGS@
131 132
 LIBBZ2 = @LIBBZ2@
132 133
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -867,6 +867,7 @@ LIBTOOL
867 867
 VERSIONSCRIPTFLAG
868 868
 VERSIONSCRIPT_TRUE
869 869
 VERSIONSCRIPT_FALSE
870
+LCHECK
870 871
 MAINTAINER_MODE_TRUE
871 872
 MAINTAINER_MODE_FALSE
872 873
 MAINT
... ...
@@ -4765,7 +4766,7 @@ ia64-*-hpux*)
4765 4765
   ;;
4766 4766
 *-*-irix6*)
4767 4767
   # Find out which ABI we are using.
4768
-  echo '#line 4768 "configure"' > conftest.$ac_ext
4768
+  echo '#line 4769 "configure"' > conftest.$ac_ext
4769 4769
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4770 4770
   (eval $ac_compile) 2>&5
4771 4771
   ac_status=$?
... ...
@@ -6855,11 +6856,11 @@ else
6855 6855
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6856 6856
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6857 6857
    -e 's:$: $lt_compiler_flag:'`
6858
-   (eval echo "\"\$as_me:6858: $lt_compile\"" >&5)
6858
+   (eval echo "\"\$as_me:6859: $lt_compile\"" >&5)
6859 6859
    (eval "$lt_compile" 2>conftest.err)
6860 6860
    ac_status=$?
6861 6861
    cat conftest.err >&5
6862
-   echo "$as_me:6862: \$? = $ac_status" >&5
6862
+   echo "$as_me:6863: \$? = $ac_status" >&5
6863 6863
    if (exit $ac_status) && test -s "$ac_outfile"; then
6864 6864
      # The compiler can only warn and ignore the option if not recognized
6865 6865
      # So say no if there are warnings other than the usual output.
... ...
@@ -7145,11 +7146,11 @@ else
7145 7145
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7146 7146
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7147 7147
    -e 's:$: $lt_compiler_flag:'`
7148
-   (eval echo "\"\$as_me:7148: $lt_compile\"" >&5)
7148
+   (eval echo "\"\$as_me:7149: $lt_compile\"" >&5)
7149 7149
    (eval "$lt_compile" 2>conftest.err)
7150 7150
    ac_status=$?
7151 7151
    cat conftest.err >&5
7152
-   echo "$as_me:7152: \$? = $ac_status" >&5
7152
+   echo "$as_me:7153: \$? = $ac_status" >&5
7153 7153
    if (exit $ac_status) && test -s "$ac_outfile"; then
7154 7154
      # The compiler can only warn and ignore the option if not recognized
7155 7155
      # So say no if there are warnings other than the usual output.
... ...
@@ -7249,11 +7250,11 @@ else
7249 7249
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7250 7250
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7251 7251
    -e 's:$: $lt_compiler_flag:'`
7252
-   (eval echo "\"\$as_me:7252: $lt_compile\"" >&5)
7252
+   (eval echo "\"\$as_me:7253: $lt_compile\"" >&5)
7253 7253
    (eval "$lt_compile" 2>out/conftest.err)
7254 7254
    ac_status=$?
7255 7255
    cat out/conftest.err >&5
7256
-   echo "$as_me:7256: \$? = $ac_status" >&5
7256
+   echo "$as_me:7257: \$? = $ac_status" >&5
7257 7257
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
7258 7258
    then
7259 7259
      # The compiler can only warn and ignore the option if not recognized
... ...
@@ -9626,7 +9627,7 @@ else
9626 9626
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9627 9627
   lt_status=$lt_dlunknown
9628 9628
   cat > conftest.$ac_ext <<EOF
9629
-#line 9629 "configure"
9629
+#line 9630 "configure"
9630 9630
 #include "confdefs.h"
9631 9631
 
9632 9632
 #if HAVE_DLFCN_H
... ...
@@ -9726,7 +9727,7 @@ else
9726 9726
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9727 9727
   lt_status=$lt_dlunknown
9728 9728
   cat > conftest.$ac_ext <<EOF
9729
-#line 9729 "configure"
9729
+#line 9730 "configure"
9730 9730
 #include "confdefs.h"
9731 9731
 
9732 9732
 #if HAVE_DLFCN_H
... ...
@@ -13256,7 +13257,7 @@ fi
13256 13256
 { echo "$as_me:$LINENO: result: $ac_cv_lib_check_srunner_create" >&5
13257 13257
 echo "${ECHO_T}$ac_cv_lib_check_srunner_create" >&6; }
13258 13258
 if test $ac_cv_lib_check_srunner_create = yes; then
13259
-  LCHECK="yes"
13259
+  LCHECK="-lcheck"
13260 13260
 else
13261 13261
   LCHECK="no"
13262 13262
 fi
... ...
@@ -13269,6 +13270,8 @@ if test "$LCHECK" = "no"; then
13269 13269
     exit 1
13270 13270
 fi
13271 13271
 
13272
+
13273
+
13272 13274
 have_pthreads=no
13273 13275
 if test "${ac_cv_header_pthread_h+set}" = set; then
13274 13276
   { echo "$as_me:$LINENO: checking for pthread.h" >&5
... ...
@@ -19466,6 +19469,7 @@ LIBTOOL!$LIBTOOL$ac_delim
19466 19466
 VERSIONSCRIPTFLAG!$VERSIONSCRIPTFLAG$ac_delim
19467 19467
 VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim
19468 19468
 VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim
19469
+LCHECK!$LCHECK$ac_delim
19469 19470
 MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
19470 19471
 MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
19471 19472
 MAINT!$MAINT$ac_delim
... ...
@@ -19498,7 +19502,7 @@ LIBOBJS!$LIBOBJS$ac_delim
19498 19498
 LTLIBOBJS!$LTLIBOBJS$ac_delim
19499 19499
 _ACEOF
19500 19500
 
19501
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
19501
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
19502 19502
     break
19503 19503
   elif $ac_last_try; then
19504 19504
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
... ...
@@ -324,7 +324,7 @@ dnl    CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
324 324
 dnl    LDFLAGS="$LDFLAGS -lgcov"
325 325
     AC_DEFINE([HAVE_CHECK], 1, [Enable 'check' unit tests])
326 326
     AC_CHECK_HEADERS(check.h)
327
-    AC_CHECK_LIB(check, srunner_create, LCHECK="yes", LCHECK="no")
327
+    AC_CHECK_LIB(check, srunner_create, LCHECK="-lcheck", LCHECK="no")
328 328
 fi
329 329
 
330 330
 if test "$LCHECK" = "no"; then
... ...
@@ -333,6 +333,8 @@ if test "$LCHECK" = "no"; then
333 333
     exit 1
334 334
 fi
335 335
 
336
+AC_SUBST(LCHECK)
337
+
336 338
 have_pthreads=no
337 339
 AC_CHECK_HEADER([pthread.h],[have_pthreads=yes],)
338 340
 
... ...
@@ -103,6 +103,7 @@ INSTALL_DATA = @INSTALL_DATA@
103 103
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
104 104
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
105 105
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
106
+LCHECK = @LCHECK@
106 107
 LDFLAGS = @LDFLAGS@
107 108
 LIBBZ2 = @LIBBZ2@
108 109
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -108,6 +108,7 @@ INSTALL_DATA = @INSTALL_DATA@
108 108
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
109 109
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
110 110
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
111
+LCHECK = @LCHECK@
111 112
 LDFLAGS = @LDFLAGS@
112 113
 LIBBZ2 = @LIBBZ2@
113 114
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -101,6 +101,7 @@ INSTALL_DATA = @INSTALL_DATA@
101 101
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
102 102
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
103 103
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
104
+LCHECK = @LCHECK@
104 105
 LDFLAGS = @LDFLAGS@
105 106
 LIBBZ2 = @LIBBZ2@
106 107
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -129,6 +129,7 @@ INSTALL_DATA = @INSTALL_DATA@
129 129
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
130 130
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
131 131
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
132
+LCHECK = @LCHECK@
132 133
 LDFLAGS = @LDFLAGS@
133 134
 LIBBZ2 = @LIBBZ2@
134 135
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -172,6 +172,7 @@ INSTALL_DATA = @INSTALL_DATA@
172 172
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
173 173
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
174 174
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
175
+LCHECK = @LCHECK@
175 176
 LDFLAGS = @LDFLAGS@
176 177
 LIBBZ2 = @LIBBZ2@
177 178
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -121,6 +121,7 @@ INSTALL_DATA = @INSTALL_DATA@
121 121
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
122 122
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
123 123
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
124
+LCHECK = @LCHECK@
124 125
 LDFLAGS = @LDFLAGS@
125 126
 LIBBZ2 = @LIBBZ2@
126 127
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -125,6 +125,7 @@ INSTALL_DATA = @INSTALL_DATA@
125 125
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
126 126
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
127 127
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
128
+LCHECK = @LCHECK@
128 129
 LDFLAGS = @LDFLAGS@
129 130
 LIBBZ2 = @LIBBZ2@
130 131
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -120,6 +120,7 @@ INSTALL_DATA = @INSTALL_DATA@
120 120
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
121 121
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
122 122
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
123
+LCHECK = @LCHECK@
123 124
 LDFLAGS = @LDFLAGS@
124 125
 LIBBZ2 = @LIBBZ2@
125 126
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -128,6 +128,7 @@ INSTALL_DATA = @INSTALL_DATA@
128 128
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
129 129
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
130 130
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
131
+LCHECK = @LCHECK@
131 132
 LDFLAGS = @LDFLAGS@
132 133
 LIBBZ2 = @LIBBZ2@
133 134
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -83,6 +83,7 @@ INSTALL_DATA = @INSTALL_DATA@
83 83
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
84 84
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
85 85
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
86
+LCHECK = @LCHECK@
86 87
 LDFLAGS = @LDFLAGS@
87 88
 LIBBZ2 = @LIBBZ2@
88 89
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -2,4 +2,4 @@ TESTS = check_clamav
2 2
 bin_PROGRAMS = check_clamav
3 3
 check_clamav_SOURCES = check_clamav.c $(top_builddir)/libclamav/clamav.h
4 4
 check_clamav_CFLAGS = 
5
-check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ -lcheck
5
+check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @LCHECK@
... ...
@@ -109,6 +109,7 @@ INSTALL_DATA = @INSTALL_DATA@
109 109
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
110 110
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
111 111
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
112
+LCHECK = @LCHECK@
112 113
 LDFLAGS = @LDFLAGS@
113 114
 LIBBZ2 = @LIBBZ2@
114 115
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
... ...
@@ -200,7 +201,7 @@ top_builddir = @top_builddir@
200 200
 top_srcdir = @top_srcdir@
201 201
 check_clamav_SOURCES = check_clamav.c $(top_builddir)/libclamav/clamav.h
202 202
 check_clamav_CFLAGS = 
203
-check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ -lcheck
203
+check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @LCHECK@
204 204
 all: all-am
205 205
 
206 206
 .SUFFIXES: