From 97930c240017ae1ed1628642c9365982030b35aa Mon Sep 17 00:00:00 2001 From: Mickey Sola Date: Tue, 24 May 2016 15:04:51 -0400 Subject: [PATCH] updating prelude hook to work with allmatch --- Makefile.in | 7 ++--- clamav-milter/Makefile.in | 7 ++--- clambc/Makefile.in | 9 +++---- clamconf/Makefile.in | 9 +++---- clamd/Makefile.in | 23 ++++++---------- clamd/scanner.c | 57 ++++++++++++++++----------------------- clamdscan/Makefile.in | 9 +++---- clamdtop/Makefile.in | 9 +++---- clamscan/Makefile.in | 9 +++---- clamsubmit/Makefile.in | 9 +++---- configure | 9 ++++--- database/Makefile.in | 9 +++---- docs/Makefile.in | 15 +++-------- etc/Makefile.in | 15 +++-------- freshclam/Makefile.in | 15 +++-------- libclamav/Makefile.in | 15 +++-------- libclamav/c++/Makefile.in | 2 +- libfreshclam/Makefile.in | 17 +++++++++--- libltdl/Makefile.in | 15 +++-------- sigtool/Makefile.in | 15 +++-------- test/Makefile.in | 15 +++-------- unit_tests/Makefile.in | 15 +++-------- 22 files changed, 119 insertions(+), 186 deletions(-) diff --git a/Makefile.in b/Makefile.in index ad55317619..19ceafe97e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -133,9 +133,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ diff --git a/clamav-milter/Makefile.in b/clamav-milter/Makefile.in index 3e24500f8e..80f7f3fa35 100644 --- a/clamav-milter/Makefile.in +++ b/clamav-milter/Makefile.in @@ -108,9 +108,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ diff --git a/clambc/Makefile.in b/clambc/Makefile.in index 6764242366..257ef7a19c 100644 --- a/clambc/Makefile.in +++ b/clambc/Makefile.in @@ -88,12 +88,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ diff --git a/clamconf/Makefile.in b/clamconf/Makefile.in index 1b8b2d49b6..29a0eef026 100644 --- a/clamconf/Makefile.in +++ b/clamconf/Makefile.in @@ -106,12 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ diff --git a/clamd/Makefile.in b/clamd/Makefile.in index 2735bd1a4b..1613694f17 100644 --- a/clamd/Makefile.in +++ b/clamd/Makefile.in @@ -108,12 +108,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -200,22 +199,16 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \ onaccess_ddd.h onaccess_hash.c onaccess_hash.h onaccess_scth.c \ onaccess_scth.h @BUILD_CLAMD_TRUE@am_clamd_OBJECTS = output.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ optparser.$(OBJEXT) getopt.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ misc.$(OBJEXT) clamd.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ tcpserver.$(OBJEXT) localserver.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ session.$(OBJEXT) thrmgr.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ server-th.$(OBJEXT) scanner.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ others.$(OBJEXT) onaccess_fan.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ onaccess_ddd.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ onaccess_hash.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ onaccess_scth.$(OBJEXT) @BUILD_CLAMD_TRUE@ idmef_logging.$(OBJEXT) optparser.$(OBJEXT) \ @BUILD_CLAMD_TRUE@ getopt.$(OBJEXT) misc.$(OBJEXT) \ @BUILD_CLAMD_TRUE@ clamd.$(OBJEXT) tcpserver.$(OBJEXT) \ @BUILD_CLAMD_TRUE@ localserver.$(OBJEXT) session.$(OBJEXT) \ @BUILD_CLAMD_TRUE@ thrmgr.$(OBJEXT) server-th.$(OBJEXT) \ @BUILD_CLAMD_TRUE@ scanner.$(OBJEXT) others.$(OBJEXT) \ -@BUILD_CLAMD_TRUE@ fan.$(OBJEXT) +@BUILD_CLAMD_TRUE@ onaccess_fan.$(OBJEXT) \ +@BUILD_CLAMD_TRUE@ onaccess_ddd.$(OBJEXT) \ +@BUILD_CLAMD_TRUE@ onaccess_hash.$(OBJEXT) \ +@BUILD_CLAMD_TRUE@ onaccess_scth.$(OBJEXT) clamd_OBJECTS = $(am_clamd_OBJECTS) clamd_LDADD = $(LDADD) AM_V_lt = $(am__v_lt_@AM_V@) diff --git a/clamd/scanner.c b/clamd/scanner.c index 0a75abf2fd..e0b17708c7 100644 --- a/clamd/scanner.c +++ b/clamd/scanner.c @@ -58,8 +58,6 @@ #include "shared/output.h" #include "shared/misc.h" -#include "shared/idmef_logging.h" - #include "others.h" #include "scanner.h" #include "shared.h" @@ -276,38 +274,29 @@ int scan_callback(STATBUF *sb, char *filename, const char *msg, enum cli_ftw_rea } if (ret == CL_VIRUS) { - scandata->infected++; - if (conn_reply_virus(scandata->conn, filename, virname) == -1) { - free(filename); - if((scandata->options & CL_SCAN_ALLMATCHES) && (virpp != &virname)) - free((void *)virpp); - return CL_ETIMEOUT; - } - if (scandata->options & CL_SCAN_ALLMATCHES && virpp[1] != NULL) { - int i = 1; - while (NULL != virpp[i]) - if (conn_reply_virus(scandata->conn, filename, virpp[i++]) == -1) { - free(filename); - if (virpp != &virname) - free((void *)virpp); - return CL_ETIMEOUT; - } - } - - if(optget(scandata->opts, "PreludeEnable")->enabled){ - prelude_logging(filename, virname, context.virhash, context.virsize); - } - - if(context.virsize && optget(scandata->opts, "ExtendedDetectionInfo")->enabled) - logg("~%s: %s(%s:%llu) FOUND\n", filename, virname, context.virhash, context.virsize); - else - logg("~%s: %s FOUND\n", filename, virname); - virusaction(filename, virname, scandata->opts); - if (scandata->options & CL_SCAN_ALLMATCHES && virpp[1] != NULL) { - int i = 1; - while (NULL != virpp[i]) - logg("~%s: %s FOUND\n", filename, virpp[i++]); - } + scandata->infected++; + + if (scandata->options & CL_SCAN_ALLMATCHES) { + if(optget(scandata->opts, "PreludeEnable")->enabled){ + prelude_logging(filename, virname, context.virhash, context.virsize); + } + virusaction(filename, virname, scandata->opts); + } else { + if (conn_reply_virus(scandata->conn, filename, virname) == -1) { + free(filename); + return CL_ETIMEOUT; + } + + if(optget(scandata->opts, "PreludeEnable")->enabled){ + prelude_logging(filename, virname, context.virhash, context.virsize); + } + + if(context.virsize && optget(scandata->opts, "ExtendedDetectionInfo")->enabled) + logg("~%s: %s(%s:%llu) FOUND\n", filename, virname, context.virhash, context.virsize); + else + logg("~%s: %s FOUND\n", filename, virname); + virusaction(filename, virname, scandata->opts); + } } else if (ret != CL_CLEAN) { scandata->errors++; if (conn_reply(scandata->conn, filename, cl_strerror(ret), "ERROR") == -1) { diff --git a/clamdscan/Makefile.in b/clamdscan/Makefile.in index 3347c7c781..2e23ce3447 100644 --- a/clamdscan/Makefile.in +++ b/clamdscan/Makefile.in @@ -106,12 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ diff --git a/clamdtop/Makefile.in b/clamdtop/Makefile.in index 7ed3d667cd..67d232ca57 100644 --- a/clamdtop/Makefile.in +++ b/clamdtop/Makefile.in @@ -88,12 +88,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ diff --git a/clamscan/Makefile.in b/clamscan/Makefile.in index 718ab0a04c..b5ca53050a 100644 --- a/clamscan/Makefile.in +++ b/clamscan/Makefile.in @@ -107,12 +107,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ diff --git a/clamsubmit/Makefile.in b/clamsubmit/Makefile.in index d635f53d8a..e454271e92 100644 --- a/clamsubmit/Makefile.in +++ b/clamsubmit/Makefile.in @@ -106,12 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ diff --git a/configure b/configure index 65035654f2..d0543150c9 100755 --- a/configure +++ b/configure @@ -681,9 +681,6 @@ CLAMSCAN_CPPFLAGS FRESHCLAM_CPPFLAGS CLAMSUBMIT_CFLAGS CLAMSUBMIT_LIBS -ENABLE_LIBFRESHCLAM_FALSE -ENABLE_LIBFRESHCLAM_TRUE -HAVE_YARA LIBPRELUDE_CONFIG_PREFIX LIBPRELUDE_PREFIX LIBPRELUDE_LIBS @@ -691,6 +688,9 @@ LIBPRELUDE_LDFLAGS LIBPRELUDE_PTHREAD_CFLAGS LIBPRELUDE_CFLAGS LIBPRELUDE_CONFIG +ENABLE_LIBFRESHCLAM_FALSE +ENABLE_LIBFRESHCLAM_TRUE +HAVE_YARA subdirs llvmconfig WERR_CFLAGS_MILTER @@ -24170,6 +24170,9 @@ fi else ENABLE_LIBFRESHCLAM_TRUE='#' ENABLE_LIBFRESHCLAM_FALSE= +fi + + # PRELUDE # Check whether --enable-prelude was given. diff --git a/database/Makefile.in b/database/Makefile.in index 093426e685..707cc2465f 100644 --- a/database/Makefile.in +++ b/database/Makefile.in @@ -104,12 +104,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ diff --git a/docs/Makefile.in b/docs/Makefile.in index 32fa8386f5..68a7a3c85e 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -104,15 +104,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -<<<<<<< HEAD - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ -======= $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -169,12 +165,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/reorganization/llvm.m4 \ $(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ $(top_srcdir)/m4/reorganization/sha_collect.m4 \ -<<<<<<< HEAD $(top_srcdir)/m4/reorganization/yara.m4 \ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ -======= $(top_srcdir)/m4/reorganization/prelude.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager $(top_srcdir)/m4/reorganization/bsd.m4 \ $(top_srcdir)/m4/reorganization/libs/curl.m4 \ $(top_srcdir)/m4/reorganization/substitutions.m4 \ diff --git a/etc/Makefile.in b/etc/Makefile.in index 3dd4a475c6..e0fe638c3b 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -105,15 +105,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -<<<<<<< HEAD - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ -======= $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -170,12 +166,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/reorganization/llvm.m4 \ $(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ $(top_srcdir)/m4/reorganization/sha_collect.m4 \ -<<<<<<< HEAD $(top_srcdir)/m4/reorganization/yara.m4 \ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ -======= $(top_srcdir)/m4/reorganization/prelude.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager $(top_srcdir)/m4/reorganization/bsd.m4 \ $(top_srcdir)/m4/reorganization/libs/curl.m4 \ $(top_srcdir)/m4/reorganization/substitutions.m4 \ diff --git a/freshclam/Makefile.in b/freshclam/Makefile.in index f696ce76c1..1cf896b534 100644 --- a/freshclam/Makefile.in +++ b/freshclam/Makefile.in @@ -109,15 +109,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -<<<<<<< HEAD - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ -======= $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -174,12 +170,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/reorganization/llvm.m4 \ $(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ $(top_srcdir)/m4/reorganization/sha_collect.m4 \ -<<<<<<< HEAD $(top_srcdir)/m4/reorganization/yara.m4 \ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ -======= $(top_srcdir)/m4/reorganization/prelude.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager $(top_srcdir)/m4/reorganization/bsd.m4 \ $(top_srcdir)/m4/reorganization/libs/curl.m4 \ $(top_srcdir)/m4/reorganization/substitutions.m4 \ diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in index 892f50d0b0..89c67d354f 100644 --- a/libclamav/Makefile.in +++ b/libclamav/Makefile.in @@ -133,15 +133,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -<<<<<<< HEAD - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ -======= $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -198,12 +194,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/reorganization/llvm.m4 \ $(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ $(top_srcdir)/m4/reorganization/sha_collect.m4 \ -<<<<<<< HEAD $(top_srcdir)/m4/reorganization/yara.m4 \ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ -======= $(top_srcdir)/m4/reorganization/prelude.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager $(top_srcdir)/m4/reorganization/bsd.m4 \ $(top_srcdir)/m4/reorganization/libs/curl.m4 \ $(top_srcdir)/m4/reorganization/substitutions.m4 \ diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in index 4be89caa95..1357aca5bb 100644 --- a/libclamav/c++/Makefile.in +++ b/libclamav/c++/Makefile.in @@ -5750,8 +5750,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: @BUILD_EXTERNAL_LLVM_TRUE@clean-local: +@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local \ diff --git a/libfreshclam/Makefile.in b/libfreshclam/Makefile.in index ce4b367435..b6ffedd7c0 100644 --- a/libfreshclam/Makefile.in +++ b/libfreshclam/Makefile.in @@ -105,10 +105,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -167,6 +168,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/reorganization/sha_collect.m4 \ $(top_srcdir)/m4/reorganization/yara.m4 \ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ + $(top_srcdir)/m4/reorganization/prelude.m4 \ $(top_srcdir)/m4/reorganization/bsd.m4 \ $(top_srcdir)/m4/reorganization/libs/curl.m4 \ $(top_srcdir)/m4/reorganization/substitutions.m4 \ @@ -365,6 +367,13 @@ LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ LIBLTDL = @LIBLTDL@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ +LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@ +LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@ +LIBPRELUDE_CONFIG_PREFIX = @LIBPRELUDE_CONFIG_PREFIX@ +LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ +LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ +LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ +LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in index a5c257da88..64a96ce1ab 100644 --- a/libltdl/Makefile.in +++ b/libltdl/Makefile.in @@ -94,15 +94,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -<<<<<<< HEAD - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ -======= $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -159,12 +155,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/reorganization/llvm.m4 \ $(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ $(top_srcdir)/m4/reorganization/sha_collect.m4 \ -<<<<<<< HEAD $(top_srcdir)/m4/reorganization/yara.m4 \ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ -======= $(top_srcdir)/m4/reorganization/prelude.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager $(top_srcdir)/m4/reorganization/bsd.m4 \ $(top_srcdir)/m4/reorganization/libs/curl.m4 \ $(top_srcdir)/m4/reorganization/substitutions.m4 \ diff --git a/sigtool/Makefile.in b/sigtool/Makefile.in index 73040fd101..e25b48c721 100644 --- a/sigtool/Makefile.in +++ b/sigtool/Makefile.in @@ -106,15 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -<<<<<<< HEAD - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ -======= $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -171,12 +167,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/reorganization/llvm.m4 \ $(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ $(top_srcdir)/m4/reorganization/sha_collect.m4 \ -<<<<<<< HEAD $(top_srcdir)/m4/reorganization/yara.m4 \ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ -======= $(top_srcdir)/m4/reorganization/prelude.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager $(top_srcdir)/m4/reorganization/bsd.m4 \ $(top_srcdir)/m4/reorganization/libs/curl.m4 \ $(top_srcdir)/m4/reorganization/substitutions.m4 \ diff --git a/test/Makefile.in b/test/Makefile.in index 5103fe9030..fe022f021d 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -87,15 +87,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -<<<<<<< HEAD - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ -======= $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -152,12 +148,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/reorganization/llvm.m4 \ $(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ $(top_srcdir)/m4/reorganization/sha_collect.m4 \ -<<<<<<< HEAD $(top_srcdir)/m4/reorganization/yara.m4 \ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ -======= $(top_srcdir)/m4/reorganization/prelude.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager $(top_srcdir)/m4/reorganization/bsd.m4 \ $(top_srcdir)/m4/reorganization/libs/curl.m4 \ $(top_srcdir)/m4/reorganization/substitutions.m4 \ diff --git a/unit_tests/Makefile.in b/unit_tests/Makefile.in index a55b59d599..9a4bafee84 100644 --- a/unit_tests/Makefile.in +++ b/unit_tests/Makefile.in @@ -89,15 +89,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -<<<<<<< HEAD - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ - $(top_srcdir)/m4/ltargz.m4 $(top_srcdir)/m4/ltdl.m4 \ -======= $(top_srcdir)/m4/lib-prelude.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltdl.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/llvm.m4 $(top_srcdir)/m4/ltargz.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ $(top_srcdir)/m4/reorganization/version.m4 \ $(top_srcdir)/m4/reorganization/build_tools.m4 \ @@ -154,12 +150,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/reorganization/llvm.m4 \ $(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \ $(top_srcdir)/m4/reorganization/sha_collect.m4 \ -<<<<<<< HEAD $(top_srcdir)/m4/reorganization/yara.m4 \ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ -======= $(top_srcdir)/m4/reorganization/prelude.m4 \ ->>>>>>> Adds a module to use Prelude and connect to a prelude manager $(top_srcdir)/m4/reorganization/bsd.m4 \ $(top_srcdir)/m4/reorganization/libs/curl.m4 \ $(top_srcdir)/m4/reorganization/substitutions.m4 \