Browse code
updating prelude hook to work with allmatch
Mickey Sola authored on 2016/05/25 04:04:51Showing 22 changed files
- Makefile.in
- clamav-milter/Makefile.in
- clambc/Makefile.in
- clamconf/Makefile.in
- clamd/Makefile.in
- clamd/scanner.c
- clamdscan/Makefile.in
- clamdtop/Makefile.in
- clamscan/Makefile.in
- clamsubmit/Makefile.in
- configure
- database/Makefile.in
- docs/Makefile.in
- etc/Makefile.in
- freshclam/Makefile.in
- libclamav/Makefile.in
- libclamav/c++/Makefile.in
- libfreshclam/Makefile.in
- libltdl/Makefile.in
- sigtool/Makefile.in
- test/Makefile.in
- unit_tests/Makefile.in
| ... | ... |
@@ -133,9 +133,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 133 | 133 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 134 | 134 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 135 | 135 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 136 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 137 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 138 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 136 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 137 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 138 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 139 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 139 | 140 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 140 | 141 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 141 | 142 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -108,9 +108,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 108 | 108 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 109 | 109 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 110 | 110 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 111 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 112 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 113 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 112 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 113 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 114 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 114 | 115 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 115 | 116 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 116 | 117 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -88,12 +88,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 88 | 88 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 89 | 89 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 90 | 90 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 91 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 92 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 93 | 91 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 94 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 95 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 96 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 92 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 93 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 94 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 95 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 97 | 96 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 98 | 97 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 99 | 98 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -106,12 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 106 | 106 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 107 | 107 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 108 | 108 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 109 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 110 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 111 | 109 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 112 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 113 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 114 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 110 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 112 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 113 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 115 | 114 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 116 | 115 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 117 | 116 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -108,12 +108,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 108 | 108 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 109 | 109 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 110 | 110 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 111 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 112 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 113 | 111 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 114 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 115 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 116 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 112 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 113 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 114 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 115 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 117 | 116 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 118 | 117 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 119 | 118 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -200,22 +199,16 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \ |
| 200 | 200 |
onaccess_ddd.h onaccess_hash.c onaccess_hash.h onaccess_scth.c \ |
| 201 | 201 |
onaccess_scth.h |
| 202 | 202 |
@BUILD_CLAMD_TRUE@am_clamd_OBJECTS = output.$(OBJEXT) \ |
| 203 |
-@BUILD_CLAMD_TRUE@ optparser.$(OBJEXT) getopt.$(OBJEXT) \ |
|
| 204 |
-@BUILD_CLAMD_TRUE@ misc.$(OBJEXT) clamd.$(OBJEXT) \ |
|
| 205 |
-@BUILD_CLAMD_TRUE@ tcpserver.$(OBJEXT) localserver.$(OBJEXT) \ |
|
| 206 |
-@BUILD_CLAMD_TRUE@ session.$(OBJEXT) thrmgr.$(OBJEXT) \ |
|
| 207 |
-@BUILD_CLAMD_TRUE@ server-th.$(OBJEXT) scanner.$(OBJEXT) \ |
|
| 208 |
-@BUILD_CLAMD_TRUE@ others.$(OBJEXT) onaccess_fan.$(OBJEXT) \ |
|
| 209 |
-@BUILD_CLAMD_TRUE@ onaccess_ddd.$(OBJEXT) \ |
|
| 210 |
-@BUILD_CLAMD_TRUE@ onaccess_hash.$(OBJEXT) \ |
|
| 211 |
-@BUILD_CLAMD_TRUE@ onaccess_scth.$(OBJEXT) |
|
| 212 | 203 |
@BUILD_CLAMD_TRUE@ idmef_logging.$(OBJEXT) optparser.$(OBJEXT) \ |
| 213 | 204 |
@BUILD_CLAMD_TRUE@ getopt.$(OBJEXT) misc.$(OBJEXT) \ |
| 214 | 205 |
@BUILD_CLAMD_TRUE@ clamd.$(OBJEXT) tcpserver.$(OBJEXT) \ |
| 215 | 206 |
@BUILD_CLAMD_TRUE@ localserver.$(OBJEXT) session.$(OBJEXT) \ |
| 216 | 207 |
@BUILD_CLAMD_TRUE@ thrmgr.$(OBJEXT) server-th.$(OBJEXT) \ |
| 217 | 208 |
@BUILD_CLAMD_TRUE@ scanner.$(OBJEXT) others.$(OBJEXT) \ |
| 218 |
-@BUILD_CLAMD_TRUE@ fan.$(OBJEXT) |
|
| 209 |
+@BUILD_CLAMD_TRUE@ onaccess_fan.$(OBJEXT) \ |
|
| 210 |
+@BUILD_CLAMD_TRUE@ onaccess_ddd.$(OBJEXT) \ |
|
| 211 |
+@BUILD_CLAMD_TRUE@ onaccess_hash.$(OBJEXT) \ |
|
| 212 |
+@BUILD_CLAMD_TRUE@ onaccess_scth.$(OBJEXT) |
|
| 219 | 213 |
clamd_OBJECTS = $(am_clamd_OBJECTS) |
| 220 | 214 |
clamd_LDADD = $(LDADD) |
| 221 | 215 |
AM_V_lt = $(am__v_lt_@AM_V@) |
| ... | ... |
@@ -58,8 +58,6 @@ |
| 58 | 58 |
#include "shared/output.h" |
| 59 | 59 |
#include "shared/misc.h" |
| 60 | 60 |
|
| 61 |
-#include "shared/idmef_logging.h" |
|
| 62 |
- |
|
| 63 | 61 |
#include "others.h" |
| 64 | 62 |
#include "scanner.h" |
| 65 | 63 |
#include "shared.h" |
| ... | ... |
@@ -276,38 +274,29 @@ int scan_callback(STATBUF *sb, char *filename, const char *msg, enum cli_ftw_rea |
| 276 | 276 |
} |
| 277 | 277 |
|
| 278 | 278 |
if (ret == CL_VIRUS) {
|
| 279 |
- scandata->infected++; |
|
| 280 |
- if (conn_reply_virus(scandata->conn, filename, virname) == -1) {
|
|
| 281 |
- free(filename); |
|
| 282 |
- if((scandata->options & CL_SCAN_ALLMATCHES) && (virpp != &virname)) |
|
| 283 |
- free((void *)virpp); |
|
| 284 |
- return CL_ETIMEOUT; |
|
| 285 |
- } |
|
| 286 |
- if (scandata->options & CL_SCAN_ALLMATCHES && virpp[1] != NULL) {
|
|
| 287 |
- int i = 1; |
|
| 288 |
- while (NULL != virpp[i]) |
|
| 289 |
- if (conn_reply_virus(scandata->conn, filename, virpp[i++]) == -1) {
|
|
| 290 |
- free(filename); |
|
| 291 |
- if (virpp != &virname) |
|
| 292 |
- free((void *)virpp); |
|
| 293 |
- return CL_ETIMEOUT; |
|
| 294 |
- } |
|
| 295 |
- } |
|
| 296 |
- |
|
| 297 |
- if(optget(scandata->opts, "PreludeEnable")->enabled){
|
|
| 298 |
- prelude_logging(filename, virname, context.virhash, context.virsize); |
|
| 299 |
- } |
|
| 300 |
- |
|
| 301 |
- if(context.virsize && optget(scandata->opts, "ExtendedDetectionInfo")->enabled) |
|
| 302 |
- logg("~%s: %s(%s:%llu) FOUND\n", filename, virname, context.virhash, context.virsize);
|
|
| 303 |
- else |
|
| 304 |
- logg("~%s: %s FOUND\n", filename, virname);
|
|
| 305 |
- virusaction(filename, virname, scandata->opts); |
|
| 306 |
- if (scandata->options & CL_SCAN_ALLMATCHES && virpp[1] != NULL) {
|
|
| 307 |
- int i = 1; |
|
| 308 |
- while (NULL != virpp[i]) |
|
| 309 |
- logg("~%s: %s FOUND\n", filename, virpp[i++]);
|
|
| 310 |
- } |
|
| 279 |
+ scandata->infected++; |
|
| 280 |
+ |
|
| 281 |
+ if (scandata->options & CL_SCAN_ALLMATCHES) {
|
|
| 282 |
+ if(optget(scandata->opts, "PreludeEnable")->enabled){
|
|
| 283 |
+ prelude_logging(filename, virname, context.virhash, context.virsize); |
|
| 284 |
+ } |
|
| 285 |
+ virusaction(filename, virname, scandata->opts); |
|
| 286 |
+ } else {
|
|
| 287 |
+ if (conn_reply_virus(scandata->conn, filename, virname) == -1) {
|
|
| 288 |
+ free(filename); |
|
| 289 |
+ return CL_ETIMEOUT; |
|
| 290 |
+ } |
|
| 291 |
+ |
|
| 292 |
+ if(optget(scandata->opts, "PreludeEnable")->enabled){
|
|
| 293 |
+ prelude_logging(filename, virname, context.virhash, context.virsize); |
|
| 294 |
+ } |
|
| 295 |
+ |
|
| 296 |
+ if(context.virsize && optget(scandata->opts, "ExtendedDetectionInfo")->enabled) |
|
| 297 |
+ logg("~%s: %s(%s:%llu) FOUND\n", filename, virname, context.virhash, context.virsize);
|
|
| 298 |
+ else |
|
| 299 |
+ logg("~%s: %s FOUND\n", filename, virname);
|
|
| 300 |
+ virusaction(filename, virname, scandata->opts); |
|
| 301 |
+ } |
|
| 311 | 302 |
} else if (ret != CL_CLEAN) {
|
| 312 | 303 |
scandata->errors++; |
| 313 | 304 |
if (conn_reply(scandata->conn, filename, cl_strerror(ret), "ERROR") == -1) {
|
| ... | ... |
@@ -106,12 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 106 | 106 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 107 | 107 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 108 | 108 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 109 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 110 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 111 | 109 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 112 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 113 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 114 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 110 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 112 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 113 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 115 | 114 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 116 | 115 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 117 | 116 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -88,12 +88,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 88 | 88 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 89 | 89 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 90 | 90 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 91 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 92 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 93 | 91 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 94 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 95 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 96 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 92 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 93 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 94 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 95 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 97 | 96 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 98 | 97 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 99 | 98 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -107,12 +107,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 107 | 107 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 108 | 108 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 109 | 109 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 110 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 111 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 112 | 110 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 113 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 114 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 115 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 112 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 113 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 114 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 116 | 115 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 117 | 116 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 118 | 117 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -106,12 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 106 | 106 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 107 | 107 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 108 | 108 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 109 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 110 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 111 | 109 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 112 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 113 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 114 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 110 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 112 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 113 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 115 | 114 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 116 | 115 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 117 | 116 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -681,9 +681,6 @@ CLAMSCAN_CPPFLAGS |
| 681 | 681 |
FRESHCLAM_CPPFLAGS |
| 682 | 682 |
CLAMSUBMIT_CFLAGS |
| 683 | 683 |
CLAMSUBMIT_LIBS |
| 684 |
-ENABLE_LIBFRESHCLAM_FALSE |
|
| 685 |
-ENABLE_LIBFRESHCLAM_TRUE |
|
| 686 |
-HAVE_YARA |
|
| 687 | 684 |
LIBPRELUDE_CONFIG_PREFIX |
| 688 | 685 |
LIBPRELUDE_PREFIX |
| 689 | 686 |
LIBPRELUDE_LIBS |
| ... | ... |
@@ -691,6 +688,9 @@ LIBPRELUDE_LDFLAGS |
| 691 | 691 |
LIBPRELUDE_PTHREAD_CFLAGS |
| 692 | 692 |
LIBPRELUDE_CFLAGS |
| 693 | 693 |
LIBPRELUDE_CONFIG |
| 694 |
+ENABLE_LIBFRESHCLAM_FALSE |
|
| 695 |
+ENABLE_LIBFRESHCLAM_TRUE |
|
| 696 |
+HAVE_YARA |
|
| 694 | 697 |
subdirs |
| 695 | 698 |
llvmconfig |
| 696 | 699 |
WERR_CFLAGS_MILTER |
| ... | ... |
@@ -24170,6 +24170,9 @@ fi |
| 24170 | 24170 |
else |
| 24171 | 24171 |
ENABLE_LIBFRESHCLAM_TRUE='#' |
| 24172 | 24172 |
ENABLE_LIBFRESHCLAM_FALSE= |
| 24173 |
+fi |
|
| 24174 |
+ |
|
| 24175 |
+ |
|
| 24173 | 24176 |
|
| 24174 | 24177 |
# PRELUDE |
| 24175 | 24178 |
# Check whether --enable-prelude was given. |
| ... | ... |
@@ -104,12 +104,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 104 | 104 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 105 | 105 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 106 | 106 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 107 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 108 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 109 | 107 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 110 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 111 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 112 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 108 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 109 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 110 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 113 | 112 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 114 | 113 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 115 | 114 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -104,15 +104,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 104 | 104 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 105 | 105 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 106 | 106 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 107 |
-<<<<<<< HEAD |
|
| 108 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 109 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 110 |
-======= |
|
| 111 | 107 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 112 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 113 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 114 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 115 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 108 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 109 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 110 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 116 | 112 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 117 | 113 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 118 | 114 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -169,12 +165,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 169 | 169 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
| 170 | 170 |
$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ |
| 171 | 171 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
| 172 |
-<<<<<<< HEAD |
|
| 173 | 172 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
| 174 | 173 |
$(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
| 175 |
-======= |
|
| 176 | 174 |
$(top_srcdir)/m4/reorganization/prelude.m4 \ |
| 177 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 178 | 175 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 179 | 176 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 180 | 177 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| ... | ... |
@@ -105,15 +105,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 105 | 105 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 106 | 106 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 107 | 107 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 108 |
-<<<<<<< HEAD |
|
| 109 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 110 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 111 |
-======= |
|
| 112 | 108 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 113 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 114 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 115 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 116 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 109 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 110 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 112 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 117 | 113 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 118 | 114 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 119 | 115 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -170,12 +166,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 170 | 170 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
| 171 | 171 |
$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ |
| 172 | 172 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
| 173 |
-<<<<<<< HEAD |
|
| 174 | 173 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
| 175 | 174 |
$(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
| 176 |
-======= |
|
| 177 | 175 |
$(top_srcdir)/m4/reorganization/prelude.m4 \ |
| 178 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 179 | 176 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 180 | 177 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 181 | 178 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| ... | ... |
@@ -109,15 +109,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 109 | 109 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 110 | 110 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 111 | 111 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 112 |
-<<<<<<< HEAD |
|
| 113 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 114 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 115 |
-======= |
|
| 116 | 112 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 117 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 118 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 119 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 120 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 113 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 114 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 115 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 116 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 121 | 117 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 122 | 118 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 123 | 119 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -174,12 +170,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
| 175 | 175 |
$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ |
| 176 | 176 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
| 177 |
-<<<<<<< HEAD |
|
| 178 | 177 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
| 179 | 178 |
$(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
| 180 |
-======= |
|
| 181 | 179 |
$(top_srcdir)/m4/reorganization/prelude.m4 \ |
| 182 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 183 | 180 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 184 | 181 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 185 | 182 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| ... | ... |
@@ -133,15 +133,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 133 | 133 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 134 | 134 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 135 | 135 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 136 |
-<<<<<<< HEAD |
|
| 137 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 138 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 139 |
-======= |
|
| 140 | 136 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 141 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 142 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 143 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 144 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 137 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 138 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 139 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 140 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 145 | 141 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 146 | 142 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 147 | 143 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -198,12 +194,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 198 | 198 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
| 199 | 199 |
$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ |
| 200 | 200 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
| 201 |
-<<<<<<< HEAD |
|
| 202 | 201 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
| 203 | 202 |
$(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
| 204 |
-======= |
|
| 205 | 203 |
$(top_srcdir)/m4/reorganization/prelude.m4 \ |
| 206 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 207 | 204 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 208 | 205 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 209 | 206 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| ... | ... |
@@ -5750,8 +5750,8 @@ maintainer-clean-generic: |
| 5750 | 5750 |
@echo "This command is intended for maintainers to use" |
| 5751 | 5751 |
@echo "it deletes files that may require special tools to rebuild." |
| 5752 | 5752 |
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) |
| 5753 |
-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: |
|
| 5754 | 5753 |
@BUILD_EXTERNAL_LLVM_TRUE@clean-local: |
| 5754 |
+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: |
|
| 5755 | 5755 |
clean: clean-am |
| 5756 | 5756 |
|
| 5757 | 5757 |
clean-am: clean-generic clean-libtool clean-local \ |
| ... | ... |
@@ -105,10 +105,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 105 | 105 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 106 | 106 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 107 | 107 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 108 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 109 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 110 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 111 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 108 |
+ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
|
| 109 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 110 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 112 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 112 | 113 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 113 | 114 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 114 | 115 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -167,6 +168,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 167 | 167 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
| 168 | 168 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
| 169 | 169 |
$(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
| 170 |
+ $(top_srcdir)/m4/reorganization/prelude.m4 \ |
|
| 170 | 171 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 171 | 172 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 172 | 173 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| ... | ... |
@@ -365,6 +367,13 @@ LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 365 | 365 |
LIBLTDL = @LIBLTDL@ |
| 366 | 366 |
LIBM = @LIBM@ |
| 367 | 367 |
LIBOBJS = @LIBOBJS@ |
| 368 |
+LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ |
|
| 369 |
+LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ |
|
| 370 |
+LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ |
|
| 371 |
+LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ |
|
| 372 |
+LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ |
|
| 373 |
+LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ |
|
| 374 |
+LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ |
|
| 368 | 375 |
LIBS = @LIBS@ |
| 369 | 376 |
LIBTOOL = @LIBTOOL@ |
| 370 | 377 |
LIPO = @LIPO@ |
| ... | ... |
@@ -94,15 +94,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 94 | 94 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 95 | 95 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 96 | 96 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 97 |
-<<<<<<< HEAD |
|
| 98 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 99 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 100 |
-======= |
|
| 101 | 97 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 102 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 103 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 104 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 105 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 98 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 99 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 100 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 101 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 106 | 102 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 107 | 103 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 108 | 104 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -159,12 +155,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 159 | 159 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
| 160 | 160 |
$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ |
| 161 | 161 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
| 162 |
-<<<<<<< HEAD |
|
| 163 | 162 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
| 164 | 163 |
$(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
| 165 |
-======= |
|
| 166 | 164 |
$(top_srcdir)/m4/reorganization/prelude.m4 \ |
| 167 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 168 | 165 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 169 | 166 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 170 | 167 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| ... | ... |
@@ -106,15 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 106 | 106 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 107 | 107 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 108 | 108 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 109 |
-<<<<<<< HEAD |
|
| 110 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 111 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 112 |
-======= |
|
| 113 | 109 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 114 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 115 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 116 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 117 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 110 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 111 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 112 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 113 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 118 | 114 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 119 | 115 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 120 | 116 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -171,12 +167,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 171 | 171 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
| 172 | 172 |
$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
| 174 |
-<<<<<<< HEAD |
|
| 175 | 174 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
| 176 | 175 |
$(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
| 177 |
-======= |
|
| 178 | 176 |
$(top_srcdir)/m4/reorganization/prelude.m4 \ |
| 179 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 180 | 177 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 181 | 178 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 182 | 179 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| ... | ... |
@@ -87,15 +87,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 87 | 87 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 88 | 88 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 89 | 89 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 90 |
-<<<<<<< HEAD |
|
| 91 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 92 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 93 |
-======= |
|
| 94 | 90 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 95 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 96 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 97 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 98 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 91 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 92 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 93 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 94 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 99 | 95 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 100 | 96 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 101 | 97 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -152,12 +148,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 152 | 152 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
| 153 | 153 |
$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ |
| 154 | 154 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
| 155 |
-<<<<<<< HEAD |
|
| 156 | 155 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
| 157 | 156 |
$(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
| 158 |
-======= |
|
| 159 | 157 |
$(top_srcdir)/m4/reorganization/prelude.m4 \ |
| 160 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 161 | 158 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 162 | 159 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 163 | 160 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| ... | ... |
@@ -89,15 +89,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 89 | 89 |
$(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
| 90 | 90 |
$(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
| 91 | 91 |
$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
| 92 |
-<<<<<<< HEAD |
|
| 93 |
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
|
| 94 |
- $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 95 |
-======= |
|
| 96 | 92 |
$(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ |
| 97 |
- $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ |
|
| 98 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 99 |
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
|
| 100 |
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 93 |
+ $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ |
|
| 94 |
+ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
|
| 95 |
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
|
| 96 |
+ $(top_srcdir)/m4/lt~obsolete.m4 \ |
|
| 101 | 97 |
$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
| 102 | 98 |
$(top_srcdir)/m4/reorganization/version.m4 \ |
| 103 | 99 |
$(top_srcdir)/m4/reorganization/build_tools.m4 \ |
| ... | ... |
@@ -154,12 +150,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 154 | 154 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
| 155 | 155 |
$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ |
| 156 | 156 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
| 157 |
-<<<<<<< HEAD |
|
| 158 | 157 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
| 159 | 158 |
$(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
| 160 |
-======= |
|
| 161 | 159 |
$(top_srcdir)/m4/reorganization/prelude.m4 \ |
| 162 |
->>>>>>> Adds a module to use Prelude and connect to a prelude manager |
|
| 163 | 160 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 164 | 161 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 165 | 162 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |