Browse code

autojunk'd after libreshclam merge conflict resolution

Mickey Sola authored on 2019/06/15 04:49:33
Showing 5 changed files
... ...
@@ -113,8 +113,7 @@ host_triplet = @host@
113 113
 target_triplet = @target@
114 114
 @BUILD_CLAMONACC_TRUE@am__append_1 = clamonacc
115 115
 @ENABLE_CLAMSUBMIT_TRUE@am__append_2 = clamsubmit
116
-@ENABLE_LIBFRESHCLAM_TRUE@am__append_3 = libfreshclam
117
-@ENABLE_FUZZ_TRUE@am__append_4 = fuzz
116
+@ENABLE_FUZZ_TRUE@am__append_3 = fuzz
118 117
 subdir = .
119 118
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
120 119
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
... ...
@@ -297,9 +296,9 @@ am__define_uniq_tagged_files = \
297 297
 ETAGS = etags
298 298
 CTAGS = ctags
299 299
 CSCOPE = cscope
300
-DIST_SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan clamonacc \
301
-	freshclam sigtool clamconf database docs etc clamav-milter \
302
-	test clamdtop clambc unit_tests clamsubmit libfreshclam fuzz
300
+DIST_SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan \
301
+	clamonacc freshclam sigtool clamconf database docs etc \
302
+	clamav-milter test clamdtop clambc unit_tests clamsubmit fuzz
303 303
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \
304 304
 	$(srcdir)/clamav-config.in $(srcdir)/clamav-types.h.in \
305 305
 	$(srcdir)/libclamav.pc.in $(srcdir)/platform.h.in \
... ...
@@ -618,9 +617,9 @@ top_build_prefix = @top_build_prefix@
618 618
 top_builddir = @top_builddir@
619 619
 top_srcdir = @top_srcdir@
620 620
 ACLOCAL_AMFLAGS = -I m4
621
-SUBDIRS = libltdl libclamav libfreshclamd clamscan clamd clamdscan clamonacc \
622
-	freshclam sigtool clamconf database docs etc clamav-milter \
623
-	test clamdtop clambc unit_tests $(am__append_1) \
621
+SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan \
622
+	clamonacc freshclam sigtool clamconf database docs etc \
623
+	clamav-milter test clamdtop clambc unit_tests $(am__append_1) \
624 624
 	$(am__append_2) $(am__append_3)
625 625
 EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.md NEWS.md README.md
626 626
 bin_SCRIPTS = clamav-config
... ...
@@ -182,7 +182,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
182 182
 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
183 183
 	$(top_srcdir)/m4/reorganization/yara.m4 \
184 184
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
185
-	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \
186 185
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
187 186
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
188 187
 	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
... ...
@@ -345,6 +344,7 @@ CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
345 345
 CPP = @CPP@
346 346
 CPPFLAGS = @CPPFLAGS@
347 347
 CURL_CPPFLAGS = @CURL_CPPFLAGS@
348
+CURL_LDFLAGS = @CURL_LDFLAGS@
348 349
 CURL_LIBS = @CURL_LIBS@
349 350
 CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
350 351
 CURSES_LIBS = @CURSES_LIBS@
... ...
@@ -409,6 +409,7 @@ LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
409 409
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
410 410
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
411 411
 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
412
+LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@
412 413
 LIBLTDL = @LIBLTDL@
413 414
 LIBM = @LIBM@
414 415
 LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@
... ...
@@ -35890,7 +35890,6 @@ fi
35890 35890
 
35891 35891
 
35892 35892
 
35893
-
35894 35893
    $as_echo_n "              libcurl     : "
35895 35894
    if test "xyes" = "xno"; then :
35896 35895
   $as_echo "$LIBCURL_HOME (disabled)"
... ...
@@ -5765,8 +5765,8 @@ maintainer-clean-generic:
5765 5765
 	@echo "This command is intended for maintainers to use"
5766 5766
 	@echo "it deletes files that may require special tools to rebuild."
5767 5767
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
5768
-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5769 5768
 @BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5769
+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5770 5770
 clean: clean-am
5771 5771
 
5772 5772
 clean-am: clean-generic clean-libtool clean-local \
... ...
@@ -123,8 +123,6 @@ target_triplet = @target@
123 123
 @LINUX_TRUE@        $(top_srcdir)/shared/cert_util.h
124 124
 
125 125
 subdir = libfreshclam
126
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
127
-	$(top_srcdir)/config/depcomp $(include_HEADERS)
128 126
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
129 127
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
130 128
 	$(top_srcdir)/m4/ax_check_uname_syscall.m4 \
... ...
@@ -204,7 +202,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
204 204
 	$(top_srcdir)/configure.ac
205 205
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
206 206
 	$(ACLOCAL_M4)
207
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
207
+DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
208
+	$(am__DIST_COMMON)
208 209
 mkinstalldirs = $(install_sh) -d
209 210
 CONFIG_HEADER = $(top_builddir)/clamav-config.h \
210 211
 	$(top_builddir)/libclammspack/config.h