... | ... |
@@ -120,7 +120,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
120 | 120 |
$(top_srcdir)/docs/man/clamsubmit.1.in AUTHORS COPYING \ |
121 | 121 |
ChangeLog INSTALL NEWS README config/compile \ |
122 | 122 |
config/config.guess config/config.rpath config/config.sub \ |
123 |
- config/install-sh config/missing config/ylwrap \ |
|
123 |
+ config/depcomp config/install-sh config/missing config/ylwrap \ |
|
124 | 124 |
config/ltmain.sh $(top_srcdir)/config/compile \ |
125 | 125 |
$(top_srcdir)/config/config.guess \ |
126 | 126 |
$(top_srcdir)/config/config.rpath \ |
... | ... |
@@ -192,6 +192,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
192 | 192 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
193 | 193 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
194 | 194 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
195 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
195 | 196 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
196 | 197 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
197 | 198 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -167,6 +167,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
167 | 167 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
168 | 168 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
169 | 169 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
170 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.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 \ |
... | ... |
@@ -148,6 +148,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
148 | 148 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
149 | 149 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
150 | 150 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
151 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
151 | 152 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
152 | 153 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
153 | 154 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -166,6 +166,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
166 | 166 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
167 | 167 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
168 | 168 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
169 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
169 | 170 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
170 | 171 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
171 | 172 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -168,6 +168,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
168 | 168 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
169 | 169 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
170 | 170 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
171 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
171 | 172 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
172 | 173 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
173 | 174 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -166,6 +166,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
166 | 166 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
167 | 167 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
168 | 168 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
169 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
169 | 170 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
170 | 171 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
171 | 172 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -148,6 +148,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
148 | 148 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
149 | 149 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
150 | 150 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
151 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
151 | 152 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
152 | 153 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
153 | 154 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -167,6 +167,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
167 | 167 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
168 | 168 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
169 | 169 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
170 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.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 \ |
... | ... |
@@ -166,6 +166,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
166 | 166 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
167 | 167 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
168 | 168 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
169 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
169 | 170 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
170 | 171 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
171 | 172 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -645,10 +645,6 @@ am__EXEEXT_FALSE |
645 | 645 |
am__EXEEXT_TRUE |
646 | 646 |
LTLIBOBJS |
647 | 647 |
LIBOBJS |
648 |
-ENABLE_LIBFRESHCLAM_FALSE |
|
649 |
-ENABLE_LIBFRESHCLAM_TRUE |
|
650 |
-ENABLE_CLAMSUBMIT_FALSE |
|
651 |
-ENABLE_CLAMSUBMIT_TRUE |
|
652 | 648 |
JSON_LDFLAGS |
653 | 649 |
JSON_LIBS |
654 | 650 |
SSL_LDFLAGS |
... | ... |
@@ -683,6 +679,10 @@ CLAMSCAN_CPPFLAGS |
683 | 683 |
FRESHCLAM_CPPFLAGS |
684 | 684 |
CLAMSUBMIT_CFLAGS |
685 | 685 |
CLAMSUBMIT_LIBS |
686 |
+ENABLE_LIBFRESHCLAM_FALSE |
|
687 |
+ENABLE_LIBFRESHCLAM_TRUE |
|
688 |
+ENABLE_CLAMSUBMIT_FALSE |
|
689 |
+ENABLE_CLAMSUBMIT_TRUE |
|
686 | 690 |
HAVE_YARA |
687 | 691 |
subdirs |
688 | 692 |
WERR_CFLAGS_MILTER |
... | ... |
@@ -944,8 +944,8 @@ with_llvm_linking |
944 | 944 |
enable_llvm |
945 | 945 |
enable_sha_collector_for_internal_use |
946 | 946 |
enable_yara |
947 |
-with_libcurl |
|
948 | 947 |
enable_libfreshclam |
948 |
+with_libcurl |
|
949 | 949 |
' |
950 | 950 |
ac_precious_vars='build_alias |
951 | 951 |
host_alias |
... | ... |
@@ -24032,6 +24032,37 @@ fi |
24032 | 24032 |
|
24033 | 24033 |
|
24034 | 24034 |
|
24035 |
+ if test "$have_curl" = "yes"; then |
|
24036 |
+ ENABLE_CLAMSUBMIT_TRUE= |
|
24037 |
+ ENABLE_CLAMSUBMIT_FALSE='#' |
|
24038 |
+else |
|
24039 |
+ ENABLE_CLAMSUBMIT_TRUE='#' |
|
24040 |
+ ENABLE_CLAMSUBMIT_FALSE= |
|
24041 |
+fi |
|
24042 |
+ |
|
24043 |
+ |
|
24044 |
+# Check whether --enable-libfreshclam was given. |
|
24045 |
+if test "${enable_libfreshclam+set}" = set; then : |
|
24046 |
+ enableval=$enable_libfreshclam; enable_libfreshclam=$enableval |
|
24047 |
+else |
|
24048 |
+ enable_libfreshclam="no" |
|
24049 |
+fi |
|
24050 |
+ |
|
24051 |
+ |
|
24052 |
+if test "$enable_libfreshclam" = "yes"; then |
|
24053 |
+ |
|
24054 |
+$as_echo "#define ENABLE_LIBFRESHCLAM 1" >>confdefs.h |
|
24055 |
+ |
|
24056 |
+fi |
|
24057 |
+ if test "$enable_libfreshclam" = "yes"; then |
|
24058 |
+ ENABLE_LIBFRESHCLAM_TRUE= |
|
24059 |
+ ENABLE_LIBFRESHCLAM_FALSE='#' |
|
24060 |
+else |
|
24061 |
+ ENABLE_LIBFRESHCLAM_TRUE='#' |
|
24062 |
+ ENABLE_LIBFRESHCLAM_FALSE= |
|
24063 |
+fi |
|
24064 |
+ |
|
24065 |
+ |
|
24035 | 24066 |
|
24036 | 24067 |
case "$host_os" in |
24037 | 24068 |
freebsd*) |
... | ... |
@@ -24214,37 +24245,6 @@ fi |
24214 | 24214 |
|
24215 | 24215 |
|
24216 | 24216 |
|
24217 |
- if test "$have_curl" = "yes"; then |
|
24218 |
- ENABLE_CLAMSUBMIT_TRUE= |
|
24219 |
- ENABLE_CLAMSUBMIT_FALSE='#' |
|
24220 |
-else |
|
24221 |
- ENABLE_CLAMSUBMIT_TRUE='#' |
|
24222 |
- ENABLE_CLAMSUBMIT_FALSE= |
|
24223 |
-fi |
|
24224 |
- |
|
24225 |
- |
|
24226 |
-# Check whether --enable-libfreshclam was given. |
|
24227 |
-if test "${enable_libfreshclam+set}" = set; then : |
|
24228 |
- enableval=$enable_libfreshclam; enable_libfreshclam=$enableval |
|
24229 |
-else |
|
24230 |
- enable_libfreshclam="no" |
|
24231 |
-fi |
|
24232 |
- |
|
24233 |
- |
|
24234 |
-if test "$enable_libfreshclam" = "yes"; then |
|
24235 |
- |
|
24236 |
-$as_echo "#define ENABLE_LIBFRESHCLAM 1" >>confdefs.h |
|
24237 |
- |
|
24238 |
-fi |
|
24239 |
- if test "$enable_libfreshclam" = "yes"; then |
|
24240 |
- ENABLE_LIBFRESHCLAM_TRUE= |
|
24241 |
- ENABLE_LIBFRESHCLAM_FALSE='#' |
|
24242 |
-else |
|
24243 |
- ENABLE_LIBFRESHCLAM_TRUE='#' |
|
24244 |
- ENABLE_LIBFRESHCLAM_FALSE= |
|
24245 |
-fi |
|
24246 |
- |
|
24247 |
- |
|
24248 | 24217 |
ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamd/clamav-daemon.service clamd/clamav-daemon.socket clamdscan/Makefile clamsubmit/Makefile clamav-milter/Makefile freshclam/clamav-freshclam.service freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile libfreshclam/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1 docs/man/clamsubmit.1" |
24249 | 24218 |
|
24250 | 24219 |
|
... | ... |
@@ -164,6 +164,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
164 | 164 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
165 | 165 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
166 | 166 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
167 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
167 | 168 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
168 | 169 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
169 | 170 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -164,6 +164,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
164 | 164 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
165 | 165 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
166 | 166 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
167 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
167 | 168 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
168 | 169 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
169 | 170 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -165,6 +165,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
165 | 165 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
166 | 166 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
167 | 167 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
168 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
168 | 169 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
169 | 170 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
170 | 171 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -169,6 +169,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
169 | 169 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
170 | 170 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
171 | 171 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
172 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
172 | 173 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
173 | 174 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
174 | 175 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -193,6 +193,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
193 | 193 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
194 | 194 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
195 | 195 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
196 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
196 | 197 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
197 | 198 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
198 | 199 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -165,6 +165,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
165 | 165 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
166 | 166 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
167 | 167 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
168 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
168 | 169 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
169 | 170 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
170 | 171 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -154,6 +154,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
154 | 154 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
155 | 155 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
156 | 156 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
157 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
157 | 158 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
158 | 159 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
159 | 160 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -166,6 +166,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
166 | 166 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
167 | 167 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
168 | 168 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
169 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
169 | 170 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
170 | 171 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
171 | 172 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -147,6 +147,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
147 | 147 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
148 | 148 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
149 | 149 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
150 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
150 | 151 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
151 | 152 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
152 | 153 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
... | ... |
@@ -149,6 +149,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
149 | 149 |
$(top_srcdir)/m4/reorganization/llvm.m4 \ |
150 | 150 |
$(top_srcdir)/m4/reorganization/sha_collect.m4 \ |
151 | 151 |
$(top_srcdir)/m4/reorganization/yara.m4 \ |
152 |
+ $(top_srcdir)/m4/reorganization/libfreshclam.m4 \ |
|
152 | 153 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
153 | 154 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
154 | 155 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |