autojunk'd

Makefile.in

@@ -147,37 +147,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -186,13 +164,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

clamav-milter/Makefile.in

@@ -144,37 +144,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -183,13 +161,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

clambc/Makefile.in

@@ -123,37 +123,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -162,13 +140,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

clamconf/Makefile.in

@@ -143,37 +143,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -182,13 +160,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

clamd/Makefile.in

@@ -144,37 +144,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -183,13 +161,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

clamdscan/Makefile.in

@@ -142,37 +142,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -181,13 +159,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

clamdtop/Makefile.in

@@ -123,37 +123,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -162,13 +140,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

clamonacc/Makefile.in

@@ -144,37 +144,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -183,13 +161,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

clamscan/Makefile.in

@@ -145,37 +145,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -184,13 +162,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

clamsubmit/Makefile.in

@@ -153,37 +153,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -192,13 +170,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

database/Makefile.in

@@ -142,37 +142,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -181,13 +159,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

docs/Makefile.in

@@ -142,37 +142,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -181,13 +159,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

etc/Makefile.in

@@ -143,37 +143,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -182,13 +160,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

freshclam/Makefile.in

@@ -145,37 +145,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -184,13 +162,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

fuzz/Makefile.in

@@ -172,37 +172,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -211,13 +189,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

libclamav/Makefile.in

@@ -169,37 +169,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -208,13 +186,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

libclamav/c++/Makefile.in

@@ -5765,8 +5765,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@clean-local:
 @BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
+@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \

libfreshclam/Makefile.in

@@ -155,37 +155,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -194,13 +172,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

libltdl/Makefile.in

@@ -128,37 +128,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -167,13 +145,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

sigtool/Makefile.in

@@ -143,37 +143,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -182,13 +160,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

test/Makefile.in

@@ -123,37 +123,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -162,13 +140,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

unit_tests/Makefile.in

@@ -124,37 +124,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
 	$(top_srcdir)/m4/reorganization/libs/systemd.m4 \
-	$(top_srcdir)/m4/reorganization/milter/check.m4 \
-	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
-	$(top_srcdir)/m4/reorganization/llvm.m4 \
-	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
-	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
-	$(top_srcdir)/m4/reorganization/yara.m4 \
-	$(top_srcdir)/m4/reorganization/os_checks.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
-	$(top_srcdir)/m4/reorganization/strni.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
-	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
-	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
-	$(top_srcdir)/m4/reorganization/dbdir.m4 \
-	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
 	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
 	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \
+	$(top_srcdir)/m4/reorganization/libs/iconv.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
 	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
 	$(top_srcdir)/m4/reorganization/usergroup.m4 \
@@ -163,13 +141,34 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 	$(top_srcdir)/m4/reorganization/nocache.m4 \
 	$(top_srcdir)/m4/reorganization/dns.m4 \
 	$(top_srcdir)/m4/reorganization/bigstack.m4 \
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
 	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
 	$(top_srcdir)/m4/reorganization/distcheck.m4 \
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
+	$(top_srcdir)/libclamav/c++/m4/llvm-opts.m4 \
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
+	$(top_srcdir)/m4/reorganization/yara.m4 \
+	$(top_srcdir)/m4/reorganization/code_checks/fts.m4 \
 	$(top_srcdir)/m4/reorganization/prelude.m4 \
 	$(top_srcdir)/m4/reorganization/bsd.m4 \
+	$(top_srcdir)/m4/reorganization/clamonacc.m4 \
 	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
 	$(top_srcdir)/m4/reorganization/substitutions.m4 \
+	$(top_srcdir)/m4/reorganization/strni.m4 \
 	$(top_srcdir)/m4/reorganization/types.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \