Browse code

autojunk'd

Mickey Sola authored on 2019/06/13 05:22:49
Showing 24 changed files
... ...
@@ -111,8 +111,10 @@ POST_UNINSTALL = :
111 111
 build_triplet = @build@
112 112
 host_triplet = @host@
113 113
 target_triplet = @target@
114
-@ENABLE_CLAMSUBMIT_TRUE@am__append_1 = clamsubmit
115
-@ENABLE_FUZZ_TRUE@am__append_2 = fuzz
114
+@BUILD_CLAMONACC_TRUE@am__append_1 = clamonacc
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 118
 subdir = .
117 119
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
118 120
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
... ...
@@ -185,10 +187,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
185 185
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
186 186
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
187 187
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
188
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
188 189
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
189 190
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
190 191
 	$(top_srcdir)/m4/reorganization/strni.m4 \
191
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
192 192
 	$(top_srcdir)/m4/reorganization/types.m4 \
193 193
 	$(top_srcdir)/configure.ac
194 194
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -12,9 +12,6 @@
12 12
 /* "build clamd" */
13 13
 #undef BUILD_CLAMD
14 14
 
15
-/* "build clamonacc" */
16
-#undef BUILD_CLAMONACC
17
-
18 15
 /* use ClamAuth */
19 16
 #undef CLAMAUTH
20 17
 
... ...
@@ -183,10 +183,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
183 183
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
184 184
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
185 185
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
186
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
186 187
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
187 188
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
188 189
 	$(top_srcdir)/m4/reorganization/strni.m4 \
189
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
190 190
 	$(top_srcdir)/m4/reorganization/types.m4 \
191 191
 	$(top_srcdir)/configure.ac
192 192
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -162,10 +162,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
162 162
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
163 163
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
164 164
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
165
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
165 166
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
166 167
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
167 168
 	$(top_srcdir)/m4/reorganization/strni.m4 \
168
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
169 169
 	$(top_srcdir)/m4/reorganization/types.m4 \
170 170
 	$(top_srcdir)/configure.ac
171 171
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -182,10 +182,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
182 182
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
183 183
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
184 184
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
185
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
185 186
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
186 187
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
187 188
 	$(top_srcdir)/m4/reorganization/strni.m4 \
188
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
189 189
 	$(top_srcdir)/m4/reorganization/types.m4 \
190 190
 	$(top_srcdir)/configure.ac
191 191
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -183,10 +183,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
183 183
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
184 184
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
185 185
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
186
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
186 187
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
187 188
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
188 189
 	$(top_srcdir)/m4/reorganization/strni.m4 \
189
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
190 190
 	$(top_srcdir)/m4/reorganization/types.m4 \
191 191
 	$(top_srcdir)/configure.ac
192 192
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -181,10 +181,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
181 181
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
182 182
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
183 183
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
184
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
184 185
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
185 186
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
186 187
 	$(top_srcdir)/m4/reorganization/strni.m4 \
187
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
188 188
 	$(top_srcdir)/m4/reorganization/types.m4 \
189 189
 	$(top_srcdir)/configure.ac
190 190
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -162,10 +162,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
162 162
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
163 163
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
164 164
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
165
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
165 166
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
166 167
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
167 168
 	$(top_srcdir)/m4/reorganization/strni.m4 \
168
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
169 169
 	$(top_srcdir)/m4/reorganization/types.m4 \
170 170
 	$(top_srcdir)/configure.ac
171 171
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -109,8 +109,8 @@ POST_UNINSTALL = :
109 109
 build_triplet = @build@
110 110
 host_triplet = @host@
111 111
 target_triplet = @target@
112
-@BUILD_CLAMONACC_TRUE@bin_PROGRAMS = clamonacc$(EXEEXT)
113
-@BUILD_CLAMONACC_TRUE@@SYSTEM_LFS_FTS_FALSE@am__append_1 = ./misc/fts.c
112
+bin_PROGRAMS = clamonacc$(EXEEXT)
113
+@SYSTEM_LFS_FTS_FALSE@am__append_1 = ./misc/fts.c
114 114
 subdir = clamonacc
115 115
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
116 116
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
... ...
@@ -185,10 +185,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
185 185
 	$(top_srcdir)/m4/reorganization/libfreshclam.m4 \
186 186
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
187 187
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
188
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
188 189
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
189 190
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
190 191
 	$(top_srcdir)/m4/reorganization/strni.m4 \
191
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
192 192
 	$(top_srcdir)/m4/reorganization/types.m4 \
193 193
 	$(top_srcdir)/configure.ac
194 194
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -218,25 +218,21 @@ am__clamonacc_SOURCES_DIST = $(top_srcdir)/shared/output.c \
218 218
 	./scan/onaccess_scth.c ./scan/onaccess_scth.h \
219 219
 	./scan/onaccess_scque.c ./scan/onaccess_scque.h \
220 220
 	./c-thread-pool/thpool.c ./c-thread-pool/thpool.h ./misc/fts.c
221
-@BUILD_CLAMONACC_TRUE@@SYSTEM_LFS_FTS_FALSE@am__objects_1 = clamonacc-fts.$(OBJEXT)
222
-@BUILD_CLAMONACC_TRUE@am_clamonacc_OBJECTS =  \
223
-@BUILD_CLAMONACC_TRUE@	clamonacc-output.$(OBJEXT) \
224
-@BUILD_CLAMONACC_TRUE@	clamonacc-optparser.$(OBJEXT) \
225
-@BUILD_CLAMONACC_TRUE@	clamonacc-misc.$(OBJEXT) \
226
-@BUILD_CLAMONACC_TRUE@	clamonacc-getopt.$(OBJEXT) \
227
-@BUILD_CLAMONACC_TRUE@	clamonacc-actions.$(OBJEXT) \
228
-@BUILD_CLAMONACC_TRUE@	clamonacc-clamonacc.$(OBJEXT) \
229
-@BUILD_CLAMONACC_TRUE@	clamonacc-onaccess_client.$(OBJEXT) \
230
-@BUILD_CLAMONACC_TRUE@	clamonacc-onaccess_proto.$(OBJEXT) \
231
-@BUILD_CLAMONACC_TRUE@	clamonacc-onaccess_com.$(OBJEXT) \
232
-@BUILD_CLAMONACC_TRUE@	clamonacc-onaccess_ddd.$(OBJEXT) \
233
-@BUILD_CLAMONACC_TRUE@	clamonacc-onaccess_fan.$(OBJEXT) \
234
-@BUILD_CLAMONACC_TRUE@	clamonacc-onaccess_hash.$(OBJEXT) \
235
-@BUILD_CLAMONACC_TRUE@	clamonacc-onaccess_others.$(OBJEXT) \
236
-@BUILD_CLAMONACC_TRUE@	clamonacc-onaccess_scth.$(OBJEXT) \
237
-@BUILD_CLAMONACC_TRUE@	clamonacc-onaccess_scque.$(OBJEXT) \
238
-@BUILD_CLAMONACC_TRUE@	clamonacc-thpool.$(OBJEXT) \
239
-@BUILD_CLAMONACC_TRUE@	$(am__objects_1)
221
+@SYSTEM_LFS_FTS_FALSE@am__objects_1 = clamonacc-fts.$(OBJEXT)
222
+am_clamonacc_OBJECTS = clamonacc-output.$(OBJEXT) \
223
+	clamonacc-optparser.$(OBJEXT) clamonacc-misc.$(OBJEXT) \
224
+	clamonacc-getopt.$(OBJEXT) clamonacc-actions.$(OBJEXT) \
225
+	clamonacc-clamonacc.$(OBJEXT) \
226
+	clamonacc-onaccess_client.$(OBJEXT) \
227
+	clamonacc-onaccess_proto.$(OBJEXT) \
228
+	clamonacc-onaccess_com.$(OBJEXT) \
229
+	clamonacc-onaccess_ddd.$(OBJEXT) \
230
+	clamonacc-onaccess_fan.$(OBJEXT) \
231
+	clamonacc-onaccess_hash.$(OBJEXT) \
232
+	clamonacc-onaccess_others.$(OBJEXT) \
233
+	clamonacc-onaccess_scth.$(OBJEXT) \
234
+	clamonacc-onaccess_scque.$(OBJEXT) clamonacc-thpool.$(OBJEXT) \
235
+	$(am__objects_1)
240 236
 clamonacc_OBJECTS = $(am_clamonacc_OBJECTS)
241 237
 clamonacc_LDADD = $(LDADD)
242 238
 AM_V_lt = $(am__v_lt_@AM_V@)
... ...
@@ -360,8 +356,7 @@ CYGPATH_W = @CYGPATH_W@
360 360
 DBDIR = @DBDIR@
361 361
 DEFINE_SF32_PREFIX = @DEFINE_SF32_PREFIX@
362 362
 DEFINE_SF64_PREFIX = @DEFINE_SF64_PREFIX@
363
-@BUILD_CLAMONACC_TRUE@DEFS = @DEFS@ -DCL_NOLIBCLAMAV
364
-DEFS = @DEFS@
363
+DEFS = @DEFS@ -DCL_NOLIBCLAMAV
365 364
 DEPDIR = @DEPDIR@
366 365
 DLLTOOL = @DLLTOOL@
367 366
 DSYMUTIL = @DSYMUTIL@
... ...
@@ -426,8 +421,7 @@ LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@
426 426
 LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@
427 427
 LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@
428 428
 LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@
429
-@BUILD_CLAMONACC_TRUE@LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CURL_LIBS@ @CLAMONACC_LIBS@ @THREAD_LIBS@
430
-LIBS = @LIBS@
429
+LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CURL_LIBS@ @CLAMONACC_LIBS@ @THREAD_LIBS@
431 430
 LIBTOOL = @LIBTOOL@
432 431
 LIPO = @LIPO@
433 432
 LN_S = @LN_S@
... ...
@@ -554,44 +548,30 @@ target_vendor = @target_vendor@
554 554
 top_build_prefix = @top_build_prefix@
555 555
 top_builddir = @top_builddir@
556 556
 top_srcdir = @top_srcdir@
557
-@BUILD_CLAMONACC_TRUE@clamonacc_CPPFLAGS = "-g"
558
-@BUILD_CLAMONACC_TRUE@clamonacc_CFLAGS = "-g"
559
-@BUILD_CLAMONACC_TRUE@clamonacc_SOURCES =  \
560
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/output.c \
561
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/output.h \
562
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/optparser.c \
563
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/optparser.h \
564
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/misc.c \
565
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/misc.h \
566
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/getopt.c \
567
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/getopt.h \
568
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/actions.c \
569
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/actions.h \
570
-@BUILD_CLAMONACC_TRUE@	$(top_srcdir)/shared/priv-fts.h \
571
-@BUILD_CLAMONACC_TRUE@	clamonacc.c ./client/onaccess_client.c \
572
-@BUILD_CLAMONACC_TRUE@	./client/onaccess_client.h \
573
-@BUILD_CLAMONACC_TRUE@	./client/onaccess_proto.c \
574
-@BUILD_CLAMONACC_TRUE@	./client/onaccess_proto.h \
575
-@BUILD_CLAMONACC_TRUE@	./client/onaccess_com.c \
576
-@BUILD_CLAMONACC_TRUE@	./client/onaccess_com.h \
577
-@BUILD_CLAMONACC_TRUE@	./inotif/onaccess_ddd.c \
578
-@BUILD_CLAMONACC_TRUE@	./inotif/onaccess_ddd.h \
579
-@BUILD_CLAMONACC_TRUE@	./fanotif/onaccess_fan.c \
580
-@BUILD_CLAMONACC_TRUE@	./fanotif/onaccess_fan.h \
581
-@BUILD_CLAMONACC_TRUE@	./inotif/onaccess_hash.c \
582
-@BUILD_CLAMONACC_TRUE@	./inotif/onaccess_hash.h \
583
-@BUILD_CLAMONACC_TRUE@	./misc/onaccess_others.c \
584
-@BUILD_CLAMONACC_TRUE@	./misc/onaccess_others.h \
585
-@BUILD_CLAMONACC_TRUE@	./misc/priv_fts.h ./scan/onaccess_scth.c \
586
-@BUILD_CLAMONACC_TRUE@	./scan/onaccess_scth.h \
587
-@BUILD_CLAMONACC_TRUE@	./scan/onaccess_scque.c \
588
-@BUILD_CLAMONACC_TRUE@	./scan/onaccess_scque.h \
589
-@BUILD_CLAMONACC_TRUE@	./c-thread-pool/thpool.c \
590
-@BUILD_CLAMONACC_TRUE@	./c-thread-pool/thpool.h $(am__append_1)
591
-@BUILD_CLAMONACC_TRUE@AM_CFLAGS = @WERR_CFLAGS@
592
-@BUILD_CLAMONACC_TRUE@AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamd -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @CLAMONACC_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
593
-@BUILD_CLAMONACC_TRUE@AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamonacc$(EXEEXT)
594
-@BUILD_CLAMONACC_TRUE@CLEANFILES = *.gcda *.gcno
557
+clamonacc_CPPFLAGS = "-g"
558
+clamonacc_CFLAGS = "-g"
559
+clamonacc_SOURCES = $(top_srcdir)/shared/output.c \
560
+	$(top_srcdir)/shared/output.h $(top_srcdir)/shared/optparser.c \
561
+	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/misc.c \
562
+	$(top_srcdir)/shared/misc.h $(top_srcdir)/shared/getopt.c \
563
+	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/actions.c \
564
+	$(top_srcdir)/shared/actions.h $(top_srcdir)/shared/priv-fts.h \
565
+	clamonacc.c ./client/onaccess_client.c \
566
+	./client/onaccess_client.h ./client/onaccess_proto.c \
567
+	./client/onaccess_proto.h ./client/onaccess_com.c \
568
+	./client/onaccess_com.h ./inotif/onaccess_ddd.c \
569
+	./inotif/onaccess_ddd.h ./fanotif/onaccess_fan.c \
570
+	./fanotif/onaccess_fan.h ./inotif/onaccess_hash.c \
571
+	./inotif/onaccess_hash.h ./misc/onaccess_others.c \
572
+	./misc/onaccess_others.h ./misc/priv_fts.h \
573
+	./scan/onaccess_scth.c ./scan/onaccess_scth.h \
574
+	./scan/onaccess_scque.c ./scan/onaccess_scque.h \
575
+	./c-thread-pool/thpool.c ./c-thread-pool/thpool.h \
576
+	$(am__append_1)
577
+AM_CFLAGS = @WERR_CFLAGS@
578
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamd -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @CLAMONACC_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
579
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamonacc$(EXEEXT)
580
+CLEANFILES = *.gcda *.gcno
595 581
 all: all-am
596 582
 
597 583
 .SUFFIXES:
... ...
@@ -184,10 +184,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
184 184
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
185 185
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
186 186
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
187
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
187 188
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
188 189
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
189 190
 	$(top_srcdir)/m4/reorganization/strni.m4 \
190
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
191 191
 	$(top_srcdir)/m4/reorganization/types.m4 \
192 192
 	$(top_srcdir)/configure.ac
193 193
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -192,10 +192,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
192 192
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
193 193
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
194 194
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
195
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
195 196
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
196 197
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
197 198
 	$(top_srcdir)/m4/reorganization/strni.m4 \
198
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
199 199
 	$(top_srcdir)/m4/reorganization/types.m4 \
200 200
 	$(top_srcdir)/configure.ac
201 201
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -714,6 +714,8 @@ CLAMSCAN_CPPFLAGS
714 714
 FRESHCLAM_CPPFLAGS
715 715
 CLAMSUBMIT_CFLAGS
716 716
 CLAMSUBMIT_LIBS
717
+BUILD_CLAMONACC_FALSE
718
+BUILD_CLAMONACC_TRUE
717 719
 LIBPRELUDE_CONFIG_PREFIX
718 720
 LIBPRELUDE_PREFIX
719 721
 LIBPRELUDE_LIBS
... ...
@@ -1006,9 +1008,9 @@ enable_sha_collector_for_internal_use
1006 1006
 enable_yara
1007 1007
 enable_prelude
1008 1008
 with_libprelude_prefix
1009
+enable_clamonacc
1009 1010
 with_libcurl
1010 1011
 enable_strni
1011
-enable_clamonacc
1012 1012
 enable_largefile
1013 1013
 '
1014 1014
       ac_precious_vars='build_alias
... ...
@@ -1721,9 +1723,9 @@ if test -n "$ac_init_help"; then
1721 1721
 
1722 1722
   --disable-yara          do not include yara support
1723 1723
   --enable-prelude        Enable Prelude support for alerts.
1724
+  --enable-clamonacc      build clamonacc tool [default=auto]
1724 1725
   --enable-strni          enables explicit use of internal strn functions to
1725 1726
                           support cross-compilation against older libs
1726
-  --enable-clamonacc      build clamonacc tool [default=auto]
1727 1727
   --disable-largefile     omit support for large files
1728 1728
 
1729 1729
 Optional Packages:
... ...
@@ -28988,6 +28990,56 @@ fi
28988 28988
 esac
28989 28989
 
28990 28990
 
28991
+# Check whether --enable-clamonacc was given.
28992
+if test "${enable_clamonacc+set}" = set; then :
28993
+  enableval=$enable_clamonacc; enable_clamonacc=$enableval
28994
+else
28995
+  enable_clamonacc="auto"
28996
+fi
28997
+
28998
+
28999
+if test "$enable_clamonacc" != "no"; then
29000
+
29001
+
29002
+        case "${host_os}" in
29003
+        	linux*)
29004
+			 if test x$enable_clamonacc != xno; then
29005
+  BUILD_CLAMONACC_TRUE=
29006
+  BUILD_CLAMONACC_FALSE='#'
29007
+else
29008
+  BUILD_CLAMONACC_TRUE='#'
29009
+  BUILD_CLAMONACC_FALSE=
29010
+fi
29011
+
29012
+			;;
29013
+		*)
29014
+			if test "$enable_clamonacc" == "yes"; then
29015
+				as_fn_error $? "Clamonacc was explicitly requested, but the platform ($host_os) you are trying to build on is not currently supported for this tool." "$LINENO" 5
29016
+			fi
29017
+			 if test x$enable_clamonacc == xno; then
29018
+  BUILD_CLAMONACC_TRUE=
29019
+  BUILD_CLAMONACC_FALSE='#'
29020
+else
29021
+  BUILD_CLAMONACC_TRUE='#'
29022
+  BUILD_CLAMONACC_FALSE=
29023
+fi
29024
+
29025
+                        ;;
29026
+	esac
29027
+else
29028
+	 if test x$enable_clamonacc == xyes; then
29029
+  BUILD_CLAMONACC_TRUE=
29030
+  BUILD_CLAMONACC_FALSE='#'
29031
+else
29032
+  BUILD_CLAMONACC_TRUE='#'
29033
+  BUILD_CLAMONACC_FALSE=
29034
+fi
29035
+
29036
+fi
29037
+
29038
+
29039
+
29040
+
28991 29041
 
28992 29042
 have_curl="no"
28993 29043
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl installation" >&5
... ...
@@ -29043,6 +29095,32 @@ $as_echo "$LIBCURL_HOME" >&6; }
29043 29043
     save_LDFLAGS="$LDFLAGS"
29044 29044
     LDFLAGS="$CURL_LDFLAGS $CURL_LIBS"
29045 29045
 
29046
+	if test -z "$BUILD_CLAMONACC_TRUE"; then :
29047
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
29048
+/* end confdefs.h.  */
29049
+#include <curl/curl.h>
29050
+int
29051
+main ()
29052
+{
29053
+
29054
+				int x;
29055
+				curl_easy_setopt(NULL,CURLOPT_URL,NULL);
29056
+				x=CURLOPT_UNIX_SOCKET_PATH;
29057
+                                x=CURLINFO_ACTIVESOCKET;
29058
+				if (x) {;}
29059
+  ;
29060
+  return 0;
29061
+}
29062
+_ACEOF
29063
+if ac_fn_c_try_link "$LINENO"; then :
29064
+  $enable_clamonacc="yes"
29065
+else
29066
+  as_fn_error $? "Your libcurl (e.g. libcurl-devel) is too old. ClamAV requires libcurl 7.45 or higher." "$LINENO" 5
29067
+fi
29068
+rm -f core conftest.err conftest.$ac_objext \
29069
+    conftest$ac_exeext conftest.$ac_ext
29070
+fi
29071
+
29046 29072
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5
29047 29073
 $as_echo_n "checking for curl_easy_init in -lcurl... " >&6; }
29048 29074
 if ${ac_cv_lib_curl_curl_easy_init+:} false; then :
... ...
@@ -29164,61 +29242,6 @@ fi
29164 29164
 
29165 29165
 
29166 29166
 
29167
-# Check whether --enable-clamonacc was given.
29168
-if test "${enable_clamonacc+set}" = set; then :
29169
-  enableval=$enable_clamonacc; enable_clamonacc=$enableval
29170
-else
29171
-  enable_clamonacc="auto"
29172
-fi
29173
-
29174
-
29175
- if test x$enable_clamonacc != xno; then
29176
-  BUILD_CLAMONACC_TRUE=
29177
-  BUILD_CLAMONACC_FALSE='#'
29178
-else
29179
-  BUILD_CLAMONACC_TRUE='#'
29180
-  BUILD_CLAMONACC_FALSE=
29181
-fi
29182
-
29183
-if test "$enable_clamonacc" != "no"; then
29184
-
29185
-$as_echo "#define BUILD_CLAMONACC 0" >>confdefs.h
29186
-
29187
-
29188
-
29189
-	if test "$host_os" != "linux*"; then
29190
-		if test "$enable_clamonacc" == "yes"; then
29191
-			as_fn_error $? "Clamonacc was explicitly requested, but the platform you are trying to build on not currently supported for this tool." "$LINENO" 5
29192
-		fi
29193
-	else
29194
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
29195
-/* end confdefs.h.  */
29196
-#include <curl/curl.h>
29197
-int
29198
-main ()
29199
-{
29200
-
29201
-				int x;
29202
-				curl_easy_setopt(NULL,CURLOPT_URL,NULL);
29203
-				x=CURLOPT_UNIX_SOCKET_PATH;
29204
-				if (x) {;}
29205
-  ;
29206
-  return 0;
29207
-}
29208
-_ACEOF
29209
-if ac_fn_c_try_link "$LINENO"; then :
29210
-
29211
-$as_echo "#define BUILD_CLAMONACC 1" >>confdefs.h
29212
-
29213
-else
29214
-  as_fn_error $? "Your libcurl (e.g. libcurl-devel) is too old. ClamAV requires libcurl 7.40 or higher." "$LINENO" 5
29215
-fi
29216
-rm -f core conftest.err conftest.$ac_objext \
29217
-    conftest$ac_exeext conftest.$ac_ext
29218
-	fi
29219
-fi
29220
-
29221
-
29222 29167
 if test "x$use_internal_mspack" = "xyes"; then
29223 29168
     mspack_msg="Internal"
29224 29169
     # Check whether --enable-largefile was given.
... ...
@@ -30241,6 +30264,14 @@ if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then
30241 30241
   as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.
30242 30242
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
30243 30243
 fi
30244
+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then
30245
+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.
30246
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
30247
+fi
30248
+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then
30249
+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.
30250
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
30251
+fi
30244 30252
 
30245 30253
 : "${CONFIG_STATUS=./config.status}"
30246 30254
 ac_write_fail=0
... ...
@@ -31227,7 +31258,6 @@ do
31227 31227
     "clamd/clamav-daemon.service") CONFIG_FILES="$CONFIG_FILES clamd/clamav-daemon.service" ;;
31228 31228
     "clamd/clamav-daemon.socket") CONFIG_FILES="$CONFIG_FILES clamd/clamav-daemon.socket" ;;
31229 31229
     "clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;;
31230
-    "clamonacc/Makefile") CONFIG_FILES="$CONFIG_FILES clamonacc/Makefile" ;;
31231 31230
     "clamsubmit/Makefile") CONFIG_FILES="$CONFIG_FILES clamsubmit/Makefile" ;;
31232 31231
     "clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;;
31233 31232
     "freshclam/clamav-freshclam.service") CONFIG_FILES="$CONFIG_FILES freshclam/clamav-freshclam.service" ;;
... ...
@@ -31259,6 +31289,7 @@ do
31259 31259
     "docs/man/clamdtop.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamdtop.1" ;;
31260 31260
     "docs/man/clamsubmit.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamsubmit.1" ;;
31261 31261
     "clamav-types.h") CONFIG_FILES="$CONFIG_FILES clamav-types.h" ;;
31262
+    "clamonacc/Makefile") CONFIG_FILES="$CONFIG_FILES clamonacc/Makefile" ;;
31262 31263
 
31263 31264
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
31264 31265
   esac
... ...
@@ -33132,6 +33163,14 @@ if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then
33132 33132
   as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.
33133 33133
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
33134 33134
 fi
33135
+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then
33136
+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.
33137
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
33138
+fi
33139
+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then
33140
+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.
33141
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
33142
+fi
33135 33143
 if test -z "${am__EXEEXT_TRUE}" && test -z "${am__EXEEXT_FALSE}"; then
33136 33144
   as_fn_error $? "conditional \"am__EXEEXT\" was never defined.
33137 33145
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -34135,7 +34174,6 @@ do
34135 34135
     "clamd/clamav-daemon.service") CONFIG_FILES="$CONFIG_FILES clamd/clamav-daemon.service" ;;
34136 34136
     "clamd/clamav-daemon.socket") CONFIG_FILES="$CONFIG_FILES clamd/clamav-daemon.socket" ;;
34137 34137
     "clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;;
34138
-    "clamonacc/Makefile") CONFIG_FILES="$CONFIG_FILES clamonacc/Makefile" ;;
34139 34138
     "clamsubmit/Makefile") CONFIG_FILES="$CONFIG_FILES clamsubmit/Makefile" ;;
34140 34139
     "clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;;
34141 34140
     "freshclam/clamav-freshclam.service") CONFIG_FILES="$CONFIG_FILES freshclam/clamav-freshclam.service" ;;
... ...
@@ -34167,6 +34205,7 @@ do
34167 34167
     "docs/man/clamdtop.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamdtop.1" ;;
34168 34168
     "docs/man/clamsubmit.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamsubmit.1" ;;
34169 34169
     "clamav-types.h") CONFIG_FILES="$CONFIG_FILES clamav-types.h" ;;
34170
+    "clamonacc/Makefile") CONFIG_FILES="$CONFIG_FILES clamonacc/Makefile" ;;
34170 34171
     "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;;
34171 34172
 
34172 34173
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
... ...
@@ -181,10 +181,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
181 181
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
182 182
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
183 183
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
184
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
184 185
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
185 186
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
186 187
 	$(top_srcdir)/m4/reorganization/strni.m4 \
187
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
188 188
 	$(top_srcdir)/m4/reorganization/types.m4 \
189 189
 	$(top_srcdir)/configure.ac
190 190
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -181,10 +181,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
181 181
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
182 182
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
183 183
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
184
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
184 185
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
185 186
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
186 187
 	$(top_srcdir)/m4/reorganization/strni.m4 \
187
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
188 188
 	$(top_srcdir)/m4/reorganization/types.m4 \
189 189
 	$(top_srcdir)/configure.ac
190 190
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -182,10 +182,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
182 182
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
183 183
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
184 184
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
185
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
185 186
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
186 187
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
187 188
 	$(top_srcdir)/m4/reorganization/strni.m4 \
188
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
189 189
 	$(top_srcdir)/m4/reorganization/types.m4 \
190 190
 	$(top_srcdir)/configure.ac
191 191
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -184,10 +184,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
184 184
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
185 185
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
186 186
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
187
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
187 188
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
188 189
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
189 190
 	$(top_srcdir)/m4/reorganization/strni.m4 \
190
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
191 191
 	$(top_srcdir)/m4/reorganization/types.m4 \
192 192
 	$(top_srcdir)/configure.ac
193 193
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -211,10 +211,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
211 211
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
212 212
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
213 213
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
214
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
214 215
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
215 216
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
216 217
 	$(top_srcdir)/m4/reorganization/strni.m4 \
217
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
218 218
 	$(top_srcdir)/m4/reorganization/types.m4 \
219 219
 	$(top_srcdir)/configure.ac
220 220
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -208,10 +208,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
208 208
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
209 209
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
210 210
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
211
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
211 212
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
212 213
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
213 214
 	$(top_srcdir)/m4/reorganization/strni.m4 \
214
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
215 215
 	$(top_srcdir)/m4/reorganization/types.m4 \
216 216
 	$(top_srcdir)/configure.ac
217 217
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -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@clean-local:
5769 5768
 @BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5769
+@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5770 5770
 clean: clean-am
5771 5771
 
5772 5772
 clean-am: clean-generic clean-libtool clean-local \
... ...
@@ -196,10 +196,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
196 196
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
197 197
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
198 198
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
199
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
199 200
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
200 201
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
201 202
 	$(top_srcdir)/m4/reorganization/strni.m4 \
202
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
203 203
 	$(top_srcdir)/m4/reorganization/types.m4 \
204 204
 	$(top_srcdir)/configure.ac
205 205
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -167,10 +167,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
167 167
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
168 168
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
169 169
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
170
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
170 171
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
171 172
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
172 173
 	$(top_srcdir)/m4/reorganization/strni.m4 \
173
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
174 174
 	$(top_srcdir)/m4/reorganization/types.m4 \
175 175
 	$(top_srcdir)/configure.ac
176 176
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -182,10 +182,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
182 182
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
183 183
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
184 184
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
185
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
185 186
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
186 187
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
187 188
 	$(top_srcdir)/m4/reorganization/strni.m4 \
188
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
189 189
 	$(top_srcdir)/m4/reorganization/types.m4 \
190 190
 	$(top_srcdir)/configure.ac
191 191
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -162,10 +162,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
162 162
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
163 163
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
164 164
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
165
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
165 166
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
166 167
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
167 168
 	$(top_srcdir)/m4/reorganization/strni.m4 \
168
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
169 169
 	$(top_srcdir)/m4/reorganization/types.m4 \
170 170
 	$(top_srcdir)/configure.ac
171 171
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
... ...
@@ -163,10 +163,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
163 163
 	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
164 164
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
165 165
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
166
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
166 167
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
167 168
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
168 169
 	$(top_srcdir)/m4/reorganization/strni.m4 \
169
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
170 170
 	$(top_srcdir)/m4/reorganization/types.m4 \
171 171
 	$(top_srcdir)/configure.ac
172 172
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \