Browse code

Backport the autoconf reorganization done for Project Asymptote.

Shawn Webb authored on 2014/02/06 06:19:47
Showing 78 changed files
... ...
@@ -103,6 +103,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
103 103
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
104 104
 	$(top_srcdir)/m4/lt~obsolete.m4 \
105 105
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
106
+	$(top_srcdir)/m4/reorganization/version.m4 \
107
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
108
+	$(top_srcdir)/m4/reorganization/headers.m4 \
109
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
110
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
111
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
112
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
113
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
114
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
115
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
116
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
117
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
118
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
120
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
121
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
122
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
123
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
126
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
127
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
128
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
129
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
130
+	$(top_srcdir)/m4/reorganization/debug.m4 \
131
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
132
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
133
+	$(top_srcdir)/m4/reorganization/dns.m4 \
134
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
135
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
136
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
137
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
138
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
139
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
140
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
141
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
142
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
143
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
144
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
145
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
146
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
147
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
148
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
149
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
150
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
151
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
152
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
153
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
154
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
155
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
156
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
157
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
158
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
159
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
106 160
 	$(top_srcdir)/configure.ac
107 161
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
108 162
 	$(ACLOCAL_M4)
... ...
@@ -234,9 +288,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
234 234
 CHECK_LIBS = @CHECK_LIBS@
235 235
 CLAMAVGROUP = @CLAMAVGROUP@
236 236
 CLAMAVUSER = @CLAMAVUSER@
237
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
237 238
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
239
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
240
+CLAMBC_LIBS = @CLAMBC_LIBS@
241
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
242
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
238 243
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
244
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
245
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
246
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
239 247
 CLAMD_LIBS = @CLAMD_LIBS@
248
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
249
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
250
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
251
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
240 252
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
241 253
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
242 254
 CPP = @CPP@
... ...
@@ -256,6 +322,7 @@ ECHO_T = @ECHO_T@
256 256
 EGREP = @EGREP@
257 257
 EXEEXT = @EXEEXT@
258 258
 FGREP = @FGREP@
259
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
259 260
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
260 261
 GCOV = @GCOV@
261 262
 GENHTML = @GENHTML@
... ...
@@ -277,8 +344,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
277 277
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
278 278
 LIBBZ2 = @LIBBZ2@
279 279
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
280
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
280 281
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
281 282
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
283
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
282 284
 LIBLTDL = @LIBLTDL@
283 285
 LIBM = @LIBM@
284 286
 LIBOBJS = @LIBOBJS@
... ...
@@ -316,6 +385,7 @@ RANLIB = @RANLIB@
316 316
 SED = @SED@
317 317
 SET_MAKE = @SET_MAKE@
318 318
 SHELL = @SHELL@
319
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
319 320
 STRIP = @STRIP@
320 321
 THREAD_LIBS = @THREAD_LIBS@
321 322
 TH_SAFE = @TH_SAFE@
... ...
@@ -178,9 +178,6 @@
178 178
 /* Define to 1 if the system has the type `error_t'. */
179 179
 #undef HAVE_ERROR_T
180 180
 
181
-/* Define to 1 if you have the <fcntl.h> header file */
182
-#undef HAVE_FCNTL_H
183
-
184 181
 /* have working file descriptor passing support */
185 182
 #undef HAVE_FD_PASSING
186 183
 
... ...
@@ -190,9 +187,6 @@
190 190
 /* have getaddrinfo() */
191 191
 #undef HAVE_GETADDRINFO
192 192
 
193
-/* Define to 1 if you have the `getifaddrs' function. */
194
-#undef HAVE_GETIFADDRS
195
-
196 193
 /* Define to 1 if getpagesize() is available */
197 194
 #undef HAVE_GETPAGESIZE
198 195
 
... ...
@@ -275,9 +269,6 @@
275 275
 /* Define to 1 if you have the <ndir.h> header file. */
276 276
 #undef HAVE_NDIR_H
277 277
 
278
-/* Define to 1 if you have the <net/if_dl.h> header file */
279
-#undef HAVE_NET_IF_DL_H
280
-
281 278
 /* Define to 1 if you have the `opendir' function. */
282 279
 #undef HAVE_OPENDIR
283 280
 
... ...
@@ -374,9 +365,6 @@
374 374
 /* Define to 1 if sysconf(_SC_PAGESIZE) is available */
375 375
 #undef HAVE_SYSCONF_SC_PAGESIZE
376 376
 
377
-/* Define to 1 if you have the `sysctlbyname' function. */
378
-#undef HAVE_SYSCTLBYNAME
379
-
380 377
 /* Define to 1 if you have the <sys/dl.h> header file. */
381 378
 #undef HAVE_SYS_DL_H
382 379
 
... ...
@@ -526,6 +514,28 @@
526 526
 /* use syslog */
527 527
 #undef USE_SYSLOG
528 528
 
529
+/* Enable extensions on AIX 3, Interix.  */
530
+#ifndef _ALL_SOURCE
531
+# undef _ALL_SOURCE
532
+#endif
533
+/* Enable GNU extensions on systems that have them.  */
534
+#ifndef _GNU_SOURCE
535
+# undef _GNU_SOURCE
536
+#endif
537
+/* Enable threading extensions on Solaris.  */
538
+#ifndef _POSIX_PTHREAD_SEMANTICS
539
+# undef _POSIX_PTHREAD_SEMANTICS
540
+#endif
541
+/* Enable extensions on HP NonStop.  */
542
+#ifndef _TANDEM_SOURCE
543
+# undef _TANDEM_SOURCE
544
+#endif
545
+/* Enable general extensions on Solaris.  */
546
+#ifndef __EXTENSIONS__
547
+# undef __EXTENSIONS__
548
+#endif
549
+
550
+
529 551
 /* Version number of package */
530 552
 #undef VERSION
531 553
 
... ...
@@ -547,9 +557,19 @@
547 547
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
548 548
 #undef _LARGEFILE_SOURCE
549 549
 
550
+/* Define to 1 if on MINIX. */
551
+#undef _MINIX
552
+
553
+/* Define to 2 if the system does not provide POSIX.1 features except with
554
+   this defined. */
555
+#undef _POSIX_1_SOURCE
556
+
550 557
 /* POSIX compatibility */
551 558
 #undef _POSIX_PII_SOCKET
552 559
 
560
+/* Define to 1 if you need to in order for `stat' and other things to work. */
561
+#undef _POSIX_SOURCE
562
+
553 563
 /* thread safe */
554 564
 #undef _REENTRANT
555 565
 
... ...
@@ -85,6 +85,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
85 85
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
86 86
 	$(top_srcdir)/m4/lt~obsolete.m4 \
87 87
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
88
+	$(top_srcdir)/m4/reorganization/version.m4 \
89
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
90
+	$(top_srcdir)/m4/reorganization/headers.m4 \
91
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
92
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
93
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
97
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
99
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
100
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
104
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
105
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
108
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
109
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
110
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
111
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
112
+	$(top_srcdir)/m4/reorganization/debug.m4 \
113
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
114
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
115
+	$(top_srcdir)/m4/reorganization/dns.m4 \
116
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
117
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
118
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
120
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
121
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
122
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
126
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
127
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
131
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
132
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
133
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
134
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
135
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
136
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
137
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
139
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
140
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
141
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
88 142
 	$(top_srcdir)/configure.ac
89 143
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
90 144
 	$(ACLOCAL_M4)
... ...
@@ -200,9 +254,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
200 200
 CHECK_LIBS = @CHECK_LIBS@
201 201
 CLAMAVGROUP = @CLAMAVGROUP@
202 202
 CLAMAVUSER = @CLAMAVUSER@
203
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
203 204
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
205
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
206
+CLAMBC_LIBS = @CLAMBC_LIBS@
207
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
208
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
204 209
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
210
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
211
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
212
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
205 213
 CLAMD_LIBS = @CLAMD_LIBS@
214
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
215
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
216
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
217
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
206 218
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
207 219
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
208 220
 CPP = @CPP@
... ...
@@ -222,6 +288,7 @@ ECHO_T = @ECHO_T@
222 222
 EGREP = @EGREP@
223 223
 EXEEXT = @EXEEXT@
224 224
 FGREP = @FGREP@
225
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
225 226
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
226 227
 GCOV = @GCOV@
227 228
 GENHTML = @GENHTML@
... ...
@@ -243,8 +310,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
243 243
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
244 244
 LIBBZ2 = @LIBBZ2@
245 245
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
246
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
246 247
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
247 248
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
249
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
248 250
 LIBLTDL = @LIBLTDL@
249 251
 LIBM = @LIBM@
250 252
 LIBOBJS = @LIBOBJS@
... ...
@@ -282,6 +351,7 @@ RANLIB = @RANLIB@
282 282
 SED = @SED@
283 283
 SET_MAKE = @SET_MAKE@
284 284
 SHELL = @SHELL@
285
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
285 286
 STRIP = @STRIP@
286 287
 THREAD_LIBS = @THREAD_LIBS@
287 288
 TH_SAFE = @TH_SAFE@
... ...
@@ -66,6 +66,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
66 66
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
67 67
 	$(top_srcdir)/m4/lt~obsolete.m4 \
68 68
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
69
+	$(top_srcdir)/m4/reorganization/version.m4 \
70
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
71
+	$(top_srcdir)/m4/reorganization/headers.m4 \
72
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
73
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
74
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
75
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
76
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
77
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
78
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
79
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
80
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
81
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
82
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
83
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
84
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
85
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
86
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
87
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
88
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
89
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
90
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
91
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
92
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
93
+	$(top_srcdir)/m4/reorganization/debug.m4 \
94
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
95
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
96
+	$(top_srcdir)/m4/reorganization/dns.m4 \
97
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
98
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
99
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
102
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
103
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
104
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
108
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
109
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
110
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
111
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
112
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
113
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
114
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
115
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
116
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
117
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
118
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
119
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
120
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
121
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
122
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
69 123
 	$(top_srcdir)/configure.ac
70 124
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
71 125
 	$(ACLOCAL_M4)
... ...
@@ -136,9 +190,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
136 136
 CHECK_LIBS = @CHECK_LIBS@
137 137
 CLAMAVGROUP = @CLAMAVGROUP@
138 138
 CLAMAVUSER = @CLAMAVUSER@
139
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
139 140
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
141
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
142
+CLAMBC_LIBS = @CLAMBC_LIBS@
143
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
144
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
140 145
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
146
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
147
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
148
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
141 149
 CLAMD_LIBS = @CLAMD_LIBS@
150
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
151
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
152
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
153
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
142 154
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
143 155
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
144 156
 CPP = @CPP@
... ...
@@ -158,6 +224,7 @@ ECHO_T = @ECHO_T@
158 158
 EGREP = @EGREP@
159 159
 EXEEXT = @EXEEXT@
160 160
 FGREP = @FGREP@
161
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
161 162
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
162 163
 GCOV = @GCOV@
163 164
 GENHTML = @GENHTML@
... ...
@@ -179,8 +246,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
179 179
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
180 180
 LIBBZ2 = @LIBBZ2@
181 181
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
182
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
182 183
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
183 184
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
185
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
184 186
 LIBLTDL = @LIBLTDL@
185 187
 LIBM = @LIBM@
186 188
 LIBOBJS = @LIBOBJS@
... ...
@@ -218,6 +287,7 @@ RANLIB = @RANLIB@
218 218
 SED = @SED@
219 219
 SET_MAKE = @SET_MAKE@
220 220
 SHELL = @SHELL@
221
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
221 222
 STRIP = @STRIP@
222 223
 THREAD_LIBS = @THREAD_LIBS@
223 224
 TH_SAFE = @TH_SAFE@
... ...
@@ -84,6 +84,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
84 84
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
85 85
 	$(top_srcdir)/m4/lt~obsolete.m4 \
86 86
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
87
+	$(top_srcdir)/m4/reorganization/version.m4 \
88
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
89
+	$(top_srcdir)/m4/reorganization/headers.m4 \
90
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
91
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
92
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
93
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
97
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
99
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
104
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
108
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
109
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
110
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
111
+	$(top_srcdir)/m4/reorganization/debug.m4 \
112
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
113
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
114
+	$(top_srcdir)/m4/reorganization/dns.m4 \
115
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
116
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
117
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
118
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
120
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
121
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
122
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
126
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
127
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
131
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
132
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
133
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
134
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
135
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
136
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
137
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
139
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
140
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
87 141
 	$(top_srcdir)/configure.ac
88 142
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
89 143
 	$(ACLOCAL_M4)
... ...
@@ -154,9 +208,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
154 154
 CHECK_LIBS = @CHECK_LIBS@
155 155
 CLAMAVGROUP = @CLAMAVGROUP@
156 156
 CLAMAVUSER = @CLAMAVUSER@
157
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
157 158
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
159
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
160
+CLAMBC_LIBS = @CLAMBC_LIBS@
161
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
162
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
158 163
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
164
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
165
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
166
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
159 167
 CLAMD_LIBS = @CLAMD_LIBS@
168
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
169
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
170
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
171
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
160 172
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
161 173
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
162 174
 CPP = @CPP@
... ...
@@ -176,6 +242,7 @@ ECHO_T = @ECHO_T@
176 176
 EGREP = @EGREP@
177 177
 EXEEXT = @EXEEXT@
178 178
 FGREP = @FGREP@
179
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
179 180
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
180 181
 GCOV = @GCOV@
181 182
 GENHTML = @GENHTML@
... ...
@@ -197,8 +264,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
197 197
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
198 198
 LIBBZ2 = @LIBBZ2@
199 199
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
200
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
200 201
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
201 202
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
203
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
202 204
 LIBLTDL = @LIBLTDL@
203 205
 LIBM = @LIBM@
204 206
 LIBOBJS = @LIBOBJS@
... ...
@@ -236,6 +305,7 @@ RANLIB = @RANLIB@
236 236
 SED = @SED@
237 237
 SET_MAKE = @SET_MAKE@
238 238
 SHELL = @SHELL@
239
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
239 240
 STRIP = @STRIP@
240 241
 THREAD_LIBS = @THREAD_LIBS@
241 242
 TH_SAFE = @TH_SAFE@
... ...
@@ -84,6 +84,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
84 84
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
85 85
 	$(top_srcdir)/m4/lt~obsolete.m4 \
86 86
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
87
+	$(top_srcdir)/m4/reorganization/version.m4 \
88
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
89
+	$(top_srcdir)/m4/reorganization/headers.m4 \
90
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
91
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
92
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
93
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
97
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
99
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
104
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
108
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
109
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
110
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
111
+	$(top_srcdir)/m4/reorganization/debug.m4 \
112
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
113
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
114
+	$(top_srcdir)/m4/reorganization/dns.m4 \
115
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
116
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
117
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
118
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
120
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
121
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
122
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
126
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
127
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
131
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
132
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
133
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
134
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
135
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
136
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
137
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
139
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
140
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
87 141
 	$(top_srcdir)/configure.ac
88 142
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
89 143
 	$(ACLOCAL_M4)
... ...
@@ -167,9 +221,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
167 167
 CHECK_LIBS = @CHECK_LIBS@
168 168
 CLAMAVGROUP = @CLAMAVGROUP@
169 169
 CLAMAVUSER = @CLAMAVUSER@
170
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
170 171
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
172
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
173
+CLAMBC_LIBS = @CLAMBC_LIBS@
174
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
175
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
171 176
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
177
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
178
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
179
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
172 180
 CLAMD_LIBS = @CLAMD_LIBS@
181
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
182
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
183
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
184
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
173 185
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
174 186
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
175 187
 CPP = @CPP@
... ...
@@ -189,6 +255,7 @@ ECHO_T = @ECHO_T@
189 189
 EGREP = @EGREP@
190 190
 EXEEXT = @EXEEXT@
191 191
 FGREP = @FGREP@
192
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
192 193
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
193 194
 GCOV = @GCOV@
194 195
 GENHTML = @GENHTML@
... ...
@@ -210,8 +277,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
210 210
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
211 211
 LIBBZ2 = @LIBBZ2@
212 212
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
213
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
213 214
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
214 215
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
216
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
215 217
 LIBLTDL = @LIBLTDL@
216 218
 LIBM = @LIBM@
217 219
 LIBOBJS = @LIBOBJS@
... ...
@@ -249,6 +318,7 @@ RANLIB = @RANLIB@
249 249
 SED = @SED@
250 250
 SET_MAKE = @SET_MAKE@
251 251
 SHELL = @SHELL@
252
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
252 253
 STRIP = @STRIP@
253 254
 THREAD_LIBS = @THREAD_LIBS@
254 255
 TH_SAFE = @TH_SAFE@
... ...
@@ -84,6 +84,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
84 84
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
85 85
 	$(top_srcdir)/m4/lt~obsolete.m4 \
86 86
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
87
+	$(top_srcdir)/m4/reorganization/version.m4 \
88
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
89
+	$(top_srcdir)/m4/reorganization/headers.m4 \
90
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
91
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
92
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
93
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
97
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
99
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
104
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
108
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
109
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
110
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
111
+	$(top_srcdir)/m4/reorganization/debug.m4 \
112
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
113
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
114
+	$(top_srcdir)/m4/reorganization/dns.m4 \
115
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
116
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
117
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
118
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
120
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
121
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
122
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
126
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
127
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
131
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
132
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
133
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
134
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
135
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
136
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
137
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
139
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
140
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
87 141
 	$(top_srcdir)/configure.ac
88 142
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
89 143
 	$(ACLOCAL_M4)
... ...
@@ -165,9 +219,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
165 165
 CHECK_LIBS = @CHECK_LIBS@
166 166
 CLAMAVGROUP = @CLAMAVGROUP@
167 167
 CLAMAVUSER = @CLAMAVUSER@
168
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
168 169
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
170
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
171
+CLAMBC_LIBS = @CLAMBC_LIBS@
172
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
173
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
169 174
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
175
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
176
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
177
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
170 178
 CLAMD_LIBS = @CLAMD_LIBS@
179
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
180
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
181
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
182
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
171 183
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
172 184
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
173 185
 CPP = @CPP@
... ...
@@ -187,6 +253,7 @@ ECHO_T = @ECHO_T@
187 187
 EGREP = @EGREP@
188 188
 EXEEXT = @EXEEXT@
189 189
 FGREP = @FGREP@
190
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
190 191
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
191 192
 GCOV = @GCOV@
192 193
 GENHTML = @GENHTML@
... ...
@@ -208,8 +275,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
208 208
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
209 209
 LIBBZ2 = @LIBBZ2@
210 210
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
211
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
211 212
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
212 213
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
214
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
213 215
 LIBLTDL = @LIBLTDL@
214 216
 LIBM = @LIBM@
215 217
 LIBOBJS = @LIBOBJS@
... ...
@@ -247,6 +316,7 @@ RANLIB = @RANLIB@
247 247
 SED = @SED@
248 248
 SET_MAKE = @SET_MAKE@
249 249
 SHELL = @SHELL@
250
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
250 251
 STRIP = @STRIP@
251 252
 THREAD_LIBS = @THREAD_LIBS@
252 253
 TH_SAFE = @TH_SAFE@
... ...
@@ -66,6 +66,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
66 66
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
67 67
 	$(top_srcdir)/m4/lt~obsolete.m4 \
68 68
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
69
+	$(top_srcdir)/m4/reorganization/version.m4 \
70
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
71
+	$(top_srcdir)/m4/reorganization/headers.m4 \
72
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
73
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
74
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
75
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
76
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
77
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
78
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
79
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
80
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
81
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
82
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
83
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
84
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
85
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
86
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
87
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
88
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
89
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
90
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
91
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
92
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
93
+	$(top_srcdir)/m4/reorganization/debug.m4 \
94
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
95
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
96
+	$(top_srcdir)/m4/reorganization/dns.m4 \
97
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
98
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
99
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
102
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
103
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
104
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
108
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
109
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
110
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
111
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
112
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
113
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
114
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
115
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
116
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
117
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
118
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
119
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
120
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
121
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
122
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
69 123
 	$(top_srcdir)/configure.ac
70 124
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
71 125
 	$(ACLOCAL_M4)
... ...
@@ -171,9 +225,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
171 171
 CHECK_LIBS = @CHECK_LIBS@
172 172
 CLAMAVGROUP = @CLAMAVGROUP@
173 173
 CLAMAVUSER = @CLAMAVUSER@
174
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
174 175
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
176
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
177
+CLAMBC_LIBS = @CLAMBC_LIBS@
178
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
179
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
175 180
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
181
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
182
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
183
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
176 184
 CLAMD_LIBS = @CLAMD_LIBS@
185
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
186
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
187
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
188
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
177 189
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
178 190
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
179 191
 CPP = @CPP@
... ...
@@ -193,6 +259,7 @@ ECHO_T = @ECHO_T@
193 193
 EGREP = @EGREP@
194 194
 EXEEXT = @EXEEXT@
195 195
 FGREP = @FGREP@
196
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
196 197
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
197 198
 GCOV = @GCOV@
198 199
 GENHTML = @GENHTML@
... ...
@@ -214,8 +281,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
214 214
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
215 215
 LIBBZ2 = @LIBBZ2@
216 216
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
217
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
217 218
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
218 219
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
220
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
219 221
 LIBLTDL = @LIBLTDL@
220 222
 LIBM = @LIBM@
221 223
 LIBOBJS = @LIBOBJS@
... ...
@@ -253,6 +322,7 @@ RANLIB = @RANLIB@
253 253
 SED = @SED@
254 254
 SET_MAKE = @SET_MAKE@
255 255
 SHELL = @SHELL@
256
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
256 257
 STRIP = @STRIP@
257 258
 THREAD_LIBS = @THREAD_LIBS@
258 259
 TH_SAFE = @TH_SAFE@
... ...
@@ -85,6 +85,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
85 85
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
86 86
 	$(top_srcdir)/m4/lt~obsolete.m4 \
87 87
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
88
+	$(top_srcdir)/m4/reorganization/version.m4 \
89
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
90
+	$(top_srcdir)/m4/reorganization/headers.m4 \
91
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
92
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
93
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
97
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
99
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
100
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
104
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
105
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
108
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
109
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
110
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
111
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
112
+	$(top_srcdir)/m4/reorganization/debug.m4 \
113
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
114
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
115
+	$(top_srcdir)/m4/reorganization/dns.m4 \
116
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
117
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
118
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
120
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
121
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
122
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
126
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
127
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
131
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
132
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
133
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
134
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
135
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
136
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
137
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
139
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
140
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
141
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
88 142
 	$(top_srcdir)/configure.ac
89 143
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
90 144
 	$(ACLOCAL_M4)
... ...
@@ -156,9 +210,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
156 156
 CHECK_LIBS = @CHECK_LIBS@
157 157
 CLAMAVGROUP = @CLAMAVGROUP@
158 158
 CLAMAVUSER = @CLAMAVUSER@
159
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
159 160
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
161
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
162
+CLAMBC_LIBS = @CLAMBC_LIBS@
163
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
164
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
160 165
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
166
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
167
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
168
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
161 169
 CLAMD_LIBS = @CLAMD_LIBS@
170
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
171
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
172
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
173
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
162 174
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
163 175
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
164 176
 CPP = @CPP@
... ...
@@ -178,6 +244,7 @@ ECHO_T = @ECHO_T@
178 178
 EGREP = @EGREP@
179 179
 EXEEXT = @EXEEXT@
180 180
 FGREP = @FGREP@
181
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
181 182
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
182 183
 GCOV = @GCOV@
183 184
 GENHTML = @GENHTML@
... ...
@@ -199,8 +266,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
199 199
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
200 200
 LIBBZ2 = @LIBBZ2@
201 201
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
202
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
202 203
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
203 204
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
205
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
204 206
 LIBLTDL = @LIBLTDL@
205 207
 LIBM = @LIBM@
206 208
 LIBOBJS = @LIBOBJS@
... ...
@@ -238,6 +307,7 @@ RANLIB = @RANLIB@
238 238
 SED = @SED@
239 239
 SET_MAKE = @SET_MAKE@
240 240
 SHELL = @SHELL@
241
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
241 242
 STRIP = @STRIP@
242 243
 THREAD_LIBS = @THREAD_LIBS@
243 244
 TH_SAFE = @TH_SAFE@
... ...
@@ -84,6 +84,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
84 84
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
85 85
 	$(top_srcdir)/m4/lt~obsolete.m4 \
86 86
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
87
+	$(top_srcdir)/m4/reorganization/version.m4 \
88
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
89
+	$(top_srcdir)/m4/reorganization/headers.m4 \
90
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
91
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
92
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
93
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
97
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
99
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
104
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
108
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
109
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
110
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
111
+	$(top_srcdir)/m4/reorganization/debug.m4 \
112
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
113
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
114
+	$(top_srcdir)/m4/reorganization/dns.m4 \
115
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
116
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
117
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
118
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
120
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
121
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
122
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
126
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
127
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
131
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
132
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
133
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
134
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
135
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
136
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
137
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
139
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
140
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
87 141
 	$(top_srcdir)/configure.ac
88 142
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
89 143
 	$(ACLOCAL_M4)
... ...
@@ -154,9 +208,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
154 154
 CHECK_LIBS = @CHECK_LIBS@
155 155
 CLAMAVGROUP = @CLAMAVGROUP@
156 156
 CLAMAVUSER = @CLAMAVUSER@
157
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
157 158
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
159
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
160
+CLAMBC_LIBS = @CLAMBC_LIBS@
161
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
162
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
158 163
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
164
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
165
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
166
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
159 167
 CLAMD_LIBS = @CLAMD_LIBS@
168
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
169
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
170
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
171
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
160 172
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
161 173
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
162 174
 CPP = @CPP@
... ...
@@ -176,6 +242,7 @@ ECHO_T = @ECHO_T@
176 176
 EGREP = @EGREP@
177 177
 EXEEXT = @EXEEXT@
178 178
 FGREP = @FGREP@
179
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
179 180
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
180 181
 GCOV = @GCOV@
181 182
 GENHTML = @GENHTML@
... ...
@@ -197,8 +264,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
197 197
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
198 198
 LIBBZ2 = @LIBBZ2@
199 199
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
200
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
200 201
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
201 202
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
203
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
202 204
 LIBLTDL = @LIBLTDL@
203 205
 LIBM = @LIBM@
204 206
 LIBOBJS = @LIBOBJS@
... ...
@@ -236,6 +305,7 @@ RANLIB = @RANLIB@
236 236
 SED = @SED@
237 237
 SET_MAKE = @SET_MAKE@
238 238
 SHELL = @SHELL@
239
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
239 240
 STRIP = @STRIP@
240 241
 THREAD_LIBS = @THREAD_LIBS@
241 242
 TH_SAFE = @TH_SAFE@
... ...
@@ -198,6 +198,7 @@ test -x / || exit 1"
198 198
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
199 199
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
200 200
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
201
+test \$(( 1 + 1 )) = 2 || exit 1
201 202
 
202 203
   test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
203 204
     ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
... ...
@@ -205,8 +206,7 @@ test -x / || exit 1"
205 205
     ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
206 206
     PATH=/empty FPATH=/empty; export PATH FPATH
207 207
     test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
208
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
209
-test \$(( 1 + 1 )) = 2 || exit 1"
208
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
210 209
   if (eval "$as_required") 2>/dev/null; then :
211 210
   as_have_required=yes
212 211
 else
... ...
@@ -645,6 +645,33 @@ LTLIBOBJS
645 645
 LIBOBJS
646 646
 ENABLE_CLAMSUBMIT_FALSE
647 647
 ENABLE_CLAMSUBMIT_TRUE
648
+CLAMBC_LIBS
649
+CLAMDTOP_LIBS
650
+THREAD_LIBS
651
+TH_SAFE
652
+CLAMDSCAN_LIBS
653
+CLAMSCAN_LIBS
654
+FRESHCLAM_LIBS
655
+CLAMAV_MILTER_LIBS
656
+CLAMMEM_LIBS
657
+CLAMD_LIBS
658
+LIBCLAMAV_LIBS
659
+LIBCLAMSHARED_CPPFLAGS
660
+CLAMBC_CPPFLAGS
661
+CLAMDTOP_CPPFLAGS
662
+CLAMCONF_CPPFLAGS
663
+SIGTOOL_CPPFLAGS
664
+LIBCLAMAV_CPPFLAGS
665
+CLAMAV_MILTER_CPPFLAGS
666
+CLAMMEM_CPPFLAGS
667
+CLAMD_CPPFLAGS
668
+CLAMDSCAN_CPPFLAGS
669
+CLAMSCAN_CPPFLAGS
670
+FRESHCLAM_CPPFLAGS
671
+XML_LIBS
672
+XML_CPPFLAGS
673
+CLAMSUBMIT_CFLAGS
674
+CLAMSUBMIT_LIBS
648 675
 subdirs
649 676
 WERR_CFLAGS_MILTER
650 677
 WERR_CFLAGS
... ...
@@ -659,19 +686,8 @@ HAVE_MILTER_FALSE
659 659
 HAVE_MILTER_TRUE
660 660
 BUILD_CLAMD_FALSE
661 661
 BUILD_CLAMD_TRUE
662
-CLAMSUBMIT_CFLAGS
663
-CLAMSUBMIT_LIBS
664
-THREAD_LIBS
665
-TH_SAFE
666
-CLAMDSCAN_LIBS
667
-FRESHCLAM_LIBS
668
-CLAMAV_MILTER_LIBS
669
-CLAMD_LIBS
670
-LIBCLAMAV_LIBS
671 662
 CFGDIR
672 663
 DBDIR
673
-XML_LIBS
674
-XML_CPPFLAGS
675 664
 ENABLE_UNRAR_FALSE
676 665
 ENABLE_UNRAR_TRUE
677 666
 HAVE_LIBBZ2_FALSE
... ...
@@ -692,10 +708,10 @@ HAVE_LIBCHECK_TRUE
692 692
 CHECK_LIBS
693 693
 CHECK_CPPFLAGS
694 694
 BUILD_CONFIGURE_FLAGS
695
-GPERF
696 695
 VERSIONSCRIPT_FALSE
697 696
 VERSIONSCRIPT_TRUE
698 697
 VERSIONSCRIPTFLAG
698
+GPERF
699 699
 LIBM
700 700
 LTDLOPEN
701 701
 LT_CONFIG_H
... ...
@@ -715,7 +731,6 @@ INCLTDL
715 715
 LTDLINCL
716 716
 LTDLDEPS
717 717
 LIBLTDL
718
-CPP
719 718
 OTOOL64
720 719
 OTOOL
721 720
 LIPO
... ...
@@ -727,14 +742,19 @@ ac_ct_AR
727 727
 AR
728 728
 DLLTOOL
729 729
 OBJDUMP
730
+LN_S
730 731
 NM
731 732
 ac_ct_DUMPBIN
732 733
 DUMPBIN
733 734
 LD
734 735
 FGREP
735
-EGREP
736
-GREP
737 736
 SED
737
+LIBTOOL
738
+LIBCLAMAV_VERSION
739
+AM_BACKSLASH
740
+AM_DEFAULT_VERBOSITY
741
+AM_DEFAULT_V
742
+AM_V
738 743
 am__fastdepCC_FALSE
739 744
 am__fastdepCC_TRUE
740 745
 CCDEPMODE
... ...
@@ -745,20 +765,6 @@ AMDEP_TRUE
745 745
 am__quote
746 746
 am__include
747 747
 DEPDIR
748
-OBJEXT
749
-EXEEXT
750
-ac_ct_CC
751
-CPPFLAGS
752
-LDFLAGS
753
-CFLAGS
754
-CC
755
-LIBTOOL
756
-LN_S
757
-LIBCLAMAV_VERSION
758
-AM_BACKSLASH
759
-AM_DEFAULT_VERBOSITY
760
-AM_DEFAULT_V
761
-AM_V
762 748
 am__untar
763 749
 am__tar
764 750
 AMTAR
... ...
@@ -782,6 +788,16 @@ am__isrc
782 782
 INSTALL_DATA
783 783
 INSTALL_SCRIPT
784 784
 INSTALL_PROGRAM
785
+EGREP
786
+GREP
787
+CPP
788
+OBJEXT
789
+EXEEXT
790
+ac_ct_CC
791
+CPPFLAGS
792
+LDFLAGS
793
+CFLAGS
794
+CC
785 795
 target_os
786 796
 target_vendor
787 797
 target_cpu
... ...
@@ -835,12 +851,12 @@ SHELL'
835 835
 ac_subst_files=''
836 836
 ac_user_opts='
837 837
 enable_option_checking
838
+enable_dependency_tracking
838 839
 enable_silent_rules
839 840
 enable_static
840 841
 enable_shared
841 842
 with_pic
842 843
 enable_fast_install
843
-enable_dependency_tracking
844 844
 with_gnu_ld
845 845
 with_sysroot
846 846
 enable_libtool_lock
... ...
@@ -860,10 +876,7 @@ with_zlib
860 860
 enable_zlib_vcheck
861 861
 enable_bzip2
862 862
 with_libbz2_prefix
863
-with_libcurl
864 863
 enable_unrar
865
-enable_xml
866
-with_xml
867 864
 enable_getaddrinfo
868 865
 enable_ipv6
869 866
 enable_dns
... ...
@@ -876,8 +889,6 @@ enable_id_check
876 876
 enable_yp_check
877 877
 with_user
878 878
 with_group
879
-enable_clamav
880
-enable_debug
881 879
 with_version
882 880
 enable_no_cache
883 881
 enable_dns_fix
... ...
@@ -891,6 +902,10 @@ with_libpdcurses_prefix
891 891
 enable_distcheck_werror
892 892
 enable_llvm
893 893
 enable_sha_collector_for_internal_use
894
+with_libcurl
895
+with_libconfig
896
+enable_xml
897
+with_xml
894 898
 '
895 899
       ac_precious_vars='build_alias
896 900
 host_alias
... ...
@@ -1521,14 +1536,14 @@ Optional Features:
1521 1521
   --disable-option-checking  ignore unrecognized --enable/--with options
1522 1522
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1523 1523
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1524
+  --disable-dependency-tracking  speeds up one-time build
1525
+  --enable-dependency-tracking   do not reject slow dependency extractors
1524 1526
   --enable-silent-rules          less verbose build output (undo: `make V=1')
1525 1527
   --disable-silent-rules         verbose build output (undo: `make V=0')
1526 1528
   --enable-static[=PKGS]  build static libraries [default=no]
1527 1529
   --enable-shared[=PKGS]  build shared libraries [default=yes]
1528 1530
   --enable-fast-install[=PKGS]
1529 1531
                           optimize for fast installation [default=yes]
1530
-  --disable-dependency-tracking  speeds up one-time build
1531
-  --enable-dependency-tracking   do not reject slow dependency extractors
1532 1532
   --disable-libtool-lock  avoid locking (might break parallel builds)
1533 1533
   --enable-ltdl-install   install libltdl
1534 1534
   --disable-gcc-vcheck	  do not check for buggy gcc version
... ...
@@ -1541,8 +1556,7 @@ Optional Features:
1541 1541
                           (and sometimes confusing) to the casual installer
1542 1542
   --disable-zlib-vcheck	  do not check for buggy zlib version
1543 1543
   --disable-bzip2	  disable bzip2 support
1544
-  --disable-unrar	  do not build libclamunrar and libclamunrar_iface
1545
-  --disable-xml	  disable DMG and XAR support
1544
+  --disable-unrar	  don't build libclamunrar and libclamunrar_iface
1546 1545
   --disable-getaddrinfo          disable support for getaddrinfo
1547 1546
   --disable-ipv6          disable IPv6 support
1548 1547
   --disable-dns           disable support for database verification through
... ...
@@ -1550,11 +1564,9 @@ Optional Features:
1550 1550
   --disable-fanotify	  disable fanotify support (Linux only)
1551 1551
   --enable-milter	  build clamav-milter
1552 1552
   --disable-pthreads      disable POSIX threads support
1553
-  --disable-cr		  do not link with C reentrant library (BSD)
1553
+  --disable-cr		  don't link with C reentrant library (BSD)
1554 1554
   --enable-id-check	  use id utility instead of /etc/passwd parsing
1555 1555
   --enable-yp-check	  use ypmatch utility instead of /etc/passwd parsing
1556
-  --disable-clamav	  disable test for clamav user/group
1557
-  --enable-debug	  enable debug code
1558 1556
   --enable-no-cache	  use "Cache-Control: no-cache" in freshclam
1559 1557
   --enable-dns-fix	  enable workaround for broken DNS servers (as in SpeedTouch 510)
1560 1558
   --enable-bigstack	  increase thread stack size
... ...
@@ -1565,6 +1577,7 @@ Optional Features:
1565 1565
                           enable warnings as error for distcheck [default=no]
1566 1566
   --enable-llvm           Enable 'llvm' JIT/verifier support [default=auto]
1567 1567
 
1568
+  --disable-xml	  disable DMG and XAR support
1568 1569
 
1569 1570
 Optional Packages:
1570 1571
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
... ...
@@ -1584,10 +1597,6 @@ Optional Packages:
1584 1584
 			  /usr/local or /usr if not found in /usr/local)
1585 1585
   --with-libbz2-prefix[=DIR]  search for libbz2 in DIR/include and DIR/lib
1586 1586
   --without-libbz2-prefix     don't search for libbz2 in includedir and libdir
1587
-  --with-libcurl=DIR   path to directory containing libcurl (default=
1588
-    /usr/local or /usr if not found in /usr/local)
1589
-  --with-xml=DIR	  path to directory containing libxml2 library (default=
1590
-			  /usr/local or /usr if not found in /usr/local)
1591 1587
   --with-iconv supports iconv() (default=auto)
1592 1588
   --with-user=uid	  name of the clamav user (default=clamav)
1593 1589
   --with-group=gid	  name of the clamav group (default=clamav)
... ...
@@ -1597,6 +1606,12 @@ Optional Packages:
1597 1597
   --without-libncurses-prefix     don't search for libncurses in includedir and libdir
1598 1598
   --with-libpdcurses-prefix[=DIR]  search for libpdcurses in DIR/include and DIR/lib
1599 1599
   --without-libpdcurses-prefix     don't search for libpdcurses in includedir and libdir
1600
+  --with-libcurl=DIR   path to directory containing libcurl (default=
1601
+    /usr/local or /usr if not found in /usr/local)
1602
+  --with-libconfig=DIR   path to directory containing libconfig (default=
1603
+    /usr/local or /usr if not found in /usr/local)
1604
+  --with-xml=DIR	  path to directory containing libxml2 library (default=
1605
+			  /usr/local or /usr if not found in /usr/local)
1600 1606
 
1601 1607
 Some influential environment variables:
1602 1608
   CC          C compiler command
... ...
@@ -1727,21 +1742,20 @@ fi
1727 1727
 
1728 1728
 } # ac_fn_c_try_compile
1729 1729
 
1730
-# ac_fn_c_try_link LINENO
1731
-# -----------------------
1732
-# Try to link conftest.$ac_ext, and return whether this succeeded.
1733
-ac_fn_c_try_link ()
1730
+# ac_fn_c_try_cpp LINENO
1731
+# ----------------------
1732
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1733
+ac_fn_c_try_cpp ()
1734 1734
 {
1735 1735
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1736
-  rm -f conftest.$ac_objext conftest$ac_exeext
1737
-  if { { ac_try="$ac_link"
1736
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
1738 1737
 case "(($ac_try" in
1739 1738
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1740 1739
   *) ac_try_echo=$ac_try;;
1741 1740
 esac
1742 1741
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1743 1742
 $as_echo "$ac_try_echo"; } >&5
1744
-  (eval "$ac_link") 2>conftest.err
1743
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1745 1744
   ac_status=$?
1746 1745
   if test -s conftest.err; then
1747 1746
     grep -v '^ *+' conftest.err >conftest.er1
... ...
@@ -1749,97 +1763,112 @@ $as_echo "$ac_try_echo"; } >&5
1749 1749
     mv -f conftest.er1 conftest.err
1750 1750
   fi
1751 1751
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1752
-  test $ac_status = 0; } && {
1753
-	 test -z "$ac_c_werror_flag" ||
1752
+  test $ac_status = 0; } > conftest.i && {
1753
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1754 1754
 	 test ! -s conftest.err
1755
-       } && test -s conftest$ac_exeext && {
1756
-	 test "$cross_compiling" = yes ||
1757
-	 test -x conftest$ac_exeext
1758 1755
        }; then :
1759 1756
   ac_retval=0
1760 1757
 else
1761 1758
   $as_echo "$as_me: failed program was:" >&5
1762 1759
 sed 's/^/| /' conftest.$ac_ext >&5
1763 1760
 
1764
-	ac_retval=1
1761
+    ac_retval=1
1765 1762
 fi
1766
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
1767
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
1768
-  # interfere with the next link command; also delete a directory that is
1769
-  # left behind by Apple's compiler.  We do this before executing the actions.
1770
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1771 1763
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1772 1764
   as_fn_set_status $ac_retval
1773 1765
 
1774
-} # ac_fn_c_try_link
1766
+} # ac_fn_c_try_cpp
1775 1767
 
1776
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
1768
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
1777 1769
 # -------------------------------------------------------
1778
-# Tests whether HEADER exists and can be compiled using the include files in
1779
-# INCLUDES, setting the cache variable VAR accordingly.
1780
-ac_fn_c_check_header_compile ()
1770
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
1771
+# the include files in INCLUDES and setting the cache variable VAR
1772
+# accordingly.
1773
+ac_fn_c_check_header_mongrel ()
1781 1774
 {
1782 1775
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1776
+  if eval \${$3+:} false; then :
1783 1777
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1784 1778
 $as_echo_n "checking for $2... " >&6; }
1785 1779
 if eval \${$3+:} false; then :
1786 1780
   $as_echo_n "(cached) " >&6
1781
+fi
1782
+eval ac_res=\$$3
1783
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1784
+$as_echo "$ac_res" >&6; }
1787 1785
 else
1788
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1786
+  # Is the header compilable?
1787
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
1788
+$as_echo_n "checking $2 usability... " >&6; }
1789
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1789 1790
 /* end confdefs.h.  */
1790 1791
 $4
1791 1792
 #include <$2>
1792 1793
 _ACEOF
1793 1794
 if ac_fn_c_try_compile "$LINENO"; then :
1794
-  eval "$3=yes"
1795
+  ac_header_compiler=yes
1795 1796
 else
1796
-  eval "$3=no"
1797
+  ac_header_compiler=no
1797 1798
 fi
1798 1799
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1799
-fi
1800
-eval ac_res=\$$3
1801
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1802
-$as_echo "$ac_res" >&6; }
1803
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1800
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
1801
+$as_echo "$ac_header_compiler" >&6; }
1804 1802
 
1805
-} # ac_fn_c_check_header_compile
1803
+# Is the header present?
1804
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
1805
+$as_echo_n "checking $2 presence... " >&6; }
1806
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1807
+/* end confdefs.h.  */
1808
+#include <$2>
1809
+_ACEOF
1810
+if ac_fn_c_try_cpp "$LINENO"; then :
1811
+  ac_header_preproc=yes
1812
+else
1813
+  ac_header_preproc=no
1814
+fi
1815
+rm -f conftest.err conftest.i conftest.$ac_ext
1816
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1817
+$as_echo "$ac_header_preproc" >&6; }
1806 1818
 
1807
-# ac_fn_c_try_cpp LINENO
1808
-# ----------------------
1809
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1810
-ac_fn_c_try_cpp ()
1811
-{
1812
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1813
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
1814
-case "(($ac_try" in
1815
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1816
-  *) ac_try_echo=$ac_try;;
1819
+# So?  What about this header?
1820
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
1821
+  yes:no: )
1822
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
1823
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
1824
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1825
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1826
+    ;;
1827
+  no:yes:* )
1828
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
1829
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
1830
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
1831
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
1832
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
1833
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
1834
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
1835
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
1836
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1837
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1838
+( $as_echo "## -------------------------------------- ##
1839
+## Report this to http://bugs.clamav.net/ ##
1840
+## -------------------------------------- ##"
1841
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
1842
+    ;;
1817 1843
 esac
1818
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1819
-$as_echo "$ac_try_echo"; } >&5
1820
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1821
-  ac_status=$?
1822
-  if test -s conftest.err; then
1823
-    grep -v '^ *+' conftest.err >conftest.er1
1824
-    cat conftest.er1 >&5
1825
-    mv -f conftest.er1 conftest.err
1826
-  fi
1827
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1828
-  test $ac_status = 0; } > conftest.i && {
1829
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1830
-	 test ! -s conftest.err
1831
-       }; then :
1832
-  ac_retval=0
1844
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1845
+$as_echo_n "checking for $2... " >&6; }
1846
+if eval \${$3+:} false; then :
1847
+  $as_echo_n "(cached) " >&6
1833 1848
 else
1834
-  $as_echo "$as_me: failed program was:" >&5
1835
-sed 's/^/| /' conftest.$ac_ext >&5
1836
-
1837
-    ac_retval=1
1849
+  eval "$3=\$ac_header_compiler"
1850
+fi
1851
+eval ac_res=\$$3
1852
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1853
+$as_echo "$ac_res" >&6; }
1838 1854
 fi
1839 1855
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1840
-  as_fn_set_status $ac_retval
1841 1856
 
1842
-} # ac_fn_c_try_cpp
1857
+} # ac_fn_c_check_header_mongrel
1843 1858
 
1844 1859
 # ac_fn_c_try_run LINENO
1845 1860
 # ----------------------
... ...
@@ -1883,6 +1912,83 @@ fi
1883 1883
 
1884 1884
 } # ac_fn_c_try_run
1885 1885
 
1886
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
1887
+# -------------------------------------------------------
1888
+# Tests whether HEADER exists and can be compiled using the include files in
1889
+# INCLUDES, setting the cache variable VAR accordingly.
1890
+ac_fn_c_check_header_compile ()
1891
+{
1892
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1893
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1894
+$as_echo_n "checking for $2... " >&6; }
1895
+if eval \${$3+:} false; then :
1896
+  $as_echo_n "(cached) " >&6
1897
+else
1898
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1899
+/* end confdefs.h.  */
1900
+$4
1901
+#include <$2>
1902
+_ACEOF
1903
+if ac_fn_c_try_compile "$LINENO"; then :
1904
+  eval "$3=yes"
1905
+else
1906
+  eval "$3=no"
1907
+fi
1908
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1909
+fi
1910
+eval ac_res=\$$3
1911
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1912
+$as_echo "$ac_res" >&6; }
1913
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1914
+
1915
+} # ac_fn_c_check_header_compile
1916
+
1917
+# ac_fn_c_try_link LINENO
1918
+# -----------------------
1919
+# Try to link conftest.$ac_ext, and return whether this succeeded.
1920
+ac_fn_c_try_link ()
1921
+{
1922
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1923
+  rm -f conftest.$ac_objext conftest$ac_exeext
1924
+  if { { ac_try="$ac_link"
1925
+case "(($ac_try" in
1926
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1927
+  *) ac_try_echo=$ac_try;;
1928
+esac
1929
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1930
+$as_echo "$ac_try_echo"; } >&5
1931
+  (eval "$ac_link") 2>conftest.err
1932
+  ac_status=$?
1933
+  if test -s conftest.err; then
1934
+    grep -v '^ *+' conftest.err >conftest.er1
1935
+    cat conftest.er1 >&5
1936
+    mv -f conftest.er1 conftest.err
1937
+  fi
1938
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1939
+  test $ac_status = 0; } && {
1940
+	 test -z "$ac_c_werror_flag" ||
1941
+	 test ! -s conftest.err
1942
+       } && test -s conftest$ac_exeext && {
1943
+	 test "$cross_compiling" = yes ||
1944
+	 test -x conftest$ac_exeext
1945
+       }; then :
1946
+  ac_retval=0
1947
+else
1948
+  $as_echo "$as_me: failed program was:" >&5
1949
+sed 's/^/| /' conftest.$ac_ext >&5
1950
+
1951
+	ac_retval=1
1952
+fi
1953
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
1954
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
1955
+  # interfere with the next link command; also delete a directory that is
1956
+  # left behind by Apple's compiler.  We do this before executing the actions.
1957
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1958
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1959
+  as_fn_set_status $ac_retval
1960
+
1961
+} # ac_fn_c_try_link
1962
+
1886 1963
 # ac_fn_c_check_func LINENO FUNC VAR
1887 1964
 # ----------------------------------
1888 1965
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
... ...
@@ -2049,97 +2155,6 @@ $as_echo "$ac_res" >&6; }
2049 2049
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2050 2050
 
2051 2051
 } # ac_fn_c_check_type
2052
-
2053
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
2054
-# -------------------------------------------------------
2055
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
2056
-# the include files in INCLUDES and setting the cache variable VAR
2057
-# accordingly.
2058
-ac_fn_c_check_header_mongrel ()
2059
-{
2060
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2061
-  if eval \${$3+:} false; then :
2062
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2063
-$as_echo_n "checking for $2... " >&6; }
2064
-if eval \${$3+:} false; then :
2065
-  $as_echo_n "(cached) " >&6
2066
-fi
2067
-eval ac_res=\$$3
2068
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2069
-$as_echo "$ac_res" >&6; }
2070
-else
2071
-  # Is the header compilable?
2072
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
2073
-$as_echo_n "checking $2 usability... " >&6; }
2074
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2075
-/* end confdefs.h.  */
2076
-$4
2077
-#include <$2>
2078
-_ACEOF
2079
-if ac_fn_c_try_compile "$LINENO"; then :
2080
-  ac_header_compiler=yes
2081
-else
2082
-  ac_header_compiler=no
2083
-fi
2084
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2085
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
2086
-$as_echo "$ac_header_compiler" >&6; }
2087
-
2088
-# Is the header present?
2089
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
2090
-$as_echo_n "checking $2 presence... " >&6; }
2091
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2092
-/* end confdefs.h.  */
2093
-#include <$2>
2094
-_ACEOF
2095
-if ac_fn_c_try_cpp "$LINENO"; then :
2096
-  ac_header_preproc=yes
2097
-else
2098
-  ac_header_preproc=no
2099
-fi
2100
-rm -f conftest.err conftest.i conftest.$ac_ext
2101
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
2102
-$as_echo "$ac_header_preproc" >&6; }
2103
-
2104
-# So?  What about this header?
2105
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
2106
-  yes:no: )
2107
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
2108
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
2109
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2110
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2111
-    ;;
2112
-  no:yes:* )
2113
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
2114
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
2115
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
2116
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
2117
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
2118
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2119
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
2120
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
2121
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2122
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2123
-( $as_echo "## -------------------------------------- ##
2124
-## Report this to http://bugs.clamav.net/ ##
2125
-## -------------------------------------- ##"
2126
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
2127
-    ;;
2128
-esac
2129
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2130
-$as_echo_n "checking for $2... " >&6; }
2131
-if eval \${$3+:} false; then :
2132
-  $as_echo_n "(cached) " >&6
2133
-else
2134
-  eval "$3=\$ac_header_compiler"
2135
-fi
2136
-eval ac_res=\$$3
2137
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2138
-$as_echo "$ac_res" >&6; }
2139
-fi
2140
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2141
-
2142
-} # ac_fn_c_check_header_mongrel
2143 2052
 cat >config.log <<_ACEOF
2144 2053
 This file contains any messages produced by compilers while
2145 2054
 running configure, to aid debugging if configure makes a mistake.
... ...
@@ -2826,859 +2841,6 @@ do
2826 2826
 done
2827 2827
 
2828 2828
 
2829
-
2830
-am__api_version='1.11'
2831
-
2832
-# Find a good install program.  We prefer a C program (faster),
2833
-# so one script is as good as another.  But avoid the broken or
2834
-# incompatible versions:
2835
-# SysV /etc/install, /usr/sbin/install
2836
-# SunOS /usr/etc/install
2837
-# IRIX /sbin/install
2838
-# AIX /bin/install
2839
-# AmigaOS /C/install, which installs bootblocks on floppy discs
2840
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
2841
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
2842
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
2843
-# OS/2's system install, which has a completely different semantic
2844
-# ./install, which can be erroneously created by make from ./install.sh.
2845
-# Reject install programs that cannot install multiple files.
2846
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
2847
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
2848
-if test -z "$INSTALL"; then
2849
-if ${ac_cv_path_install+:} false; then :
2850
-  $as_echo_n "(cached) " >&6
2851
-else
2852
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2853
-for as_dir in $PATH
2854
-do
2855
-  IFS=$as_save_IFS
2856
-  test -z "$as_dir" && as_dir=.
2857
-    # Account for people who put trailing slashes in PATH elements.
2858
-case $as_dir/ in #((
2859
-  ./ | .// | /[cC]/* | \
2860
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
2861
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
2862
-  /usr/ucb/* ) ;;
2863
-  *)
2864
-    # OSF1 and SCO ODT 3.0 have their own names for install.
2865
-    # Don't use installbsd from OSF since it installs stuff as root
2866
-    # by default.
2867
-    for ac_prog in ginstall scoinst install; do
2868
-      for ac_exec_ext in '' $ac_executable_extensions; do
2869
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2870
-	  if test $ac_prog = install &&
2871
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2872
-	    # AIX install.  It has an incompatible calling convention.
2873
-	    :
2874
-	  elif test $ac_prog = install &&
2875
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2876
-	    # program-specific install script used by HP pwplus--don't use.
2877
-	    :
2878
-	  else
2879
-	    rm -rf conftest.one conftest.two conftest.dir
2880
-	    echo one > conftest.one
2881
-	    echo two > conftest.two
2882
-	    mkdir conftest.dir
2883
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
2884
-	      test -s conftest.one && test -s conftest.two &&
2885
-	      test -s conftest.dir/conftest.one &&
2886
-	      test -s conftest.dir/conftest.two
2887
-	    then
2888
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
2889
-	      break 3
2890
-	    fi
2891
-	  fi
2892
-	fi
2893
-      done
2894
-    done
2895
-    ;;
2896
-esac
2897
-
2898
-  done
2899
-IFS=$as_save_IFS
2900
-
2901
-rm -rf conftest.one conftest.two conftest.dir
2902
-
2903
-fi
2904
-  if test "${ac_cv_path_install+set}" = set; then
2905
-    INSTALL=$ac_cv_path_install
2906
-  else
2907
-    # As a last resort, use the slow shell script.  Don't cache a
2908
-    # value for INSTALL within a source directory, because that will
2909
-    # break other packages using the cache if that directory is
2910
-    # removed, or if the value is a relative name.
2911
-    INSTALL=$ac_install_sh
2912
-  fi
2913
-fi
2914
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
2915
-$as_echo "$INSTALL" >&6; }
2916
-
2917
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2918
-# It thinks the first close brace ends the variable substitution.
2919
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
2920
-
2921
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
2922
-
2923
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2924
-
2925
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2926
-$as_echo_n "checking whether build environment is sane... " >&6; }
2927
-# Just in case
2928
-sleep 1
2929
-echo timestamp > conftest.file
2930
-# Reject unsafe characters in $srcdir or the absolute working directory
2931
-# name.  Accept space and tab only in the latter.
2932
-am_lf='
2933
-'
2934
-case `pwd` in
2935
-  *[\\\"\#\$\&\'\`$am_lf]*)
2936
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
2937
-esac
2938
-case $srcdir in
2939
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
2940
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2941
-esac
2942
-
2943
-# Do `set' in a subshell so we don't clobber the current shell's
2944
-# arguments.  Must try -L first in case configure is actually a
2945
-# symlink; some systems play weird games with the mod time of symlinks
2946
-# (eg FreeBSD returns the mod time of the symlink's containing
2947
-# directory).
2948
-if (
2949
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2950
-   if test "$*" = "X"; then
2951
-      # -L didn't work.
2952
-      set X `ls -t "$srcdir/configure" conftest.file`
2953
-   fi
2954
-   rm -f conftest.file
2955
-   if test "$*" != "X $srcdir/configure conftest.file" \
2956
-      && test "$*" != "X conftest.file $srcdir/configure"; then
2957
-
2958
-      # If neither matched, then we have a broken ls.  This can happen
2959
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
2960
-      # broken ls alias from the environment.  This has actually
2961
-      # happened.  Such a system could not be considered "sane".
2962
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
2963
-alias in your environment" "$LINENO" 5
2964
-   fi
2965
-
2966
-   test "$2" = conftest.file
2967
-   )
2968
-then
2969
-   # Ok.
2970
-   :
2971
-else
2972
-   as_fn_error $? "newly created file is older than distributed files!
2973
-Check your system clock" "$LINENO" 5
2974
-fi
2975
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2976
-$as_echo "yes" >&6; }
2977
-test "$program_prefix" != NONE &&
2978
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
2979
-# Use a double $ so make ignores it.
2980
-test "$program_suffix" != NONE &&
2981
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
2982
-# Double any \ or $.
2983
-# By default was `s,x,x', remove it if useless.
2984
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
2985
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
2986
-
2987
-# expand $ac_aux_dir to an absolute path
2988
-am_aux_dir=`cd $ac_aux_dir && pwd`
2989
-
2990
-if test x"${MISSING+set}" != xset; then
2991
-  case $am_aux_dir in
2992
-  *\ * | *\	*)
2993
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
2994
-  *)
2995
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
2996
-  esac
2997
-fi
2998
-# Use eval to expand $SHELL
2999
-if eval "$MISSING --run true"; then
3000
-  am_missing_run="$MISSING --run "
3001
-else
3002
-  am_missing_run=
3003
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
3004
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
3005
-fi
3006
-
3007
-if test x"${install_sh}" != xset; then
3008
-  case $am_aux_dir in
3009
-  *\ * | *\	*)
3010
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
3011
-  *)
3012
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
3013
-  esac
3014
-fi
3015
-
3016
-# Installed binaries are usually stripped using `strip' when the user
3017
-# run `make install-strip'.  However `strip' might not be the right
3018
-# tool to use in cross-compilation environments, therefore Automake
3019
-# will honor the `STRIP' environment variable to overrule this program.
3020
-if test "$cross_compiling" != no; then
3021
-  if test -n "$ac_tool_prefix"; then
3022
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
3023
-set dummy ${ac_tool_prefix}strip; ac_word=$2
3024
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3025
-$as_echo_n "checking for $ac_word... " >&6; }
3026
-if ${ac_cv_prog_STRIP+:} false; then :
3027
-  $as_echo_n "(cached) " >&6
3028
-else
3029
-  if test -n "$STRIP"; then
3030
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
3031
-else
3032
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3033
-for as_dir in $PATH
3034
-do
3035
-  IFS=$as_save_IFS
3036
-  test -z "$as_dir" && as_dir=.
3037
-    for ac_exec_ext in '' $ac_executable_extensions; do
3038
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3039
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
3040
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3041
-    break 2
3042
-  fi
3043
-done
3044
-  done
3045
-IFS=$as_save_IFS
3046
-
3047
-fi
3048
-fi
3049
-STRIP=$ac_cv_prog_STRIP
3050
-if test -n "$STRIP"; then
3051
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
3052
-$as_echo "$STRIP" >&6; }
3053
-else
3054
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3055
-$as_echo "no" >&6; }
3056
-fi
3057
-
3058
-
3059
-fi
3060
-if test -z "$ac_cv_prog_STRIP"; then
3061
-  ac_ct_STRIP=$STRIP
3062
-  # Extract the first word of "strip", so it can be a program name with args.
3063
-set dummy strip; ac_word=$2
3064
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3065
-$as_echo_n "checking for $ac_word... " >&6; }
3066
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
3067
-  $as_echo_n "(cached) " >&6
3068
-else
3069
-  if test -n "$ac_ct_STRIP"; then
3070
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
3071
-else
3072
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3073
-for as_dir in $PATH
3074
-do
3075
-  IFS=$as_save_IFS
3076
-  test -z "$as_dir" && as_dir=.
3077
-    for ac_exec_ext in '' $ac_executable_extensions; do
3078
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3079
-    ac_cv_prog_ac_ct_STRIP="strip"
3080
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3081
-    break 2
3082
-  fi
3083
-done
3084
-  done
3085
-IFS=$as_save_IFS
3086
-
3087
-fi
3088
-fi
3089
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
3090
-if test -n "$ac_ct_STRIP"; then
3091
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
3092
-$as_echo "$ac_ct_STRIP" >&6; }
3093
-else
3094
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3095
-$as_echo "no" >&6; }
3096
-fi
3097
-
3098
-  if test "x$ac_ct_STRIP" = x; then
3099
-    STRIP=":"
3100
-  else
3101
-    case $cross_compiling:$ac_tool_warned in
3102
-yes:)
3103
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3104
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3105
-ac_tool_warned=yes ;;
3106
-esac
3107
-    STRIP=$ac_ct_STRIP
3108
-  fi
3109
-else
3110
-  STRIP="$ac_cv_prog_STRIP"
3111
-fi
3112
-
3113
-fi
3114
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
3115
-
3116
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
3117
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
3118
-if test -z "$MKDIR_P"; then
3119
-  if ${ac_cv_path_mkdir+:} false; then :
3120
-  $as_echo_n "(cached) " >&6
3121
-else
3122
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3123
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
3124
-do
3125
-  IFS=$as_save_IFS
3126
-  test -z "$as_dir" && as_dir=.
3127
-    for ac_prog in mkdir gmkdir; do
3128
-	 for ac_exec_ext in '' $ac_executable_extensions; do
3129
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
3130
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
3131
-	     'mkdir (GNU coreutils) '* | \
3132
-	     'mkdir (coreutils) '* | \
3133
-	     'mkdir (fileutils) '4.1*)
3134
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
3135
-	       break 3;;
3136
-	   esac
3137
-	 done
3138
-       done
3139
-  done
3140
-IFS=$as_save_IFS
3141
-
3142
-fi
3143
-
3144
-  test -d ./--version && rmdir ./--version
3145
-  if test "${ac_cv_path_mkdir+set}" = set; then
3146
-    MKDIR_P="$ac_cv_path_mkdir -p"
3147
-  else
3148
-    # As a last resort, use the slow shell script.  Don't cache a
3149
-    # value for MKDIR_P within a source directory, because that will
3150
-    # break other packages using the cache if that directory is
3151
-    # removed, or if the value is a relative name.
3152
-    MKDIR_P="$ac_install_sh -d"
3153
-  fi
3154
-fi
3155
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
3156
-$as_echo "$MKDIR_P" >&6; }
3157
-
3158
-mkdir_p="$MKDIR_P"
3159
-case $mkdir_p in
3160
-  [\\/$]* | ?:[\\/]*) ;;
3161
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3162
-esac
3163
-
3164
-for ac_prog in gawk mawk nawk awk
3165
-do
3166
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
3167
-set dummy $ac_prog; ac_word=$2
3168
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3169
-$as_echo_n "checking for $ac_word... " >&6; }
3170
-if ${ac_cv_prog_AWK+:} false; then :
3171
-  $as_echo_n "(cached) " >&6
3172
-else
3173
-  if test -n "$AWK"; then
3174
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
3175
-else
3176
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3177
-for as_dir in $PATH
3178
-do
3179
-  IFS=$as_save_IFS
3180
-  test -z "$as_dir" && as_dir=.
3181
-    for ac_exec_ext in '' $ac_executable_extensions; do
3182
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3183
-    ac_cv_prog_AWK="$ac_prog"
3184
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3185
-    break 2
3186
-  fi
3187
-done
3188
-  done
3189
-IFS=$as_save_IFS
3190
-
3191
-fi
3192
-fi
3193
-AWK=$ac_cv_prog_AWK
3194
-if test -n "$AWK"; then
3195
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
3196
-$as_echo "$AWK" >&6; }
3197
-else
3198
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3199
-$as_echo "no" >&6; }
3200
-fi
3201
-
3202
-
3203
-  test -n "$AWK" && break
3204
-done
3205
-
3206
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
3207
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
3208
-set x ${MAKE-make}
3209
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
3210
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
3211
-  $as_echo_n "(cached) " >&6
3212
-else
3213
-  cat >conftest.make <<\_ACEOF
3214
-SHELL = /bin/sh
3215
-all:
3216
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
3217
-_ACEOF
3218
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
3219
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
3220
-  *@@@%%%=?*=@@@%%%*)
3221
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
3222
-  *)
3223
-    eval ac_cv_prog_make_${ac_make}_set=no;;
3224
-esac
3225
-rm -f conftest.make
3226
-fi
3227
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
3228
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3229
-$as_echo "yes" >&6; }
3230
-  SET_MAKE=
3231
-else
3232
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3233
-$as_echo "no" >&6; }
3234
-  SET_MAKE="MAKE=${MAKE-make}"
3235
-fi
3236
-
3237
-rm -rf .tst 2>/dev/null
3238
-mkdir .tst 2>/dev/null
3239
-if test -d .tst; then
3240
-  am__leading_dot=.
3241
-else
3242
-  am__leading_dot=_
3243
-fi
3244
-rmdir .tst 2>/dev/null
3245
-
3246
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
3247
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
3248
-  # is not polluted with repeated "-I."
3249
-  am__isrc=' -I$(srcdir)'
3250
-  # test to see if srcdir already configured
3251
-  if test -f $srcdir/config.status; then
3252
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
3253
-  fi
3254
-fi
3255
-
3256
-# test whether we have cygpath
3257
-if test -z "$CYGPATH_W"; then
3258
-  if (cygpath --version) >/dev/null 2>/dev/null; then
3259
-    CYGPATH_W='cygpath -w'
3260
-  else
3261
-    CYGPATH_W=echo
3262
-  fi
3263
-fi
3264
-
3265
-
3266
-# Define the identity of the package.
3267
- PACKAGE='clamav'
3268
- VERSION='devel'
3269
-
3270
-
3271
-# Some tools Automake needs.
3272
-
3273
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
3274
-
3275
-
3276
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
3277
-
3278
-
3279
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
3280
-
3281
-
3282
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
3283
-
3284
-
3285
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3286
-
3287
-# We need awk for the "check" target.  The system "awk" is bad on
3288
-# some platforms.
3289
-# Always define AMTAR for backward compatibility.  Yes, it's still used
3290
-# in the wild :-(  We should find a proper way to deprecate it ...
3291
-AMTAR='$${TAR-tar}'
3292
-
3293
-
3294
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
3295
-$as_echo_n "checking how to create a ustar tar archive... " >&6; }
3296
-# Loop over all known methods to create a tar archive until one works.
3297
-_am_tools='gnutar plaintar pax cpio none'
3298
-_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
3299
-# Do not fold the above two line into one, because Tru64 sh and
3300
-# Solaris sh will not grok spaces in the rhs of `-'.
3301
-for _am_tool in $_am_tools
3302
-do
3303
-  case $_am_tool in
3304
-  gnutar)
3305
-    for _am_tar in tar gnutar gtar;
3306
-    do
3307
-      { echo "$as_me:$LINENO: $_am_tar --version" >&5
3308
-   ($_am_tar --version) >&5 2>&5
3309
-   ac_status=$?
3310
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3311
-   (exit $ac_status); } && break
3312
-    done
3313
-    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
3314
-    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
3315
-    am__untar="$_am_tar -xf -"
3316
-    ;;
3317
-  plaintar)
3318
-    # Must skip GNU tar: if it does not support --format= it doesn't create
3319
-    # ustar tarball either.
3320
-    (tar --version) >/dev/null 2>&1 && continue
3321
-    am__tar='tar chf - "$$tardir"'
3322
-    am__tar_='tar chf - "$tardir"'
3323
-    am__untar='tar xf -'
3324
-    ;;
3325
-  pax)
3326
-    am__tar='pax -L -x ustar -w "$$tardir"'
3327
-    am__tar_='pax -L -x ustar -w "$tardir"'
3328
-    am__untar='pax -r'
3329
-    ;;
3330
-  cpio)
3331
-    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
3332
-    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
3333
-    am__untar='cpio -i -H ustar -d'
3334
-    ;;
3335
-  none)
3336
-    am__tar=false
3337
-    am__tar_=false
3338
-    am__untar=false
3339
-    ;;
3340
-  esac
3341
-
3342
-  # If the value was cached, stop now.  We just wanted to have am__tar
3343
-  # and am__untar set.
3344
-  test -n "${am_cv_prog_tar_ustar}" && break
3345
-
3346
-  # tar/untar a dummy directory, and stop if the command works
3347
-  rm -rf conftest.dir
3348
-  mkdir conftest.dir
3349
-  echo GrepMe > conftest.dir/file
3350
-  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
3351
-   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
3352
-   ac_status=$?
3353
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3354
-   (exit $ac_status); }
3355
-  rm -rf conftest.dir
3356
-  if test -s conftest.tar; then
3357
-    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
3358
-   ($am__untar <conftest.tar) >&5 2>&5
3359
-   ac_status=$?
3360
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3361
-   (exit $ac_status); }
3362
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3363
-  fi
3364
-done
3365
-rm -rf conftest.dir
3366
-
3367
-if ${am_cv_prog_tar_ustar+:} false; then :
3368
-  $as_echo_n "(cached) " >&6
3369
-else
3370
-  am_cv_prog_tar_ustar=$_am_tool
3371
-fi
3372
-
3373
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
3374
-$as_echo "$am_cv_prog_tar_ustar" >&6; }
3375
-
3376
-
3377
-
3378
-
3379
-
3380
-# Check whether --enable-silent-rules was given.
3381
-if test "${enable_silent_rules+set}" = set; then :
3382
-  enableval=$enable_silent_rules;
3383
-fi
3384
-
3385
-case $enable_silent_rules in
3386
-yes) AM_DEFAULT_VERBOSITY=0;;
3387
-no)  AM_DEFAULT_VERBOSITY=1;;
3388
-*)   AM_DEFAULT_VERBOSITY=0;;
3389
-esac
3390
-am_make=${MAKE-make}
3391
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
3392
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
3393
-if ${am_cv_make_support_nested_variables+:} false; then :
3394
-  $as_echo_n "(cached) " >&6
3395
-else
3396
-  if $as_echo 'TRUE=$(BAR$(V))
3397
-BAR0=false
3398
-BAR1=true
3399
-V=1
3400
-am__doit:
3401
-	@$(TRUE)
3402
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
3403
-  am_cv_make_support_nested_variables=yes
3404
-else
3405
-  am_cv_make_support_nested_variables=no
3406
-fi
3407
-fi
3408
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
3409
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
3410
-if test $am_cv_make_support_nested_variables = yes; then
3411
-    AM_V='$(V)'
3412
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
3413
-else
3414
-  AM_V=$AM_DEFAULT_VERBOSITY
3415
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
3416
-fi
3417
-AM_BACKSLASH='\'
3418
-
3419
-
3420
-
3421
-$as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h
3422
-
3423
-
3424
-VERSION="devel-`date +%Y%m%d`"
3425
-
3426
-LC_CURRENT=7
3427
-LC_REVISION=19
3428
-LC_AGE=1
3429
-LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
3430
-
3431
-
3432
-for ac_prog in gawk mawk nawk awk
3433
-do
3434
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
3435
-set dummy $ac_prog; ac_word=$2
3436
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3437
-$as_echo_n "checking for $ac_word... " >&6; }
3438
-if ${ac_cv_prog_AWK+:} false; then :
3439
-  $as_echo_n "(cached) " >&6
3440
-else
3441
-  if test -n "$AWK"; then
3442
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
3443
-else
3444
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3445
-for as_dir in $PATH
3446
-do
3447
-  IFS=$as_save_IFS
3448
-  test -z "$as_dir" && as_dir=.
3449
-    for ac_exec_ext in '' $ac_executable_extensions; do
3450
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3451
-    ac_cv_prog_AWK="$ac_prog"
3452
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3453
-    break 2
3454
-  fi
3455
-done
3456
-  done
3457
-IFS=$as_save_IFS
3458
-
3459
-fi
3460
-fi
3461
-AWK=$ac_cv_prog_AWK
3462
-if test -n "$AWK"; then
3463
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
3464
-$as_echo "$AWK" >&6; }
3465
-else
3466
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3467
-$as_echo "no" >&6; }
3468
-fi
3469
-
3470
-
3471
-  test -n "$AWK" && break
3472
-done
3473
-
3474
-
3475
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
3476
-$as_echo_n "checking whether ln -s works... " >&6; }
3477
-LN_S=$as_ln_s
3478
-if test "$LN_S" = "ln -s"; then
3479
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3480
-$as_echo "yes" >&6; }
3481
-else
3482
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
3483
-$as_echo "no, using $LN_S" >&6; }
3484
-fi
3485
-
3486
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
3487
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
3488
-set x ${MAKE-make}
3489
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
3490
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
3491
-  $as_echo_n "(cached) " >&6
3492
-else
3493
-  cat >conftest.make <<\_ACEOF
3494
-SHELL = /bin/sh
3495
-all:
3496
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
3497
-_ACEOF
3498
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
3499
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
3500
-  *@@@%%%=?*=@@@%%%*)
3501
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
3502
-  *)
3503
-    eval ac_cv_prog_make_${ac_make}_set=no;;
3504
-esac
3505
-rm -f conftest.make
3506
-fi
3507
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
3508
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3509
-$as_echo "yes" >&6; }
3510
-  SET_MAKE=
3511
-else
3512
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3513
-$as_echo "no" >&6; }
3514
-  SET_MAKE="MAKE=${MAKE-make}"
3515
-fi
3516
-
3517
-
3518
-
3519
-
3520
-
3521
-
3522
-
3523
-
3524
-
3525
-case `pwd` in
3526
-  *\ * | *\	*)
3527
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
3528
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
3529
-esac
3530
-
3531
-
3532
-
3533
-macro_version='2.4.2'
3534
-macro_revision='1.3337'
3535
-
3536
-
3537
-
3538
-
3539
-
3540
-
3541
-
3542
-
3543
-
3544
-
3545
-
3546
-
3547
-
3548
-ltmain="$ac_aux_dir/ltmain.sh"
3549
-
3550
-# Backslashify metacharacters that are still active within
3551
-# double-quoted strings.
3552
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
3553
-
3554
-# Same as above, but do not quote variable references.
3555
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
3556
-
3557
-# Sed substitution to delay expansion of an escaped shell variable in a
3558
-# double_quote_subst'ed string.
3559
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
3560
-
3561
-# Sed substitution to delay expansion of an escaped single quote.
3562
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
3563
-
3564
-# Sed substitution to avoid accidental globbing in evaled expressions
3565
-no_glob_subst='s/\*/\\\*/g'
3566
-
3567
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3568
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
3569
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3570
-
3571
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3572
-$as_echo_n "checking how to print strings... " >&6; }
3573
-# Test print first, because it will be a builtin if present.
3574
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
3575
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3576
-  ECHO='print -r --'
3577
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3578
-  ECHO='printf %s\n'
3579
-else
3580
-  # Use this function as a fallback that always works.
3581
-  func_fallback_echo ()
3582
-  {
3583
-    eval 'cat <<_LTECHO_EOF
3584
-$1
3585
-_LTECHO_EOF'
3586
-  }
3587
-  ECHO='func_fallback_echo'
3588
-fi
3589
-
3590
-# func_echo_all arg...
3591
-# Invoke $ECHO with all args, space-separated.
3592
-func_echo_all ()
3593
-{
3594
-    $ECHO ""
3595
-}
3596
-
3597
-case "$ECHO" in
3598
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
3599
-$as_echo "printf" >&6; } ;;
3600
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
3601
-$as_echo "print -r" >&6; } ;;
3602
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
3603
-$as_echo "cat" >&6; } ;;
3604
-esac
3605
-
3606
-
3607
-
3608
-
3609
-
3610
-
3611
-
3612
-
3613
-
3614
-
3615
-
3616
-
3617
-
3618
-
3619
-DEPDIR="${am__leading_dot}deps"
3620
-
3621
-ac_config_commands="$ac_config_commands depfiles"
3622
-
3623
-
3624
-am_make=${MAKE-make}
3625
-cat > confinc << 'END'
3626
-am__doit:
3627
-	@echo this is the am__doit target
3628
-.PHONY: am__doit
3629
-END
3630
-# If we don't find an include directive, just comment out the code.
3631
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
3632
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
3633
-am__include="#"
3634
-am__quote=
3635
-_am_result=none
3636
-# First try GNU make style include.
3637
-echo "include confinc" > confmf
3638
-# Ignore all kinds of additional output from `make'.
3639
-case `$am_make -s -f confmf 2> /dev/null` in #(
3640
-*the\ am__doit\ target*)
3641
-  am__include=include
3642
-  am__quote=
3643
-  _am_result=GNU
3644
-  ;;
3645
-esac
3646
-# Now try BSD make style include.
3647
-if test "$am__include" = "#"; then
3648
-   echo '.include "confinc"' > confmf
3649
-   case `$am_make -s -f confmf 2> /dev/null` in #(
3650
-   *the\ am__doit\ target*)
3651
-     am__include=.include
3652
-     am__quote="\""
3653
-     _am_result=BSD
3654
-     ;;
3655
-   esac
3656
-fi
3657
-
3658
-
3659
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
3660
-$as_echo "$_am_result" >&6; }
3661
-rm -f confinc confmf
3662
-
3663
-# Check whether --enable-dependency-tracking was given.
3664
-if test "${enable_dependency_tracking+set}" = set; then :
3665
-  enableval=$enable_dependency_tracking;
3666
-fi
3667
-
3668
-if test "x$enable_dependency_tracking" != xno; then
3669
-  am_depcomp="$ac_aux_dir/depcomp"
3670
-  AMDEPBACKSLASH='\'
3671
-  am__nodep='_no'
3672
-fi
3673
- if test "x$enable_dependency_tracking" != xno; then
3674
-  AMDEP_TRUE=
3675
-  AMDEP_FALSE='#'
3676
-else
3677
-  AMDEP_TRUE='#'
3678
-  AMDEP_FALSE=
3679
-fi
3680
-
3681
-
3682 2829
 ac_ext=c
3683 2830
 ac_cpp='$CPP $CPPFLAGS'
3684 2831
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
... ...
@@ -4468,6 +3630,1078 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4468 4468
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4469 4469
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4470 4470
 
4471
+
4472
+ac_ext=c
4473
+ac_cpp='$CPP $CPPFLAGS'
4474
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4475
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4476
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
4477
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
4478
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
4479
+# On Suns, sometimes $CPP names a directory.
4480
+if test -n "$CPP" && test -d "$CPP"; then
4481
+  CPP=
4482
+fi
4483
+if test -z "$CPP"; then
4484
+  if ${ac_cv_prog_CPP+:} false; then :
4485
+  $as_echo_n "(cached) " >&6
4486
+else
4487
+      # Double quotes because CPP needs to be expanded
4488
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
4489
+    do
4490
+      ac_preproc_ok=false
4491
+for ac_c_preproc_warn_flag in '' yes
4492
+do
4493
+  # Use a header file that comes with gcc, so configuring glibc
4494
+  # with a fresh cross-compiler works.
4495
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
4496
+  # <limits.h> exists even on freestanding compilers.
4497
+  # On the NeXT, cc -E runs the code through the compiler's parser,
4498
+  # not just through cpp. "Syntax error" is here to catch this case.
4499
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4500
+/* end confdefs.h.  */
4501
+#ifdef __STDC__
4502
+# include <limits.h>
4503
+#else
4504
+# include <assert.h>
4505
+#endif
4506
+		     Syntax error
4507
+_ACEOF
4508
+if ac_fn_c_try_cpp "$LINENO"; then :
4509
+
4510
+else
4511
+  # Broken: fails on valid input.
4512
+continue
4513
+fi
4514
+rm -f conftest.err conftest.i conftest.$ac_ext
4515
+
4516
+  # OK, works on sane cases.  Now check whether nonexistent headers
4517
+  # can be detected and how.
4518
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4519
+/* end confdefs.h.  */
4520
+#include <ac_nonexistent.h>
4521
+_ACEOF
4522
+if ac_fn_c_try_cpp "$LINENO"; then :
4523
+  # Broken: success on invalid input.
4524
+continue
4525
+else
4526
+  # Passes both tests.
4527
+ac_preproc_ok=:
4528
+break
4529
+fi
4530
+rm -f conftest.err conftest.i conftest.$ac_ext
4531
+
4532
+done
4533
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4534
+rm -f conftest.i conftest.err conftest.$ac_ext
4535
+if $ac_preproc_ok; then :
4536
+  break
4537
+fi
4538
+
4539
+    done
4540
+    ac_cv_prog_CPP=$CPP
4541
+
4542
+fi
4543
+  CPP=$ac_cv_prog_CPP
4544
+else
4545
+  ac_cv_prog_CPP=$CPP
4546
+fi
4547
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
4548
+$as_echo "$CPP" >&6; }
4549
+ac_preproc_ok=false
4550
+for ac_c_preproc_warn_flag in '' yes
4551
+do
4552
+  # Use a header file that comes with gcc, so configuring glibc
4553
+  # with a fresh cross-compiler works.
4554
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
4555
+  # <limits.h> exists even on freestanding compilers.
4556
+  # On the NeXT, cc -E runs the code through the compiler's parser,
4557
+  # not just through cpp. "Syntax error" is here to catch this case.
4558
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4559
+/* end confdefs.h.  */
4560
+#ifdef __STDC__
4561
+# include <limits.h>
4562
+#else
4563
+# include <assert.h>
4564
+#endif
4565
+		     Syntax error
4566
+_ACEOF
4567
+if ac_fn_c_try_cpp "$LINENO"; then :
4568
+
4569
+else
4570
+  # Broken: fails on valid input.
4571
+continue
4572
+fi
4573
+rm -f conftest.err conftest.i conftest.$ac_ext
4574
+
4575
+  # OK, works on sane cases.  Now check whether nonexistent headers
4576
+  # can be detected and how.
4577
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4578
+/* end confdefs.h.  */
4579
+#include <ac_nonexistent.h>
4580
+_ACEOF
4581
+if ac_fn_c_try_cpp "$LINENO"; then :
4582
+  # Broken: success on invalid input.
4583
+continue
4584
+else
4585
+  # Passes both tests.
4586
+ac_preproc_ok=:
4587
+break
4588
+fi
4589
+rm -f conftest.err conftest.i conftest.$ac_ext
4590
+
4591
+done
4592
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4593
+rm -f conftest.i conftest.err conftest.$ac_ext
4594
+if $ac_preproc_ok; then :
4595
+
4596
+else
4597
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4598
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4599
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
4600
+See \`config.log' for more details" "$LINENO" 5; }
4601
+fi
4602
+
4603
+ac_ext=c
4604
+ac_cpp='$CPP $CPPFLAGS'
4605
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4606
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4607
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
4608
+
4609
+
4610
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
4611
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
4612
+if ${ac_cv_path_GREP+:} false; then :
4613
+  $as_echo_n "(cached) " >&6
4614
+else
4615
+  if test -z "$GREP"; then
4616
+  ac_path_GREP_found=false
4617
+  # Loop through the user's path and test for each of PROGNAME-LIST
4618
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4619
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
4620
+do
4621
+  IFS=$as_save_IFS
4622
+  test -z "$as_dir" && as_dir=.
4623
+    for ac_prog in grep ggrep; do
4624
+    for ac_exec_ext in '' $ac_executable_extensions; do
4625
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4626
+      as_fn_executable_p "$ac_path_GREP" || continue
4627
+# Check for GNU ac_path_GREP and select it if it is found.
4628
+  # Check for GNU $ac_path_GREP
4629
+case `"$ac_path_GREP" --version 2>&1` in
4630
+*GNU*)
4631
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
4632
+*)
4633
+  ac_count=0
4634
+  $as_echo_n 0123456789 >"conftest.in"
4635
+  while :
4636
+  do
4637
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
4638
+    mv "conftest.tmp" "conftest.in"
4639
+    cp "conftest.in" "conftest.nl"
4640
+    $as_echo 'GREP' >> "conftest.nl"
4641
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4642
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4643
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
4644
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
4645
+      # Best one so far, save it but keep looking for a better one
4646
+      ac_cv_path_GREP="$ac_path_GREP"
4647
+      ac_path_GREP_max=$ac_count
4648
+    fi
4649
+    # 10*(2^10) chars as input seems more than enough
4650
+    test $ac_count -gt 10 && break
4651
+  done
4652
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
4653
+esac
4654
+
4655
+      $ac_path_GREP_found && break 3
4656
+    done
4657
+  done
4658
+  done
4659
+IFS=$as_save_IFS
4660
+  if test -z "$ac_cv_path_GREP"; then
4661
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4662
+  fi
4663
+else
4664
+  ac_cv_path_GREP=$GREP
4665
+fi
4666
+
4667
+fi
4668
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
4669
+$as_echo "$ac_cv_path_GREP" >&6; }
4670
+ GREP="$ac_cv_path_GREP"
4671
+
4672
+
4673
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
4674
+$as_echo_n "checking for egrep... " >&6; }
4675
+if ${ac_cv_path_EGREP+:} false; then :
4676
+  $as_echo_n "(cached) " >&6
4677
+else
4678
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
4679
+   then ac_cv_path_EGREP="$GREP -E"
4680
+   else
4681
+     if test -z "$EGREP"; then
4682
+  ac_path_EGREP_found=false
4683
+  # Loop through the user's path and test for each of PROGNAME-LIST
4684
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4685
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
4686
+do
4687
+  IFS=$as_save_IFS
4688
+  test -z "$as_dir" && as_dir=.
4689
+    for ac_prog in egrep; do
4690
+    for ac_exec_ext in '' $ac_executable_extensions; do
4691
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4692
+      as_fn_executable_p "$ac_path_EGREP" || continue
4693
+# Check for GNU ac_path_EGREP and select it if it is found.
4694
+  # Check for GNU $ac_path_EGREP
4695
+case `"$ac_path_EGREP" --version 2>&1` in
4696
+*GNU*)
4697
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
4698
+*)
4699
+  ac_count=0
4700
+  $as_echo_n 0123456789 >"conftest.in"
4701
+  while :
4702
+  do
4703
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
4704
+    mv "conftest.tmp" "conftest.in"
4705
+    cp "conftest.in" "conftest.nl"
4706
+    $as_echo 'EGREP' >> "conftest.nl"
4707
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4708
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4709
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
4710
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
4711
+      # Best one so far, save it but keep looking for a better one
4712
+      ac_cv_path_EGREP="$ac_path_EGREP"
4713
+      ac_path_EGREP_max=$ac_count
4714
+    fi
4715
+    # 10*(2^10) chars as input seems more than enough
4716
+    test $ac_count -gt 10 && break
4717
+  done
4718
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
4719
+esac
4720
+
4721
+      $ac_path_EGREP_found && break 3
4722
+    done
4723
+  done
4724
+  done
4725
+IFS=$as_save_IFS
4726
+  if test -z "$ac_cv_path_EGREP"; then
4727
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4728
+  fi
4729
+else
4730
+  ac_cv_path_EGREP=$EGREP
4731
+fi
4732
+
4733
+   fi
4734
+fi
4735
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
4736
+$as_echo "$ac_cv_path_EGREP" >&6; }
4737
+ EGREP="$ac_cv_path_EGREP"
4738
+
4739
+
4740
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
4741
+$as_echo_n "checking for ANSI C header files... " >&6; }
4742
+if ${ac_cv_header_stdc+:} false; then :
4743
+  $as_echo_n "(cached) " >&6
4744
+else
4745
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4746
+/* end confdefs.h.  */
4747
+#include <stdlib.h>
4748
+#include <stdarg.h>
4749
+#include <string.h>
4750
+#include <float.h>
4751
+
4752
+int
4753
+main ()
4754
+{
4755
+
4756
+  ;
4757
+  return 0;
4758
+}
4759
+_ACEOF
4760
+if ac_fn_c_try_compile "$LINENO"; then :
4761
+  ac_cv_header_stdc=yes
4762
+else
4763
+  ac_cv_header_stdc=no
4764
+fi
4765
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4766
+
4767
+if test $ac_cv_header_stdc = yes; then
4768
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
4769
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4770
+/* end confdefs.h.  */
4771
+#include <string.h>
4772
+
4773
+_ACEOF
4774
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
4775
+  $EGREP "memchr" >/dev/null 2>&1; then :
4776
+
4777
+else
4778
+  ac_cv_header_stdc=no
4779
+fi
4780
+rm -f conftest*
4781
+
4782
+fi
4783
+
4784
+if test $ac_cv_header_stdc = yes; then
4785
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
4786
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4787
+/* end confdefs.h.  */
4788
+#include <stdlib.h>
4789
+
4790
+_ACEOF
4791
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
4792
+  $EGREP "free" >/dev/null 2>&1; then :
4793
+
4794
+else
4795
+  ac_cv_header_stdc=no
4796
+fi
4797
+rm -f conftest*
4798
+
4799
+fi
4800
+
4801
+if test $ac_cv_header_stdc = yes; then
4802
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
4803
+  if test "$cross_compiling" = yes; then :
4804
+  :
4805
+else
4806
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4807
+/* end confdefs.h.  */
4808
+#include <ctype.h>
4809
+#include <stdlib.h>
4810
+#if ((' ' & 0x0FF) == 0x020)
4811
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
4812
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
4813
+#else
4814
+# define ISLOWER(c) \
4815
+		   (('a' <= (c) && (c) <= 'i') \
4816
+		     || ('j' <= (c) && (c) <= 'r') \
4817
+		     || ('s' <= (c) && (c) <= 'z'))
4818
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
4819
+#endif
4820
+
4821
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
4822
+int
4823
+main ()
4824
+{
4825
+  int i;
4826
+  for (i = 0; i < 256; i++)
4827
+    if (XOR (islower (i), ISLOWER (i))
4828
+	|| toupper (i) != TOUPPER (i))
4829
+      return 2;
4830
+  return 0;
4831
+}
4832
+_ACEOF
4833
+if ac_fn_c_try_run "$LINENO"; then :
4834
+
4835
+else
4836
+  ac_cv_header_stdc=no
4837
+fi
4838
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
4839
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
4840
+fi
4841
+
4842
+fi
4843
+fi
4844
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
4845
+$as_echo "$ac_cv_header_stdc" >&6; }
4846
+if test $ac_cv_header_stdc = yes; then
4847
+
4848
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
4849
+
4850
+fi
4851
+
4852
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
4853
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
4854
+		  inttypes.h stdint.h unistd.h
4855
+do :
4856
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
4857
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
4858
+"
4859
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
4860
+  cat >>confdefs.h <<_ACEOF
4861
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
4862
+_ACEOF
4863
+
4864
+fi
4865
+
4866
+done
4867
+
4868
+
4869
+
4870
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
4871
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
4872
+  MINIX=yes
4873
+else
4874
+  MINIX=
4875
+fi
4876
+
4877
+
4878
+  if test "$MINIX" = yes; then
4879
+
4880
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
4881
+
4882
+
4883
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
4884
+
4885
+
4886
+$as_echo "#define _MINIX 1" >>confdefs.h
4887
+
4888
+  fi
4889
+
4890
+
4891
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
4892
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
4893
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
4894
+  $as_echo_n "(cached) " >&6
4895
+else
4896
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4897
+/* end confdefs.h.  */
4898
+
4899
+#         define __EXTENSIONS__ 1
4900
+          $ac_includes_default
4901
+int
4902
+main ()
4903
+{
4904
+
4905
+  ;
4906
+  return 0;
4907
+}
4908
+_ACEOF
4909
+if ac_fn_c_try_compile "$LINENO"; then :
4910
+  ac_cv_safe_to_define___extensions__=yes
4911
+else
4912
+  ac_cv_safe_to_define___extensions__=no
4913
+fi
4914
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4915
+fi
4916
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
4917
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
4918
+  test $ac_cv_safe_to_define___extensions__ = yes &&
4919
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
4920
+
4921
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
4922
+
4923
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
4924
+
4925
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
4926
+
4927
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
4928
+
4929
+
4930
+
4931
+am__api_version='1.11'
4932
+
4933
+# Find a good install program.  We prefer a C program (faster),
4934
+# so one script is as good as another.  But avoid the broken or
4935
+# incompatible versions:
4936
+# SysV /etc/install, /usr/sbin/install
4937
+# SunOS /usr/etc/install
4938
+# IRIX /sbin/install
4939
+# AIX /bin/install
4940
+# AmigaOS /C/install, which installs bootblocks on floppy discs
4941
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
4942
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
4943
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
4944
+# OS/2's system install, which has a completely different semantic
4945
+# ./install, which can be erroneously created by make from ./install.sh.
4946
+# Reject install programs that cannot install multiple files.
4947
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
4948
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
4949
+if test -z "$INSTALL"; then
4950
+if ${ac_cv_path_install+:} false; then :
4951
+  $as_echo_n "(cached) " >&6
4952
+else
4953
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4954
+for as_dir in $PATH
4955
+do
4956
+  IFS=$as_save_IFS
4957
+  test -z "$as_dir" && as_dir=.
4958
+    # Account for people who put trailing slashes in PATH elements.
4959
+case $as_dir/ in #((
4960
+  ./ | .// | /[cC]/* | \
4961
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
4962
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
4963
+  /usr/ucb/* ) ;;
4964
+  *)
4965
+    # OSF1 and SCO ODT 3.0 have their own names for install.
4966
+    # Don't use installbsd from OSF since it installs stuff as root
4967
+    # by default.
4968
+    for ac_prog in ginstall scoinst install; do
4969
+      for ac_exec_ext in '' $ac_executable_extensions; do
4970
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
4971
+	  if test $ac_prog = install &&
4972
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
4973
+	    # AIX install.  It has an incompatible calling convention.
4974
+	    :
4975
+	  elif test $ac_prog = install &&
4976
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
4977
+	    # program-specific install script used by HP pwplus--don't use.
4978
+	    :
4979
+	  else
4980
+	    rm -rf conftest.one conftest.two conftest.dir
4981
+	    echo one > conftest.one
4982
+	    echo two > conftest.two
4983
+	    mkdir conftest.dir
4984
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
4985
+	      test -s conftest.one && test -s conftest.two &&
4986
+	      test -s conftest.dir/conftest.one &&
4987
+	      test -s conftest.dir/conftest.two
4988
+	    then
4989
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
4990
+	      break 3
4991
+	    fi
4992
+	  fi
4993
+	fi
4994
+      done
4995
+    done
4996
+    ;;
4997
+esac
4998
+
4999
+  done
5000
+IFS=$as_save_IFS
5001
+
5002
+rm -rf conftest.one conftest.two conftest.dir
5003
+
5004
+fi
5005
+  if test "${ac_cv_path_install+set}" = set; then
5006
+    INSTALL=$ac_cv_path_install
5007
+  else
5008
+    # As a last resort, use the slow shell script.  Don't cache a
5009
+    # value for INSTALL within a source directory, because that will
5010
+    # break other packages using the cache if that directory is
5011
+    # removed, or if the value is a relative name.
5012
+    INSTALL=$ac_install_sh
5013
+  fi
5014
+fi
5015
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
5016
+$as_echo "$INSTALL" >&6; }
5017
+
5018
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
5019
+# It thinks the first close brace ends the variable substitution.
5020
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
5021
+
5022
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
5023
+
5024
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
5025
+
5026
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
5027
+$as_echo_n "checking whether build environment is sane... " >&6; }
5028
+# Just in case
5029
+sleep 1
5030
+echo timestamp > conftest.file
5031
+# Reject unsafe characters in $srcdir or the absolute working directory
5032
+# name.  Accept space and tab only in the latter.
5033
+am_lf='
5034
+'
5035
+case `pwd` in
5036
+  *[\\\"\#\$\&\'\`$am_lf]*)
5037
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
5038
+esac
5039
+case $srcdir in
5040
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
5041
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
5042
+esac
5043
+
5044
+# Do `set' in a subshell so we don't clobber the current shell's
5045
+# arguments.  Must try -L first in case configure is actually a
5046
+# symlink; some systems play weird games with the mod time of symlinks
5047
+# (eg FreeBSD returns the mod time of the symlink's containing
5048
+# directory).
5049
+if (
5050
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
5051
+   if test "$*" = "X"; then
5052
+      # -L didn't work.
5053
+      set X `ls -t "$srcdir/configure" conftest.file`
5054
+   fi
5055
+   rm -f conftest.file
5056
+   if test "$*" != "X $srcdir/configure conftest.file" \
5057
+      && test "$*" != "X conftest.file $srcdir/configure"; then
5058
+
5059
+      # If neither matched, then we have a broken ls.  This can happen
5060
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
5061
+      # broken ls alias from the environment.  This has actually
5062
+      # happened.  Such a system could not be considered "sane".
5063
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
5064
+alias in your environment" "$LINENO" 5
5065
+   fi
5066
+
5067
+   test "$2" = conftest.file
5068
+   )
5069
+then
5070
+   # Ok.
5071
+   :
5072
+else
5073
+   as_fn_error $? "newly created file is older than distributed files!
5074
+Check your system clock" "$LINENO" 5
5075
+fi
5076
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5077
+$as_echo "yes" >&6; }
5078
+test "$program_prefix" != NONE &&
5079
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
5080
+# Use a double $ so make ignores it.
5081
+test "$program_suffix" != NONE &&
5082
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
5083
+# Double any \ or $.
5084
+# By default was `s,x,x', remove it if useless.
5085
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
5086
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
5087
+
5088
+# expand $ac_aux_dir to an absolute path
5089
+am_aux_dir=`cd $ac_aux_dir && pwd`
5090
+
5091
+if test x"${MISSING+set}" != xset; then
5092
+  case $am_aux_dir in
5093
+  *\ * | *\	*)
5094
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
5095
+  *)
5096
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
5097
+  esac
5098
+fi
5099
+# Use eval to expand $SHELL
5100
+if eval "$MISSING --run true"; then
5101
+  am_missing_run="$MISSING --run "
5102
+else
5103
+  am_missing_run=
5104
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
5105
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
5106
+fi
5107
+
5108
+if test x"${install_sh}" != xset; then
5109
+  case $am_aux_dir in
5110
+  *\ * | *\	*)
5111
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
5112
+  *)
5113
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
5114
+  esac
5115
+fi
5116
+
5117
+# Installed binaries are usually stripped using `strip' when the user
5118
+# run `make install-strip'.  However `strip' might not be the right
5119
+# tool to use in cross-compilation environments, therefore Automake
5120
+# will honor the `STRIP' environment variable to overrule this program.
5121
+if test "$cross_compiling" != no; then
5122
+  if test -n "$ac_tool_prefix"; then
5123
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
5124
+set dummy ${ac_tool_prefix}strip; ac_word=$2
5125
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5126
+$as_echo_n "checking for $ac_word... " >&6; }
5127
+if ${ac_cv_prog_STRIP+:} false; then :
5128
+  $as_echo_n "(cached) " >&6
5129
+else
5130
+  if test -n "$STRIP"; then
5131
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
5132
+else
5133
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5134
+for as_dir in $PATH
5135
+do
5136
+  IFS=$as_save_IFS
5137
+  test -z "$as_dir" && as_dir=.
5138
+    for ac_exec_ext in '' $ac_executable_extensions; do
5139
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5140
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
5141
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5142
+    break 2
5143
+  fi
5144
+done
5145
+  done
5146
+IFS=$as_save_IFS
5147
+
5148
+fi
5149
+fi
5150
+STRIP=$ac_cv_prog_STRIP
5151
+if test -n "$STRIP"; then
5152
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
5153
+$as_echo "$STRIP" >&6; }
5154
+else
5155
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5156
+$as_echo "no" >&6; }
5157
+fi
5158
+
5159
+
5160
+fi
5161
+if test -z "$ac_cv_prog_STRIP"; then
5162
+  ac_ct_STRIP=$STRIP
5163
+  # Extract the first word of "strip", so it can be a program name with args.
5164
+set dummy strip; ac_word=$2
5165
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5166
+$as_echo_n "checking for $ac_word... " >&6; }
5167
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
5168
+  $as_echo_n "(cached) " >&6
5169
+else
5170
+  if test -n "$ac_ct_STRIP"; then
5171
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
5172
+else
5173
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5174
+for as_dir in $PATH
5175
+do
5176
+  IFS=$as_save_IFS
5177
+  test -z "$as_dir" && as_dir=.
5178
+    for ac_exec_ext in '' $ac_executable_extensions; do
5179
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5180
+    ac_cv_prog_ac_ct_STRIP="strip"
5181
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5182
+    break 2
5183
+  fi
5184
+done
5185
+  done
5186
+IFS=$as_save_IFS
5187
+
5188
+fi
5189
+fi
5190
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
5191
+if test -n "$ac_ct_STRIP"; then
5192
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
5193
+$as_echo "$ac_ct_STRIP" >&6; }
5194
+else
5195
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5196
+$as_echo "no" >&6; }
5197
+fi
5198
+
5199
+  if test "x$ac_ct_STRIP" = x; then
5200
+    STRIP=":"
5201
+  else
5202
+    case $cross_compiling:$ac_tool_warned in
5203
+yes:)
5204
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
5205
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5206
+ac_tool_warned=yes ;;
5207
+esac
5208
+    STRIP=$ac_ct_STRIP
5209
+  fi
5210
+else
5211
+  STRIP="$ac_cv_prog_STRIP"
5212
+fi
5213
+
5214
+fi
5215
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
5216
+
5217
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
5218
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
5219
+if test -z "$MKDIR_P"; then
5220
+  if ${ac_cv_path_mkdir+:} false; then :
5221
+  $as_echo_n "(cached) " >&6
5222
+else
5223
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5224
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
5225
+do
5226
+  IFS=$as_save_IFS
5227
+  test -z "$as_dir" && as_dir=.
5228
+    for ac_prog in mkdir gmkdir; do
5229
+	 for ac_exec_ext in '' $ac_executable_extensions; do
5230
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
5231
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
5232
+	     'mkdir (GNU coreutils) '* | \
5233
+	     'mkdir (coreutils) '* | \
5234
+	     'mkdir (fileutils) '4.1*)
5235
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
5236
+	       break 3;;
5237
+	   esac
5238
+	 done
5239
+       done
5240
+  done
5241
+IFS=$as_save_IFS
5242
+
5243
+fi
5244
+
5245
+  test -d ./--version && rmdir ./--version
5246
+  if test "${ac_cv_path_mkdir+set}" = set; then
5247
+    MKDIR_P="$ac_cv_path_mkdir -p"
5248
+  else
5249
+    # As a last resort, use the slow shell script.  Don't cache a
5250
+    # value for MKDIR_P within a source directory, because that will
5251
+    # break other packages using the cache if that directory is
5252
+    # removed, or if the value is a relative name.
5253
+    MKDIR_P="$ac_install_sh -d"
5254
+  fi
5255
+fi
5256
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
5257
+$as_echo "$MKDIR_P" >&6; }
5258
+
5259
+mkdir_p="$MKDIR_P"
5260
+case $mkdir_p in
5261
+  [\\/$]* | ?:[\\/]*) ;;
5262
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
5263
+esac
5264
+
5265
+for ac_prog in gawk mawk nawk awk
5266
+do
5267
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
5268
+set dummy $ac_prog; ac_word=$2
5269
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5270
+$as_echo_n "checking for $ac_word... " >&6; }
5271
+if ${ac_cv_prog_AWK+:} false; then :
5272
+  $as_echo_n "(cached) " >&6
5273
+else
5274
+  if test -n "$AWK"; then
5275
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
5276
+else
5277
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5278
+for as_dir in $PATH
5279
+do
5280
+  IFS=$as_save_IFS
5281
+  test -z "$as_dir" && as_dir=.
5282
+    for ac_exec_ext in '' $ac_executable_extensions; do
5283
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5284
+    ac_cv_prog_AWK="$ac_prog"
5285
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5286
+    break 2
5287
+  fi
5288
+done
5289
+  done
5290
+IFS=$as_save_IFS
5291
+
5292
+fi
5293
+fi
5294
+AWK=$ac_cv_prog_AWK
5295
+if test -n "$AWK"; then
5296
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
5297
+$as_echo "$AWK" >&6; }
5298
+else
5299
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5300
+$as_echo "no" >&6; }
5301
+fi
5302
+
5303
+
5304
+  test -n "$AWK" && break
5305
+done
5306
+
5307
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
5308
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
5309
+set x ${MAKE-make}
5310
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
5311
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
5312
+  $as_echo_n "(cached) " >&6
5313
+else
5314
+  cat >conftest.make <<\_ACEOF
5315
+SHELL = /bin/sh
5316
+all:
5317
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
5318
+_ACEOF
5319
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
5320
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
5321
+  *@@@%%%=?*=@@@%%%*)
5322
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
5323
+  *)
5324
+    eval ac_cv_prog_make_${ac_make}_set=no;;
5325
+esac
5326
+rm -f conftest.make
5327
+fi
5328
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
5329
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5330
+$as_echo "yes" >&6; }
5331
+  SET_MAKE=
5332
+else
5333
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5334
+$as_echo "no" >&6; }
5335
+  SET_MAKE="MAKE=${MAKE-make}"
5336
+fi
5337
+
5338
+rm -rf .tst 2>/dev/null
5339
+mkdir .tst 2>/dev/null
5340
+if test -d .tst; then
5341
+  am__leading_dot=.
5342
+else
5343
+  am__leading_dot=_
5344
+fi
5345
+rmdir .tst 2>/dev/null
5346
+
5347
+DEPDIR="${am__leading_dot}deps"
5348
+
5349
+ac_config_commands="$ac_config_commands depfiles"
5350
+
5351
+
5352
+am_make=${MAKE-make}
5353
+cat > confinc << 'END'
5354
+am__doit:
5355
+	@echo this is the am__doit target
5356
+.PHONY: am__doit
5357
+END
5358
+# If we don't find an include directive, just comment out the code.
5359
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
5360
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
5361
+am__include="#"
5362
+am__quote=
5363
+_am_result=none
5364
+# First try GNU make style include.
5365
+echo "include confinc" > confmf
5366
+# Ignore all kinds of additional output from `make'.
5367
+case `$am_make -s -f confmf 2> /dev/null` in #(
5368
+*the\ am__doit\ target*)
5369
+  am__include=include
5370
+  am__quote=
5371
+  _am_result=GNU
5372
+  ;;
5373
+esac
5374
+# Now try BSD make style include.
5375
+if test "$am__include" = "#"; then
5376
+   echo '.include "confinc"' > confmf
5377
+   case `$am_make -s -f confmf 2> /dev/null` in #(
5378
+   *the\ am__doit\ target*)
5379
+     am__include=.include
5380
+     am__quote="\""
5381
+     _am_result=BSD
5382
+     ;;
5383
+   esac
5384
+fi
5385
+
5386
+
5387
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
5388
+$as_echo "$_am_result" >&6; }
5389
+rm -f confinc confmf
5390
+
5391
+# Check whether --enable-dependency-tracking was given.
5392
+if test "${enable_dependency_tracking+set}" = set; then :
5393
+  enableval=$enable_dependency_tracking;
5394
+fi
5395
+
5396
+if test "x$enable_dependency_tracking" != xno; then
5397
+  am_depcomp="$ac_aux_dir/depcomp"
5398
+  AMDEPBACKSLASH='\'
5399
+  am__nodep='_no'
5400
+fi
5401
+ if test "x$enable_dependency_tracking" != xno; then
5402
+  AMDEP_TRUE=
5403
+  AMDEP_FALSE='#'
5404
+else
5405
+  AMDEP_TRUE='#'
5406
+  AMDEP_FALSE=
5407
+fi
5408
+
5409
+
5410
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
5411
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
5412
+  # is not polluted with repeated "-I."
5413
+  am__isrc=' -I$(srcdir)'
5414
+  # test to see if srcdir already configured
5415
+  if test -f $srcdir/config.status; then
5416
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
5417
+  fi
5418
+fi
5419
+
5420
+# test whether we have cygpath
5421
+if test -z "$CYGPATH_W"; then
5422
+  if (cygpath --version) >/dev/null 2>/dev/null; then
5423
+    CYGPATH_W='cygpath -w'
5424
+  else
5425
+    CYGPATH_W=echo
5426
+  fi
5427
+fi
5428
+
5429
+
5430
+# Define the identity of the package.
5431
+ PACKAGE='clamav'
5432
+ VERSION='devel'
5433
+
5434
+
5435
+# Some tools Automake needs.
5436
+
5437
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
5438
+
5439
+
5440
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
5441
+
5442
+
5443
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
5444
+
5445
+
5446
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
5447
+
5448
+
5449
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
5450
+
5451
+# We need awk for the "check" target.  The system "awk" is bad on
5452
+# some platforms.
5453
+# Always define AMTAR for backward compatibility.  Yes, it's still used
5454
+# in the wild :-(  We should find a proper way to deprecate it ...
5455
+AMTAR='$${TAR-tar}'
5456
+
5457
+
5458
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
5459
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
5460
+# Loop over all known methods to create a tar archive until one works.
5461
+_am_tools='gnutar plaintar pax cpio none'
5462
+_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
5463
+# Do not fold the above two line into one, because Tru64 sh and
5464
+# Solaris sh will not grok spaces in the rhs of `-'.
5465
+for _am_tool in $_am_tools
5466
+do
5467
+  case $_am_tool in
5468
+  gnutar)
5469
+    for _am_tar in tar gnutar gtar;
5470
+    do
5471
+      { echo "$as_me:$LINENO: $_am_tar --version" >&5
5472
+   ($_am_tar --version) >&5 2>&5
5473
+   ac_status=$?
5474
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5475
+   (exit $ac_status); } && break
5476
+    done
5477
+    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
5478
+    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
5479
+    am__untar="$_am_tar -xf -"
5480
+    ;;
5481
+  plaintar)
5482
+    # Must skip GNU tar: if it does not support --format= it doesn't create
5483
+    # ustar tarball either.
5484
+    (tar --version) >/dev/null 2>&1 && continue
5485
+    am__tar='tar chf - "$$tardir"'
5486
+    am__tar_='tar chf - "$tardir"'
5487
+    am__untar='tar xf -'
5488
+    ;;
5489
+  pax)
5490
+    am__tar='pax -L -x ustar -w "$$tardir"'
5491
+    am__tar_='pax -L -x ustar -w "$tardir"'
5492
+    am__untar='pax -r'
5493
+    ;;
5494
+  cpio)
5495
+    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
5496
+    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
5497
+    am__untar='cpio -i -H ustar -d'
5498
+    ;;
5499
+  none)
5500
+    am__tar=false
5501
+    am__tar_=false
5502
+    am__untar=false
5503
+    ;;
5504
+  esac
5505
+
5506
+  # If the value was cached, stop now.  We just wanted to have am__tar
5507
+  # and am__untar set.
5508
+  test -n "${am_cv_prog_tar_ustar}" && break
5509
+
5510
+  # tar/untar a dummy directory, and stop if the command works
5511
+  rm -rf conftest.dir
5512
+  mkdir conftest.dir
5513
+  echo GrepMe > conftest.dir/file
5514
+  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
5515
+   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
5516
+   ac_status=$?
5517
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5518
+   (exit $ac_status); }
5519
+  rm -rf conftest.dir
5520
+  if test -s conftest.tar; then
5521
+    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
5522
+   ($am__untar <conftest.tar) >&5 2>&5
5523
+   ac_status=$?
5524
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5525
+   (exit $ac_status); }
5526
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
5527
+  fi
5528
+done
5529
+rm -rf conftest.dir
5530
+
5531
+if ${am_cv_prog_tar_ustar+:} false; then :
5532
+  $as_echo_n "(cached) " >&6
5533
+else
5534
+  am_cv_prog_tar_ustar=$_am_tool
5535
+fi
5536
+
5537
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
5538
+$as_echo "$am_cv_prog_tar_ustar" >&6; }
5539
+
5540
+
5541
+
5542
+
4471 5543
 depcc="$CC"   am_compiler_list=
4472 5544
 
4473 5545
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
... ...
@@ -4596,6 +4830,184 @@ else
4596 4596
 fi
4597 4597
 
4598 4598
 
4599
+
4600
+# Check whether --enable-silent-rules was given.
4601
+if test "${enable_silent_rules+set}" = set; then :
4602
+  enableval=$enable_silent_rules;
4603
+fi
4604
+
4605
+case $enable_silent_rules in
4606
+yes) AM_DEFAULT_VERBOSITY=0;;
4607
+no)  AM_DEFAULT_VERBOSITY=1;;
4608
+*)   AM_DEFAULT_VERBOSITY=0;;
4609
+esac
4610
+am_make=${MAKE-make}
4611
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
4612
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
4613
+if ${am_cv_make_support_nested_variables+:} false; then :
4614
+  $as_echo_n "(cached) " >&6
4615
+else
4616
+  if $as_echo 'TRUE=$(BAR$(V))
4617
+BAR0=false
4618
+BAR1=true
4619
+V=1
4620
+am__doit:
4621
+	@$(TRUE)
4622
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
4623
+  am_cv_make_support_nested_variables=yes
4624
+else
4625
+  am_cv_make_support_nested_variables=no
4626
+fi
4627
+fi
4628
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
4629
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
4630
+if test $am_cv_make_support_nested_variables = yes; then
4631
+    AM_V='$(V)'
4632
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
4633
+else
4634
+  AM_V=$AM_DEFAULT_VERBOSITY
4635
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
4636
+fi
4637
+AM_BACKSLASH='\'
4638
+
4639
+
4640
+
4641
+$as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h
4642
+
4643
+
4644
+VERSION="devel-`date +%Y%m%d`"
4645
+
4646
+LC_CURRENT=7
4647
+LC_REVISION=11
4648
+LC_AGE=1
4649
+LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
4650
+
4651
+
4652
+
4653
+cat >>confdefs.h <<_ACEOF
4654
+#define LIBCLAMAV_FULLVER "$major.$LC_AGE.$LC_REVISION"
4655
+_ACEOF
4656
+
4657
+
4658
+
4659
+cat >>confdefs.h <<_ACEOF
4660
+#define LIBCLAMAV_MAJORVER $major
4661
+_ACEOF
4662
+
4663
+
4664
+
4665
+cat >>confdefs.h <<_ACEOF
4666
+#define VERSION "$VERSION"
4667
+_ACEOF
4668
+
4669
+
4670
+cat >>confdefs.h <<_ACEOF
4671
+#define VERSION_SUFFIX "$VERSION_SUFFIX"
4672
+_ACEOF
4673
+
4674
+
4675
+
4676
+
4677
+
4678
+
4679
+
4680
+
4681
+
4682
+
4683
+case `pwd` in
4684
+  *\ * | *\	*)
4685
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
4686
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
4687
+esac
4688
+
4689
+
4690
+
4691
+macro_version='2.4.2'
4692
+macro_revision='1.3337'
4693
+
4694
+
4695
+
4696
+
4697
+
4698
+
4699
+
4700
+
4701
+
4702
+
4703
+
4704
+
4705
+
4706
+ltmain="$ac_aux_dir/ltmain.sh"
4707
+
4708
+# Backslashify metacharacters that are still active within
4709
+# double-quoted strings.
4710
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
4711
+
4712
+# Same as above, but do not quote variable references.
4713
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
4714
+
4715
+# Sed substitution to delay expansion of an escaped shell variable in a
4716
+# double_quote_subst'ed string.
4717
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
4718
+
4719
+# Sed substitution to delay expansion of an escaped single quote.
4720
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
4721
+
4722
+# Sed substitution to avoid accidental globbing in evaled expressions
4723
+no_glob_subst='s/\*/\\\*/g'
4724
+
4725
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
4726
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
4727
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
4728
+
4729
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
4730
+$as_echo_n "checking how to print strings... " >&6; }
4731
+# Test print first, because it will be a builtin if present.
4732
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
4733
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
4734
+  ECHO='print -r --'
4735
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
4736
+  ECHO='printf %s\n'
4737
+else
4738
+  # Use this function as a fallback that always works.
4739
+  func_fallback_echo ()
4740
+  {
4741
+    eval 'cat <<_LTECHO_EOF
4742
+$1
4743
+_LTECHO_EOF'
4744
+  }
4745
+  ECHO='func_fallback_echo'
4746
+fi
4747
+
4748
+# func_echo_all arg...
4749
+# Invoke $ECHO with all args, space-separated.
4750
+func_echo_all ()
4751
+{
4752
+    $ECHO ""
4753
+}
4754
+
4755
+case "$ECHO" in
4756
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
4757
+$as_echo "printf" >&6; } ;;
4758
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
4759
+$as_echo "print -r" >&6; } ;;
4760
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
4761
+$as_echo "cat" >&6; } ;;
4762
+esac
4763
+
4764
+
4765
+
4766
+
4767
+
4768
+
4769
+
4770
+
4771
+
4772
+
4773
+
4774
+
4775
+
4776
+
4599 4777
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
4600 4778
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
4601 4779
 if ${ac_cv_path_SED+:} false; then :
... ...
@@ -4678,136 +5090,6 @@ Xsed="$SED -e 1s/^X//"
4678 4678
 
4679 4679
 
4680 4680
 
4681
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
4682
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
4683
-if ${ac_cv_path_GREP+:} false; then :
4684
-  $as_echo_n "(cached) " >&6
4685
-else
4686
-  if test -z "$GREP"; then
4687
-  ac_path_GREP_found=false
4688
-  # Loop through the user's path and test for each of PROGNAME-LIST
4689
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4690
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
4691
-do
4692
-  IFS=$as_save_IFS
4693
-  test -z "$as_dir" && as_dir=.
4694
-    for ac_prog in grep ggrep; do
4695
-    for ac_exec_ext in '' $ac_executable_extensions; do
4696
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4697
-      as_fn_executable_p "$ac_path_GREP" || continue
4698
-# Check for GNU ac_path_GREP and select it if it is found.
4699
-  # Check for GNU $ac_path_GREP
4700
-case `"$ac_path_GREP" --version 2>&1` in
4701
-*GNU*)
4702
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
4703
-*)
4704
-  ac_count=0
4705
-  $as_echo_n 0123456789 >"conftest.in"
4706
-  while :
4707
-  do
4708
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
4709
-    mv "conftest.tmp" "conftest.in"
4710
-    cp "conftest.in" "conftest.nl"
4711
-    $as_echo 'GREP' >> "conftest.nl"
4712
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4713
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4714
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
4715
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
4716
-      # Best one so far, save it but keep looking for a better one
4717
-      ac_cv_path_GREP="$ac_path_GREP"
4718
-      ac_path_GREP_max=$ac_count
4719
-    fi
4720
-    # 10*(2^10) chars as input seems more than enough
4721
-    test $ac_count -gt 10 && break
4722
-  done
4723
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
4724
-esac
4725
-
4726
-      $ac_path_GREP_found && break 3
4727
-    done
4728
-  done
4729
-  done
4730
-IFS=$as_save_IFS
4731
-  if test -z "$ac_cv_path_GREP"; then
4732
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4733
-  fi
4734
-else
4735
-  ac_cv_path_GREP=$GREP
4736
-fi
4737
-
4738
-fi
4739
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
4740
-$as_echo "$ac_cv_path_GREP" >&6; }
4741
- GREP="$ac_cv_path_GREP"
4742
-
4743
-
4744
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
4745
-$as_echo_n "checking for egrep... " >&6; }
4746
-if ${ac_cv_path_EGREP+:} false; then :
4747
-  $as_echo_n "(cached) " >&6
4748
-else
4749
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
4750
-   then ac_cv_path_EGREP="$GREP -E"
4751
-   else
4752
-     if test -z "$EGREP"; then
4753
-  ac_path_EGREP_found=false
4754
-  # Loop through the user's path and test for each of PROGNAME-LIST
4755
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4756
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
4757
-do
4758
-  IFS=$as_save_IFS
4759
-  test -z "$as_dir" && as_dir=.
4760
-    for ac_prog in egrep; do
4761
-    for ac_exec_ext in '' $ac_executable_extensions; do
4762
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4763
-      as_fn_executable_p "$ac_path_EGREP" || continue
4764
-# Check for GNU ac_path_EGREP and select it if it is found.
4765
-  # Check for GNU $ac_path_EGREP
4766
-case `"$ac_path_EGREP" --version 2>&1` in
4767
-*GNU*)
4768
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
4769
-*)
4770
-  ac_count=0
4771
-  $as_echo_n 0123456789 >"conftest.in"
4772
-  while :
4773
-  do
4774
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
4775
-    mv "conftest.tmp" "conftest.in"
4776
-    cp "conftest.in" "conftest.nl"
4777
-    $as_echo 'EGREP' >> "conftest.nl"
4778
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
4779
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
4780
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
4781
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
4782
-      # Best one so far, save it but keep looking for a better one
4783
-      ac_cv_path_EGREP="$ac_path_EGREP"
4784
-      ac_path_EGREP_max=$ac_count
4785
-    fi
4786
-    # 10*(2^10) chars as input seems more than enough
4787
-    test $ac_count -gt 10 && break
4788
-  done
4789
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
4790
-esac
4791
-
4792
-      $ac_path_EGREP_found && break 3
4793
-    done
4794
-  done
4795
-  done
4796
-IFS=$as_save_IFS
4797
-  if test -z "$ac_cv_path_EGREP"; then
4798
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4799
-  fi
4800
-else
4801
-  ac_cv_path_EGREP=$EGREP
4802
-fi
4803
-
4804
-   fi
4805
-fi
4806
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
4807
-$as_echo "$ac_cv_path_EGREP" >&6; }
4808
- EGREP="$ac_cv_path_EGREP"
4809
-
4810
-
4811 4681
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
4812 4682
 $as_echo_n "checking for fgrep... " >&6; }
4813 4683
 if ${ac_cv_path_FGREP+:} false; then :
... ...
@@ -5208,6 +5490,17 @@ fi
5208 5208
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
5209 5209
 $as_echo "$lt_cv_nm_interface" >&6; }
5210 5210
 
5211
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
5212
+$as_echo_n "checking whether ln -s works... " >&6; }
5213
+LN_S=$as_ln_s
5214
+if test "$LN_S" = "ln -s"; then
5215
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5216
+$as_echo "yes" >&6; }
5217
+else
5218
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
5219
+$as_echo "no, using $LN_S" >&6; }
5220
+fi
5221
+
5211 5222
 # find the maximum length of command line arguments
5212 5223
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
5213 5224
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
... ...
@@ -6006,7 +6299,6 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6006 6006
 
6007 6007
 
6008 6008
 
6009
-
6010 6009
 if test -n "$ac_tool_prefix"; then
6011 6010
   for ac_prog in ar
6012 6011
   do
... ...
@@ -7710,273 +8002,6 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
7710 7710
     ;;
7711 7711
   esac
7712 7712
 
7713
-ac_ext=c
7714
-ac_cpp='$CPP $CPPFLAGS'
7715
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7716
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7717
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
7718
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
7719
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
7720
-# On Suns, sometimes $CPP names a directory.
7721
-if test -n "$CPP" && test -d "$CPP"; then
7722
-  CPP=
7723
-fi
7724
-if test -z "$CPP"; then
7725
-  if ${ac_cv_prog_CPP+:} false; then :
7726
-  $as_echo_n "(cached) " >&6
7727
-else
7728
-      # Double quotes because CPP needs to be expanded
7729
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
7730
-    do
7731
-      ac_preproc_ok=false
7732
-for ac_c_preproc_warn_flag in '' yes
7733
-do
7734
-  # Use a header file that comes with gcc, so configuring glibc
7735
-  # with a fresh cross-compiler works.
7736
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7737
-  # <limits.h> exists even on freestanding compilers.
7738
-  # On the NeXT, cc -E runs the code through the compiler's parser,
7739
-  # not just through cpp. "Syntax error" is here to catch this case.
7740
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7741
-/* end confdefs.h.  */
7742
-#ifdef __STDC__
7743
-# include <limits.h>
7744
-#else
7745
-# include <assert.h>
7746
-#endif
7747
-		     Syntax error
7748
-_ACEOF
7749
-if ac_fn_c_try_cpp "$LINENO"; then :
7750
-
7751
-else
7752
-  # Broken: fails on valid input.
7753
-continue
7754
-fi
7755
-rm -f conftest.err conftest.i conftest.$ac_ext
7756
-
7757
-  # OK, works on sane cases.  Now check whether nonexistent headers
7758
-  # can be detected and how.
7759
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7760
-/* end confdefs.h.  */
7761
-#include <ac_nonexistent.h>
7762
-_ACEOF
7763
-if ac_fn_c_try_cpp "$LINENO"; then :
7764
-  # Broken: success on invalid input.
7765
-continue
7766
-else
7767
-  # Passes both tests.
7768
-ac_preproc_ok=:
7769
-break
7770
-fi
7771
-rm -f conftest.err conftest.i conftest.$ac_ext
7772
-
7773
-done
7774
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7775
-rm -f conftest.i conftest.err conftest.$ac_ext
7776
-if $ac_preproc_ok; then :
7777
-  break
7778
-fi
7779
-
7780
-    done
7781
-    ac_cv_prog_CPP=$CPP
7782
-
7783
-fi
7784
-  CPP=$ac_cv_prog_CPP
7785
-else
7786
-  ac_cv_prog_CPP=$CPP
7787
-fi
7788
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
7789
-$as_echo "$CPP" >&6; }
7790
-ac_preproc_ok=false
7791
-for ac_c_preproc_warn_flag in '' yes
7792
-do
7793
-  # Use a header file that comes with gcc, so configuring glibc
7794
-  # with a fresh cross-compiler works.
7795
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7796
-  # <limits.h> exists even on freestanding compilers.
7797
-  # On the NeXT, cc -E runs the code through the compiler's parser,
7798
-  # not just through cpp. "Syntax error" is here to catch this case.
7799
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7800
-/* end confdefs.h.  */
7801
-#ifdef __STDC__
7802
-# include <limits.h>
7803
-#else
7804
-# include <assert.h>
7805
-#endif
7806
-		     Syntax error
7807
-_ACEOF
7808
-if ac_fn_c_try_cpp "$LINENO"; then :
7809
-
7810
-else
7811
-  # Broken: fails on valid input.
7812
-continue
7813
-fi
7814
-rm -f conftest.err conftest.i conftest.$ac_ext
7815
-
7816
-  # OK, works on sane cases.  Now check whether nonexistent headers
7817
-  # can be detected and how.
7818
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7819
-/* end confdefs.h.  */
7820
-#include <ac_nonexistent.h>
7821
-_ACEOF
7822
-if ac_fn_c_try_cpp "$LINENO"; then :
7823
-  # Broken: success on invalid input.
7824
-continue
7825
-else
7826
-  # Passes both tests.
7827
-ac_preproc_ok=:
7828
-break
7829
-fi
7830
-rm -f conftest.err conftest.i conftest.$ac_ext
7831
-
7832
-done
7833
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7834
-rm -f conftest.i conftest.err conftest.$ac_ext
7835
-if $ac_preproc_ok; then :
7836
-
7837
-else
7838
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7839
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7840
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
7841
-See \`config.log' for more details" "$LINENO" 5; }
7842
-fi
7843
-
7844
-ac_ext=c
7845
-ac_cpp='$CPP $CPPFLAGS'
7846
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7847
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7848
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
7849
-
7850
-
7851
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
7852
-$as_echo_n "checking for ANSI C header files... " >&6; }
7853
-if ${ac_cv_header_stdc+:} false; then :
7854
-  $as_echo_n "(cached) " >&6
7855
-else
7856
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7857
-/* end confdefs.h.  */
7858
-#include <stdlib.h>
7859
-#include <stdarg.h>
7860
-#include <string.h>
7861
-#include <float.h>
7862
-
7863
-int
7864
-main ()
7865
-{
7866
-
7867
-  ;
7868
-  return 0;
7869
-}
7870
-_ACEOF
7871
-if ac_fn_c_try_compile "$LINENO"; then :
7872
-  ac_cv_header_stdc=yes
7873
-else
7874
-  ac_cv_header_stdc=no
7875
-fi
7876
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7877
-
7878
-if test $ac_cv_header_stdc = yes; then
7879
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
7880
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7881
-/* end confdefs.h.  */
7882
-#include <string.h>
7883
-
7884
-_ACEOF
7885
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
7886
-  $EGREP "memchr" >/dev/null 2>&1; then :
7887
-
7888
-else
7889
-  ac_cv_header_stdc=no
7890
-fi
7891
-rm -f conftest*
7892
-
7893
-fi
7894
-
7895
-if test $ac_cv_header_stdc = yes; then
7896
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
7897
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7898
-/* end confdefs.h.  */
7899
-#include <stdlib.h>
7900
-
7901
-_ACEOF
7902
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
7903
-  $EGREP "free" >/dev/null 2>&1; then :
7904
-
7905
-else
7906
-  ac_cv_header_stdc=no
7907
-fi
7908
-rm -f conftest*
7909
-
7910
-fi
7911
-
7912
-if test $ac_cv_header_stdc = yes; then
7913
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
7914
-  if test "$cross_compiling" = yes; then :
7915
-  :
7916
-else
7917
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7918
-/* end confdefs.h.  */
7919
-#include <ctype.h>
7920
-#include <stdlib.h>
7921
-#if ((' ' & 0x0FF) == 0x020)
7922
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
7923
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
7924
-#else
7925
-# define ISLOWER(c) \
7926
-		   (('a' <= (c) && (c) <= 'i') \
7927
-		     || ('j' <= (c) && (c) <= 'r') \
7928
-		     || ('s' <= (c) && (c) <= 'z'))
7929
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
7930
-#endif
7931
-
7932
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
7933
-int
7934
-main ()
7935
-{
7936
-  int i;
7937
-  for (i = 0; i < 256; i++)
7938
-    if (XOR (islower (i), ISLOWER (i))
7939
-	|| toupper (i) != TOUPPER (i))
7940
-      return 2;
7941
-  return 0;
7942
-}
7943
-_ACEOF
7944
-if ac_fn_c_try_run "$LINENO"; then :
7945
-
7946
-else
7947
-  ac_cv_header_stdc=no
7948
-fi
7949
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
7950
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
7951
-fi
7952
-
7953
-fi
7954
-fi
7955
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
7956
-$as_echo "$ac_cv_header_stdc" >&6; }
7957
-if test $ac_cv_header_stdc = yes; then
7958
-
7959
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
7960
-
7961
-fi
7962
-
7963
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
7964
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
7965
-		  inttypes.h stdint.h unistd.h
7966
-do :
7967
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7968
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
7969
-"
7970
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
7971
-  cat >>confdefs.h <<_ACEOF
7972
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7973
-_ACEOF
7974
-
7975
-fi
7976
-
7977
-done
7978
-
7979
-
7980 7713
 for ac_header in dlfcn.h
7981 7714
 do :
7982 7715
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
... ...
@@ -13071,175 +13096,808 @@ eval "LTDLOPEN=\"$libname_spec\""
13071 13071
 # Only expand once:
13072 13072
 
13073 13073
 
13074
-ac_config_files="$ac_config_files libltdl/Makefile"
13075 13074
 
13075
+ac_ext=c
13076
+ac_cpp='$CPP $CPPFLAGS'
13077
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13078
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13079
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
13080
+if test -n "$ac_tool_prefix"; then
13081
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
13082
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
13083
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13084
+$as_echo_n "checking for $ac_word... " >&6; }
13085
+if ${ac_cv_prog_CC+:} false; then :
13086
+  $as_echo_n "(cached) " >&6
13087
+else
13088
+  if test -n "$CC"; then
13089
+  ac_cv_prog_CC="$CC" # Let the user override the test.
13090
+else
13091
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13092
+for as_dir in $PATH
13093
+do
13094
+  IFS=$as_save_IFS
13095
+  test -z "$as_dir" && as_dir=.
13096
+    for ac_exec_ext in '' $ac_executable_extensions; do
13097
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13098
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
13099
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13100
+    break 2
13101
+  fi
13102
+done
13103
+  done
13104
+IFS=$as_save_IFS
13076 13105
 
13077
-major=`expr $LC_CURRENT - $LC_AGE`
13106
+fi
13107
+fi
13108
+CC=$ac_cv_prog_CC
13109
+if test -n "$CC"; then
13110
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
13111
+$as_echo "$CC" >&6; }
13112
+else
13113
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13114
+$as_echo "no" >&6; }
13115
+fi
13078 13116
 
13079
-cat >>confdefs.h <<_ACEOF
13080
-#define LIBCLAMAV_FULLVER "$major.$LC_AGE.$LC_REVISION"
13081
-_ACEOF
13082 13117
 
13118
+fi
13119
+if test -z "$ac_cv_prog_CC"; then
13120
+  ac_ct_CC=$CC
13121
+  # Extract the first word of "gcc", so it can be a program name with args.
13122
+set dummy gcc; ac_word=$2
13123
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13124
+$as_echo_n "checking for $ac_word... " >&6; }
13125
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
13126
+  $as_echo_n "(cached) " >&6
13127
+else
13128
+  if test -n "$ac_ct_CC"; then
13129
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
13130
+else
13131
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13132
+for as_dir in $PATH
13133
+do
13134
+  IFS=$as_save_IFS
13135
+  test -z "$as_dir" && as_dir=.
13136
+    for ac_exec_ext in '' $ac_executable_extensions; do
13137
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13138
+    ac_cv_prog_ac_ct_CC="gcc"
13139
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13140
+    break 2
13141
+  fi
13142
+done
13143
+  done
13144
+IFS=$as_save_IFS
13083 13145
 
13084
-cat >>confdefs.h <<_ACEOF
13085
-#define LIBCLAMAV_MAJORVER $major
13086
-_ACEOF
13146
+fi
13147
+fi
13148
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
13149
+if test -n "$ac_ct_CC"; then
13150
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
13151
+$as_echo "$ac_ct_CC" >&6; }
13152
+else
13153
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13154
+$as_echo "no" >&6; }
13155
+fi
13087 13156
 
13157
+  if test "x$ac_ct_CC" = x; then
13158
+    CC=""
13159
+  else
13160
+    case $cross_compiling:$ac_tool_warned in
13161
+yes:)
13162
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13163
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13164
+ac_tool_warned=yes ;;
13165
+esac
13166
+    CC=$ac_ct_CC
13167
+  fi
13168
+else
13169
+  CC="$ac_cv_prog_CC"
13170
+fi
13088 13171
 
13089
-$as_echo "#define SCANBUFF 131072" >>confdefs.h
13172
+if test -z "$CC"; then
13173
+          if test -n "$ac_tool_prefix"; then
13174
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
13175
+set dummy ${ac_tool_prefix}cc; ac_word=$2
13176
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13177
+$as_echo_n "checking for $ac_word... " >&6; }
13178
+if ${ac_cv_prog_CC+:} false; then :
13179
+  $as_echo_n "(cached) " >&6
13180
+else
13181
+  if test -n "$CC"; then
13182
+  ac_cv_prog_CC="$CC" # Let the user override the test.
13183
+else
13184
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13185
+for as_dir in $PATH
13186
+do
13187
+  IFS=$as_save_IFS
13188
+  test -z "$as_dir" && as_dir=.
13189
+    for ac_exec_ext in '' $ac_executable_extensions; do
13190
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13191
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
13192
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13193
+    break 2
13194
+  fi
13195
+done
13196
+  done
13197
+IFS=$as_save_IFS
13090 13198
 
13199
+fi
13200
+fi
13201
+CC=$ac_cv_prog_CC
13202
+if test -n "$CC"; then
13203
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
13204
+$as_echo "$CC" >&6; }
13205
+else
13206
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13207
+$as_echo "no" >&6; }
13208
+fi
13091 13209
 
13092
-$as_echo "#define FILEBUFF 8192" >>confdefs.h
13093 13210
 
13211
+  fi
13212
+fi
13213
+if test -z "$CC"; then
13214
+  # Extract the first word of "cc", so it can be a program name with args.
13215
+set dummy cc; ac_word=$2
13216
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13217
+$as_echo_n "checking for $ac_word... " >&6; }
13218
+if ${ac_cv_prog_CC+:} false; then :
13219
+  $as_echo_n "(cached) " >&6
13220
+else
13221
+  if test -n "$CC"; then
13222
+  ac_cv_prog_CC="$CC" # Let the user override the test.
13223
+else
13224
+  ac_prog_rejected=no
13225
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13226
+for as_dir in $PATH
13227
+do
13228
+  IFS=$as_save_IFS
13229
+  test -z "$as_dir" && as_dir=.
13230
+    for ac_exec_ext in '' $ac_executable_extensions; do
13231
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13232
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
13233
+       ac_prog_rejected=yes
13234
+       continue
13235
+     fi
13236
+    ac_cv_prog_CC="cc"
13237
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13238
+    break 2
13239
+  fi
13240
+done
13241
+  done
13242
+IFS=$as_save_IFS
13243
+
13244
+if test $ac_prog_rejected = yes; then
13245
+  # We found a bogon in the path, so make sure we never use it.
13246
+  set dummy $ac_cv_prog_CC
13247
+  shift
13248
+  if test $# != 0; then
13249
+    # We chose a different compiler from the bogus one.
13250
+    # However, it has the same basename, so the bogon will be chosen
13251
+    # first if we set CC to just the basename; use the full file name.
13252
+    shift
13253
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
13254
+  fi
13255
+fi
13256
+fi
13257
+fi
13258
+CC=$ac_cv_prog_CC
13259
+if test -n "$CC"; then
13260
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
13261
+$as_echo "$CC" >&6; }
13262
+else
13263
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13264
+$as_echo "no" >&6; }
13265
+fi
13094 13266
 
13095 13267
 
13096
-	# Only modify libdir if user has not overriden it
13097
-	default_libdir='${exec_prefix}/lib'
13098
-	if test "$libdir" = "$default_libdir"; then
13099
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch libdir" >&5
13100
-$as_echo_n "checking for multiarch libdir... " >&6; }
13101
-		# Based on http://lists.gnu.org/archive/html/autoconf/2008-09/msg00072.html
13102
-		if test "$GCC" = yes; then
13103
-			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS` || ac_multilibdir=.
13104
-		else
13105
-			ac_multilibdir=.
13106
-		fi
13107
-		case "$ac_multilibdir" in
13108
-			 # I don't know if the first two cases can happen, but it would be a
13109
-			 # bad idea to override $exec_prefix
13110
-			 /* | ../../* | .) acl_libdirstem=lib ;;
13111
-			 ../*)             acl_libdirstem=`echo $ac_multilibdir | sed 's/^...//' ` ;;
13112
-			*)                 acl_libdirstem=lib/$ac_multilibdir ;;
13113
-		esac
13114
-		libdir='${exec_prefix}/'$acl_libdirstem
13115
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libdir" >&5
13116
-$as_echo "$libdir" >&6; }
13117
-	else
13118
-		acl_libdirstem=lib
13119
-		if test -d "$libdir"; then
13120
-			case "$libdir" in
13121
-				*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
13122
-				*) searchdir=`cd "$libdir" && pwd`
13123
-				   case "$searchdir" in
13124
-					*/lib64 ) acl_libdirstem=lib64 ;;
13125
-				   esac
13126
-			esac
13127
-		fi
13128
-	fi
13268
+fi
13269
+if test -z "$CC"; then
13270
+  if test -n "$ac_tool_prefix"; then
13271
+  for ac_prog in cl.exe
13272
+  do
13273
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
13274
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
13275
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13276
+$as_echo_n "checking for $ac_word... " >&6; }
13277
+if ${ac_cv_prog_CC+:} false; then :
13278
+  $as_echo_n "(cached) " >&6
13279
+else
13280
+  if test -n "$CC"; then
13281
+  ac_cv_prog_CC="$CC" # Let the user override the test.
13282
+else
13283
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13284
+for as_dir in $PATH
13285
+do
13286
+  IFS=$as_save_IFS
13287
+  test -z "$as_dir" && as_dir=.
13288
+    for ac_exec_ext in '' $ac_executable_extensions; do
13289
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13290
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
13291
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13292
+    break 2
13293
+  fi
13294
+done
13295
+  done
13296
+IFS=$as_save_IFS
13297
+
13298
+fi
13299
+fi
13300
+CC=$ac_cv_prog_CC
13301
+if test -n "$CC"; then
13302
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
13303
+$as_echo "$CC" >&6; }
13304
+else
13305
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13306
+$as_echo "no" >&6; }
13307
+fi
13129 13308
 
13130 13309
 
13131
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
13132
-$as_echo_n "checking for ANSI C header files... " >&6; }
13133
-if ${ac_cv_header_stdc+:} false; then :
13310
+    test -n "$CC" && break
13311
+  done
13312
+fi
13313
+if test -z "$CC"; then
13314
+  ac_ct_CC=$CC
13315
+  for ac_prog in cl.exe
13316
+do
13317
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
13318
+set dummy $ac_prog; ac_word=$2
13319
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13320
+$as_echo_n "checking for $ac_word... " >&6; }
13321
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
13322
+  $as_echo_n "(cached) " >&6
13323
+else
13324
+  if test -n "$ac_ct_CC"; then
13325
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
13326
+else
13327
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13328
+for as_dir in $PATH
13329
+do
13330
+  IFS=$as_save_IFS
13331
+  test -z "$as_dir" && as_dir=.
13332
+    for ac_exec_ext in '' $ac_executable_extensions; do
13333
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13334
+    ac_cv_prog_ac_ct_CC="$ac_prog"
13335
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13336
+    break 2
13337
+  fi
13338
+done
13339
+  done
13340
+IFS=$as_save_IFS
13341
+
13342
+fi
13343
+fi
13344
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
13345
+if test -n "$ac_ct_CC"; then
13346
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
13347
+$as_echo "$ac_ct_CC" >&6; }
13348
+else
13349
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13350
+$as_echo "no" >&6; }
13351
+fi
13352
+
13353
+
13354
+  test -n "$ac_ct_CC" && break
13355
+done
13356
+
13357
+  if test "x$ac_ct_CC" = x; then
13358
+    CC=""
13359
+  else
13360
+    case $cross_compiling:$ac_tool_warned in
13361
+yes:)
13362
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13363
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13364
+ac_tool_warned=yes ;;
13365
+esac
13366
+    CC=$ac_ct_CC
13367
+  fi
13368
+fi
13369
+
13370
+fi
13371
+
13372
+
13373
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13374
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13375
+as_fn_error $? "no acceptable C compiler found in \$PATH
13376
+See \`config.log' for more details" "$LINENO" 5; }
13377
+
13378
+# Provide some information about the compiler.
13379
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
13380
+set X $ac_compile
13381
+ac_compiler=$2
13382
+for ac_option in --version -v -V -qversion; do
13383
+  { { ac_try="$ac_compiler $ac_option >&5"
13384
+case "(($ac_try" in
13385
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13386
+  *) ac_try_echo=$ac_try;;
13387
+esac
13388
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
13389
+$as_echo "$ac_try_echo"; } >&5
13390
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
13391
+  ac_status=$?
13392
+  if test -s conftest.err; then
13393
+    sed '10a\
13394
+... rest of stderr output deleted ...
13395
+         10q' conftest.err >conftest.er1
13396
+    cat conftest.er1 >&5
13397
+  fi
13398
+  rm -f conftest.er1 conftest.err
13399
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13400
+  test $ac_status = 0; }
13401
+done
13402
+
13403
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
13404
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
13405
+if ${ac_cv_c_compiler_gnu+:} false; then :
13134 13406
   $as_echo_n "(cached) " >&6
13135 13407
 else
13136 13408
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13137 13409
 /* end confdefs.h.  */
13138
-#include <stdlib.h>
13139
-#include <stdarg.h>
13140
-#include <string.h>
13141
-#include <float.h>
13142 13410
 
13143 13411
 int
13144 13412
 main ()
13145 13413
 {
13414
+#ifndef __GNUC__
13415
+       choke me
13416
+#endif
13146 13417
 
13147 13418
   ;
13148 13419
   return 0;
13149 13420
 }
13150 13421
 _ACEOF
13151 13422
 if ac_fn_c_try_compile "$LINENO"; then :
13152
-  ac_cv_header_stdc=yes
13423
+  ac_compiler_gnu=yes
13153 13424
 else
13154
-  ac_cv_header_stdc=no
13425
+  ac_compiler_gnu=no
13155 13426
 fi
13156 13427
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13428
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
13157 13429
 
13158
-if test $ac_cv_header_stdc = yes; then
13159
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
13160
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13430
+fi
13431
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
13432
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
13433
+if test $ac_compiler_gnu = yes; then
13434
+  GCC=yes
13435
+else
13436
+  GCC=
13437
+fi
13438
+ac_test_CFLAGS=${CFLAGS+set}
13439
+ac_save_CFLAGS=$CFLAGS
13440
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
13441
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
13442
+if ${ac_cv_prog_cc_g+:} false; then :
13443
+  $as_echo_n "(cached) " >&6
13444
+else
13445
+  ac_save_c_werror_flag=$ac_c_werror_flag
13446
+   ac_c_werror_flag=yes
13447
+   ac_cv_prog_cc_g=no
13448
+   CFLAGS="-g"
13449
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13161 13450
 /* end confdefs.h.  */
13162
-#include <string.h>
13163 13451
 
13452
+int
13453
+main ()
13454
+{
13455
+
13456
+  ;
13457
+  return 0;
13458
+}
13164 13459
 _ACEOF
13165
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
13166
-  $EGREP "memchr" >/dev/null 2>&1; then :
13460
+if ac_fn_c_try_compile "$LINENO"; then :
13461
+  ac_cv_prog_cc_g=yes
13462
+else
13463
+  CFLAGS=""
13464
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13465
+/* end confdefs.h.  */
13466
+
13467
+int
13468
+main ()
13469
+{
13470
+
13471
+  ;
13472
+  return 0;
13473
+}
13474
+_ACEOF
13475
+if ac_fn_c_try_compile "$LINENO"; then :
13167 13476
 
13168 13477
 else
13169
-  ac_cv_header_stdc=no
13170
-fi
13171
-rm -f conftest*
13478
+  ac_c_werror_flag=$ac_save_c_werror_flag
13479
+	 CFLAGS="-g"
13480
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13481
+/* end confdefs.h.  */
13172 13482
 
13173
-fi
13483
+int
13484
+main ()
13485
+{
13174 13486
 
13175
-if test $ac_cv_header_stdc = yes; then
13176
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
13177
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13487
+  ;
13488
+  return 0;
13489
+}
13490
+_ACEOF
13491
+if ac_fn_c_try_compile "$LINENO"; then :
13492
+  ac_cv_prog_cc_g=yes
13493
+fi
13494
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13495
+fi
13496
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13497
+fi
13498
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13499
+   ac_c_werror_flag=$ac_save_c_werror_flag
13500
+fi
13501
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
13502
+$as_echo "$ac_cv_prog_cc_g" >&6; }
13503
+if test "$ac_test_CFLAGS" = set; then
13504
+  CFLAGS=$ac_save_CFLAGS
13505
+elif test $ac_cv_prog_cc_g = yes; then
13506
+  if test "$GCC" = yes; then
13507
+    CFLAGS="-g -O2"
13508
+  else
13509
+    CFLAGS="-g"
13510
+  fi
13511
+else
13512
+  if test "$GCC" = yes; then
13513
+    CFLAGS="-O2"
13514
+  else
13515
+    CFLAGS=
13516
+  fi
13517
+fi
13518
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
13519
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
13520
+if ${ac_cv_prog_cc_c89+:} false; then :
13521
+  $as_echo_n "(cached) " >&6
13522
+else
13523
+  ac_cv_prog_cc_c89=no
13524
+ac_save_CC=$CC
13525
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13178 13526
 /* end confdefs.h.  */
13179
-#include <stdlib.h>
13527
+#include <stdarg.h>
13528
+#include <stdio.h>
13529
+struct stat;
13530
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
13531
+struct buf { int x; };
13532
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
13533
+static char *e (p, i)
13534
+     char **p;
13535
+     int i;
13536
+{
13537
+  return p[i];
13538
+}
13539
+static char *f (char * (*g) (char **, int), char **p, ...)
13540
+{
13541
+  char *s;
13542
+  va_list v;
13543
+  va_start (v,p);
13544
+  s = g (p, va_arg (v,int));
13545
+  va_end (v);
13546
+  return s;
13547
+}
13548
+
13549
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
13550
+   function prototypes and stuff, but not '\xHH' hex character constants.
13551
+   These don't provoke an error unfortunately, instead are silently treated
13552
+   as 'x'.  The following induces an error, until -std is added to get
13553
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
13554
+   array size at least.  It's necessary to write '\x00'==0 to get something
13555
+   that's true only with -std.  */
13556
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
13180 13557
 
13558
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
13559
+   inside strings and character constants.  */
13560
+#define FOO(x) 'x'
13561
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
13562
+
13563
+int test (int i, double x);
13564
+struct s1 {int (*f) (int a);};
13565
+struct s2 {int (*f) (double a);};
13566
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
13567
+int argc;
13568
+char **argv;
13569
+int
13570
+main ()
13571
+{
13572
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
13573
+  ;
13574
+  return 0;
13575
+}
13181 13576
 _ACEOF
13182
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
13183
-  $EGREP "free" >/dev/null 2>&1; then :
13577
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
13578
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
13579
+do
13580
+  CC="$ac_save_CC $ac_arg"
13581
+  if ac_fn_c_try_compile "$LINENO"; then :
13582
+  ac_cv_prog_cc_c89=$ac_arg
13583
+fi
13584
+rm -f core conftest.err conftest.$ac_objext
13585
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
13586
+done
13587
+rm -f conftest.$ac_ext
13588
+CC=$ac_save_CC
13589
+
13590
+fi
13591
+# AC_CACHE_VAL
13592
+case "x$ac_cv_prog_cc_c89" in
13593
+  x)
13594
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
13595
+$as_echo "none needed" >&6; } ;;
13596
+  xno)
13597
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
13598
+$as_echo "unsupported" >&6; } ;;
13599
+  *)
13600
+    CC="$CC $ac_cv_prog_cc_c89"
13601
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
13602
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
13603
+esac
13604
+if test "x$ac_cv_prog_cc_c89" != xno; then :
13605
+
13606
+fi
13607
+
13608
+ac_ext=c
13609
+ac_cpp='$CPP $CPPFLAGS'
13610
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13611
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13612
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
13613
+
13184 13614
 
13615
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
13616
+$as_echo_n "checking whether ln -s works... " >&6; }
13617
+LN_S=$as_ln_s
13618
+if test "$LN_S" = "ln -s"; then
13619
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13620
+$as_echo "yes" >&6; }
13185 13621
 else
13186
-  ac_cv_header_stdc=no
13622
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
13623
+$as_echo "no, using $LN_S" >&6; }
13187 13624
 fi
13188
-rm -f conftest*
13189 13625
 
13626
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
13627
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
13628
+set x ${MAKE-make}
13629
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
13630
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
13631
+  $as_echo_n "(cached) " >&6
13632
+else
13633
+  cat >conftest.make <<\_ACEOF
13634
+SHELL = /bin/sh
13635
+all:
13636
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
13637
+_ACEOF
13638
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
13639
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
13640
+  *@@@%%%=?*=@@@%%%*)
13641
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
13642
+  *)
13643
+    eval ac_cv_prog_make_${ac_make}_set=no;;
13644
+esac
13645
+rm -f conftest.make
13646
+fi
13647
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
13648
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13649
+$as_echo "yes" >&6; }
13650
+  SET_MAKE=
13651
+else
13652
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13653
+$as_echo "no" >&6; }
13654
+  SET_MAKE="MAKE=${MAKE-make}"
13190 13655
 fi
13191 13656
 
13192
-if test $ac_cv_header_stdc = yes; then
13193
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
13194
-  if test "$cross_compiling" = yes; then :
13195
-  :
13657
+
13658
+
13659
+LIBM=
13660
+case $host in
13661
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
13662
+  # These system don't have libm, or don't need it
13663
+  ;;
13664
+*-ncr-sysv4.3*)
13665
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
13666
+$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
13667
+if ${ac_cv_lib_mw__mwvalidcheckl+:} false; then :
13668
+  $as_echo_n "(cached) " >&6
13196 13669
 else
13197
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13670
+  ac_check_lib_save_LIBS=$LIBS
13671
+LIBS="-lmw  $LIBS"
13672
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13198 13673
 /* end confdefs.h.  */
13199
-#include <ctype.h>
13200
-#include <stdlib.h>
13201
-#if ((' ' & 0x0FF) == 0x020)
13202
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
13203
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
13204
-#else
13205
-# define ISLOWER(c) \
13206
-		   (('a' <= (c) && (c) <= 'i') \
13207
-		     || ('j' <= (c) && (c) <= 'r') \
13208
-		     || ('s' <= (c) && (c) <= 'z'))
13209
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
13674
+
13675
+/* Override any GCC internal prototype to avoid an error.
13676
+   Use char because int might match the return type of a GCC
13677
+   builtin and then its argument prototype would still apply.  */
13678
+#ifdef __cplusplus
13679
+extern "C"
13210 13680
 #endif
13681
+char _mwvalidcheckl ();
13682
+int
13683
+main ()
13684
+{
13685
+return _mwvalidcheckl ();
13686
+  ;
13687
+  return 0;
13688
+}
13689
+_ACEOF
13690
+if ac_fn_c_try_link "$LINENO"; then :
13691
+  ac_cv_lib_mw__mwvalidcheckl=yes
13692
+else
13693
+  ac_cv_lib_mw__mwvalidcheckl=no
13694
+fi
13695
+rm -f core conftest.err conftest.$ac_objext \
13696
+    conftest$ac_exeext conftest.$ac_ext
13697
+LIBS=$ac_check_lib_save_LIBS
13698
+fi
13699
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
13700
+$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
13701
+if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then :
13702
+  LIBM="-lmw"
13703
+fi
13211 13704
 
13212
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
13705
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
13706
+$as_echo_n "checking for cos in -lm... " >&6; }
13707
+if ${ac_cv_lib_m_cos+:} false; then :
13708
+  $as_echo_n "(cached) " >&6
13709
+else
13710
+  ac_check_lib_save_LIBS=$LIBS
13711
+LIBS="-lm  $LIBS"
13712
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13713
+/* end confdefs.h.  */
13714
+
13715
+/* Override any GCC internal prototype to avoid an error.
13716
+   Use char because int might match the return type of a GCC
13717
+   builtin and then its argument prototype would still apply.  */
13718
+#ifdef __cplusplus
13719
+extern "C"
13720
+#endif
13721
+char cos ();
13213 13722
 int
13214 13723
 main ()
13215 13724
 {
13216
-  int i;
13217
-  for (i = 0; i < 256; i++)
13218
-    if (XOR (islower (i), ISLOWER (i))
13219
-	|| toupper (i) != TOUPPER (i))
13220
-      return 2;
13725
+return cos ();
13726
+  ;
13221 13727
   return 0;
13222 13728
 }
13223 13729
 _ACEOF
13224
-if ac_fn_c_try_run "$LINENO"; then :
13730
+if ac_fn_c_try_link "$LINENO"; then :
13731
+  ac_cv_lib_m_cos=yes
13732
+else
13733
+  ac_cv_lib_m_cos=no
13734
+fi
13735
+rm -f core conftest.err conftest.$ac_objext \
13736
+    conftest$ac_exeext conftest.$ac_ext
13737
+LIBS=$ac_check_lib_save_LIBS
13738
+fi
13739
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
13740
+$as_echo "$ac_cv_lib_m_cos" >&6; }
13741
+if test "x$ac_cv_lib_m_cos" = xyes; then :
13742
+  LIBM="$LIBM -lm"
13743
+fi
13744
+
13745
+  ;;
13746
+*)
13747
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
13748
+$as_echo_n "checking for cos in -lm... " >&6; }
13749
+if ${ac_cv_lib_m_cos+:} false; then :
13750
+  $as_echo_n "(cached) " >&6
13751
+else
13752
+  ac_check_lib_save_LIBS=$LIBS
13753
+LIBS="-lm  $LIBS"
13754
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13755
+/* end confdefs.h.  */
13225 13756
 
13757
+/* Override any GCC internal prototype to avoid an error.
13758
+   Use char because int might match the return type of a GCC
13759
+   builtin and then its argument prototype would still apply.  */
13760
+#ifdef __cplusplus
13761
+extern "C"
13762
+#endif
13763
+char cos ();
13764
+int
13765
+main ()
13766
+{
13767
+return cos ();
13768
+  ;
13769
+  return 0;
13770
+}
13771
+_ACEOF
13772
+if ac_fn_c_try_link "$LINENO"; then :
13773
+  ac_cv_lib_m_cos=yes
13226 13774
 else
13227
-  ac_cv_header_stdc=no
13775
+  ac_cv_lib_m_cos=no
13228 13776
 fi
13229
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
13230
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
13777
+rm -f core conftest.err conftest.$ac_objext \
13778
+    conftest$ac_exeext conftest.$ac_ext
13779
+LIBS=$ac_check_lib_save_LIBS
13780
+fi
13781
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
13782
+$as_echo "$ac_cv_lib_m_cos" >&6; }
13783
+if test "x$ac_cv_lib_m_cos" = xyes; then :
13784
+  LIBM="-lm"
13785
+fi
13786
+
13787
+  ;;
13788
+esac
13789
+
13790
+
13791
+
13792
+$ac_includes_default
13793
+
13794
+for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h sys/times.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h
13795
+do :
13796
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
13797
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
13798
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
13799
+  cat >>confdefs.h <<_ACEOF
13800
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
13801
+_ACEOF
13802
+
13231 13803
 fi
13232 13804
 
13805
+done
13806
+
13807
+ac_fn_c_check_header_mongrel "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default"
13808
+if test "x$ac_cv_header_syslog_h" = xyes; then :
13809
+
13810
+$as_echo "#define USE_SYSLOG 1" >>confdefs.h
13811
+
13233 13812
 fi
13813
+
13814
+
13815
+
13816
+have_pthreads=no
13817
+ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
13818
+if test "x$ac_cv_header_pthread_h" = xyes; then :
13819
+  have_pthreads=yes
13234 13820
 fi
13235
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
13236
-$as_echo "$ac_cv_header_stdc" >&6; }
13237
-if test $ac_cv_header_stdc = yes; then
13238 13821
 
13239
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
13822
+
13823
+if test "$have_pthreads" = "yes"; then
13824
+
13825
+$as_echo "#define HAVE_PTHREAD_H 1" >>confdefs.h
13240 13826
 
13241 13827
 fi
13242 13828
 
13829
+
13830
+ac_config_files="$ac_config_files libltdl/Makefile"
13831
+
13832
+
13833
+
13834
+$as_echo "#define SCANBUFF 131072" >>confdefs.h
13835
+
13836
+
13837
+$as_echo "#define FILEBUFF 8192" >>confdefs.h
13838
+
13839
+
13840
+
13841
+	# Only modify libdir if user has not overriden it
13842
+	default_libdir='${exec_prefix}/lib'
13843
+	if test "$libdir" = "$default_libdir"; then
13844
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch libdir" >&5
13845
+$as_echo_n "checking for multiarch libdir... " >&6; }
13846
+		# Based on http://lists.gnu.org/archive/html/autoconf/2008-09/msg00072.html
13847
+		if test "$GCC" = yes; then
13848
+			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS` || ac_multilibdir=.
13849
+		else
13850
+			ac_multilibdir=.
13851
+		fi
13852
+		case "$ac_multilibdir" in
13853
+			 # I don't know if the first two cases can happen, but it would be a
13854
+			 # bad idea to override $exec_prefix
13855
+			 /* | ../../* | .) acl_libdirstem=lib ;;
13856
+			 ../*)             acl_libdirstem=`echo $ac_multilibdir | sed 's/^...//' ` ;;
13857
+			*)                 acl_libdirstem=lib/$ac_multilibdir ;;
13858
+		esac
13859
+		libdir='${exec_prefix}/'$acl_libdirstem
13860
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libdir" >&5
13861
+$as_echo "$libdir" >&6; }
13862
+	else
13863
+		acl_libdirstem=lib
13864
+		if test -d "$libdir"; then
13865
+			case "$libdir" in
13866
+				*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
13867
+				*) searchdir=`cd "$libdir" && pwd`
13868
+				   case "$searchdir" in
13869
+					*/lib64 ) acl_libdirstem=lib64 ;;
13870
+				   esac
13871
+			esac
13872
+		fi
13873
+	fi
13874
+
13875
+
13243 13876
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
13244 13877
 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
13245 13878
 if ${ac_cv_c_restrict+:} false; then :
... ...
@@ -13634,139 +14292,6 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
13634 13634
  esac
13635 13635
 
13636 13636
 
13637
-LIBM=
13638
-case $host in
13639
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
13640
-  # These system don't have libm, or don't need it
13641
-  ;;
13642
-*-ncr-sysv4.3*)
13643
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
13644
-$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
13645
-if ${ac_cv_lib_mw__mwvalidcheckl+:} false; then :
13646
-  $as_echo_n "(cached) " >&6
13647
-else
13648
-  ac_check_lib_save_LIBS=$LIBS
13649
-LIBS="-lmw  $LIBS"
13650
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13651
-/* end confdefs.h.  */
13652
-
13653
-/* Override any GCC internal prototype to avoid an error.
13654
-   Use char because int might match the return type of a GCC
13655
-   builtin and then its argument prototype would still apply.  */
13656
-#ifdef __cplusplus
13657
-extern "C"
13658
-#endif
13659
-char _mwvalidcheckl ();
13660
-int
13661
-main ()
13662
-{
13663
-return _mwvalidcheckl ();
13664
-  ;
13665
-  return 0;
13666
-}
13667
-_ACEOF
13668
-if ac_fn_c_try_link "$LINENO"; then :
13669
-  ac_cv_lib_mw__mwvalidcheckl=yes
13670
-else
13671
-  ac_cv_lib_mw__mwvalidcheckl=no
13672
-fi
13673
-rm -f core conftest.err conftest.$ac_objext \
13674
-    conftest$ac_exeext conftest.$ac_ext
13675
-LIBS=$ac_check_lib_save_LIBS
13676
-fi
13677
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
13678
-$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
13679
-if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then :
13680
-  LIBM="-lmw"
13681
-fi
13682
-
13683
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
13684
-$as_echo_n "checking for cos in -lm... " >&6; }
13685
-if ${ac_cv_lib_m_cos+:} false; then :
13686
-  $as_echo_n "(cached) " >&6
13687
-else
13688
-  ac_check_lib_save_LIBS=$LIBS
13689
-LIBS="-lm  $LIBS"
13690
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13691
-/* end confdefs.h.  */
13692
-
13693
-/* Override any GCC internal prototype to avoid an error.
13694
-   Use char because int might match the return type of a GCC
13695
-   builtin and then its argument prototype would still apply.  */
13696
-#ifdef __cplusplus
13697
-extern "C"
13698
-#endif
13699
-char cos ();
13700
-int
13701
-main ()
13702
-{
13703
-return cos ();
13704
-  ;
13705
-  return 0;
13706
-}
13707
-_ACEOF
13708
-if ac_fn_c_try_link "$LINENO"; then :
13709
-  ac_cv_lib_m_cos=yes
13710
-else
13711
-  ac_cv_lib_m_cos=no
13712
-fi
13713
-rm -f core conftest.err conftest.$ac_objext \
13714
-    conftest$ac_exeext conftest.$ac_ext
13715
-LIBS=$ac_check_lib_save_LIBS
13716
-fi
13717
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
13718
-$as_echo "$ac_cv_lib_m_cos" >&6; }
13719
-if test "x$ac_cv_lib_m_cos" = xyes; then :
13720
-  LIBM="$LIBM -lm"
13721
-fi
13722
-
13723
-  ;;
13724
-*)
13725
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
13726
-$as_echo_n "checking for cos in -lm... " >&6; }
13727
-if ${ac_cv_lib_m_cos+:} false; then :
13728
-  $as_echo_n "(cached) " >&6
13729
-else
13730
-  ac_check_lib_save_LIBS=$LIBS
13731
-LIBS="-lm  $LIBS"
13732
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13733
-/* end confdefs.h.  */
13734
-
13735
-/* Override any GCC internal prototype to avoid an error.
13736
-   Use char because int might match the return type of a GCC
13737
-   builtin and then its argument prototype would still apply.  */
13738
-#ifdef __cplusplus
13739
-extern "C"
13740
-#endif
13741
-char cos ();
13742
-int
13743
-main ()
13744
-{
13745
-return cos ();
13746
-  ;
13747
-  return 0;
13748
-}
13749
-_ACEOF
13750
-if ac_fn_c_try_link "$LINENO"; then :
13751
-  ac_cv_lib_m_cos=yes
13752
-else
13753
-  ac_cv_lib_m_cos=no
13754
-fi
13755
-rm -f core conftest.err conftest.$ac_objext \
13756
-    conftest$ac_exeext conftest.$ac_ext
13757
-LIBS=$ac_check_lib_save_LIBS
13758
-fi
13759
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
13760
-$as_echo "$ac_cv_lib_m_cos" >&6; }
13761
-if test "x$ac_cv_lib_m_cos" = xyes; then :
13762
-  LIBM="-lm"
13763
-fi
13764
-
13765
-  ;;
13766
-esac
13767
-
13768
-
13769
-
13770 13637
 # Check whether --enable-gcc-vcheck was given.
13771 13638
 if test "${enable_gcc_vcheck+set}" = set; then :
13772 13639
   enableval=$enable_gcc_vcheck; gcc_check=$enableval
... ...
@@ -14115,102 +14640,12 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
14115 14115
 fi
14116 14116
 
14117 14117
 
14118
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld --version-script" >&5
14119
-$as_echo_n "checking for ld --version-script... " >&6; }
14120
-if ${ac_cv_ld_version_script+:} false; then :
14121
-  $as_echo_n "(cached) " >&6
14122
-else
14123
-    cat > conftest.c <<EOF
14124
-void cl_symbol1(void) {}
14125
-void cli_symbol2(void) {}
14126
-EOF
14127
-  cat > conftest.map <<EOF
14128
-RELEASE
14129
-{
14130
-	global:
14131
-		cl_*;
14132
-	local:
14133
-		*;
14134
-};
14135
-PRIVATE
14136
-{
14137
-	global:
14138
-		cli_*;
14139
-	local:
14140
-		*;
14141
-};
14142
-EOF
14143
-    if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
14144
-				-o conftest.so conftest.c
14145
-				-Wl,--version-script,conftest.map
14146
-		       1>&5'
14147
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
14148
-  (eval $ac_try) 2>&5
14149
-  ac_status=$?
14150
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14151
-  test $ac_status = 0; }; };
14152
-  then
14153
-      VERSIONSCRIPTFLAG=--version-script
14154
-      ac_cv_ld_version_script=yes
14155
-  else
14156
-		if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
14157
-				-o conftest.so conftest.c
14158
-				-Wl,-M,conftest.map
14159
-			1>&5'
14160
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
14161
-  (eval $ac_try) 2>&5
14162
-  ac_status=$?
14163
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14164
-  test $ac_status = 0; }; };
14165
-	then
14166
-		VERSIONSCRIPTFLAG=-M
14167
-		ac_cv_ld_version_script=yes;
14168
-	else
14169
-		ac_cv_ld_version_script=no
14170
-	fi
14171
-  fi
14172
- rm -f conftest*
14173
-fi
14174
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ld_version_script" >&5
14175
-$as_echo "$ac_cv_ld_version_script" >&6; }
14176
-
14177
- if test "x$ac_cv_ld_version_script" = "xyes"; then
14178
-  VERSIONSCRIPT_TRUE=
14179
-  VERSIONSCRIPT_FALSE='#'
14180
-else
14181
-  VERSIONSCRIPT_TRUE='#'
14182
-  VERSIONSCRIPT_FALSE=
14183
-fi
14184
-
14185
-
14186
-# it is not fatal if gperf is missing
14118
+# It's not fatal if gperf is missing
14187 14119
 
14188 14120
 GPERF=${GPERF-"${am_missing_run}gperf"}
14189 14121
 
14190 14122
 
14191 14123
 
14192
-for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h sys/times.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h
14193
-do :
14194
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14195
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
14196
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
14197
-  cat >>confdefs.h <<_ACEOF
14198
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14199
-_ACEOF
14200
-
14201
-fi
14202
-
14203
-done
14204
-
14205
-ac_fn_c_check_header_mongrel "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default"
14206
-if test "x$ac_cv_header_syslog_h" = xyes; then :
14207
-
14208
-$as_echo "#define USE_SYSLOG 1" >>confdefs.h
14209
-
14210
-fi
14211
-
14212
-
14213
-
14214 14124
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
14215 14125
 if test "x$ac_cv_type_off_t" = xyes; then :
14216 14126
 
... ...
@@ -14423,49 +14858,71 @@ _ACEOF
14423 14423
 
14424 14424
 
14425 14425
 
14426
-for ac_func in sysctlbyname
14427
-do :
14428
-  ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
14429
-if test "x$ac_cv_func_sysctlbyname" = xyes; then :
14430
-  cat >>confdefs.h <<_ACEOF
14431
-#define HAVE_SYSCTLBYNAME 1
14432
-_ACEOF
14433
-
14434
-fi
14435
-done
14436
-
14437
-for ac_func in getifaddrs
14438
-do :
14439
-  ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs"
14440
-if test "x$ac_cv_func_getifaddrs" = xyes; then :
14441
-  cat >>confdefs.h <<_ACEOF
14442
-#define HAVE_GETIFADDRS 1
14443
-_ACEOF
14444
-
14445
-fi
14446
-done
14447
-
14448
-ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
14449
-if test "x$ac_cv_header_fcntl_h" = xyes; then :
14450
-
14451
-$as_echo "#define HAVE_FCNTL_H 1" >>confdefs.h
14452
-
14453
-fi
14454
-
14455
-
14456
-ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
14457
-if test "x$ac_cv_header_pthread_h" = xyes; then :
14458
-
14459
-$as_echo "#define HAVE_PTHREAD_H 1" >>confdefs.h
14460
-
14426
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld --version-script" >&5
14427
+$as_echo_n "checking for ld --version-script... " >&6; }
14428
+if ${ac_cv_ld_version_script+:} false; then :
14429
+  $as_echo_n "(cached) " >&6
14430
+else
14431
+    cat > conftest.c <<EOF
14432
+void cl_symbol1(void) {}
14433
+void cli_symbol2(void) {}
14434
+EOF
14435
+  cat > conftest.map <<EOF
14436
+RELEASE
14437
+{
14438
+	global:
14439
+		cl_*;
14440
+	local:
14441
+		*;
14442
+};
14443
+PRIVATE
14444
+{
14445
+	global:
14446
+		cli_*;
14447
+	local:
14448
+		*;
14449
+};
14450
+EOF
14451
+    if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
14452
+				-o conftest.so conftest.c
14453
+				-Wl,--version-script,conftest.map
14454
+		       1>&5'
14455
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
14456
+  (eval $ac_try) 2>&5
14457
+  ac_status=$?
14458
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14459
+  test $ac_status = 0; }; };
14460
+  then
14461
+      VERSIONSCRIPTFLAG=--version-script
14462
+      ac_cv_ld_version_script=yes
14463
+  else
14464
+		if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
14465
+				-o conftest.so conftest.c
14466
+				-Wl,-M,conftest.map
14467
+			1>&5'
14468
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
14469
+  (eval $ac_try) 2>&5
14470
+  ac_status=$?
14471
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14472
+  test $ac_status = 0; }; };
14473
+	then
14474
+		VERSIONSCRIPTFLAG=-M
14475
+		ac_cv_ld_version_script=yes;
14476
+	else
14477
+		ac_cv_ld_version_script=no
14478
+	fi
14479
+  fi
14480
+ rm -f conftest*
14461 14481
 fi
14482
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ld_version_script" >&5
14483
+$as_echo "$ac_cv_ld_version_script" >&6; }
14462 14484
 
14463
-
14464
-ac_fn_c_check_header_mongrel "$LINENO" "net/if_dl.h" "ac_cv_header_net_if_dl_h" "$ac_includes_default"
14465
-if test "x$ac_cv_header_net_if_dl_h" = xyes; then :
14466
-
14467
-$as_echo "#define HAVE_NET_IF_DL_H 1" >>confdefs.h
14468
-
14485
+ if test "x$ac_cv_ld_version_script" = "xyes"; then
14486
+  VERSIONSCRIPT_TRUE=
14487
+  VERSIONSCRIPT_FALSE='#'
14488
+else
14489
+  VERSIONSCRIPT_TRUE='#'
14490
+  VERSIONSCRIPT_FALSE=
14469 14491
 fi
14470 14492
 
14471 14493
 
... ...
@@ -14936,6 +15393,19 @@ _ACEOF
14936 14936
 
14937 14937
 	fi
14938 14938
 
14939
+
14940
+for ac_func in enable_extended_FILE_stdio
14941
+do :
14942
+  ac_fn_c_check_func "$LINENO" "enable_extended_FILE_stdio" "ac_cv_func_enable_extended_FILE_stdio"
14943
+if test "x$ac_cv_func_enable_extended_FILE_stdio" = xyes; then :
14944
+  cat >>confdefs.h <<_ACEOF
14945
+#define HAVE_ENABLE_EXTENDED_FILE_STDIO 1
14946
+_ACEOF
14947
+
14948
+fi
14949
+done
14950
+
14951
+
14939 14952
 # Check whether --enable-mempool was given.
14940 14953
 if test "${enable_mempool+set}" = set; then :
14941 14954
   enableval=$enable_mempool; enable_mempool=$enableval
... ...
@@ -15841,13 +16311,6 @@ else
15841 15841
 fi
15842 15842
 
15843 15843
 
15844
-have_pthreads=no
15845
-ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
15846
-if test "x$ac_cv_header_pthread_h" = xyes; then :
15847
-  have_pthreads=yes
15848
-fi
15849
-
15850
-
15851 15844
 
15852 15845
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
15853 15846
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
... ...
@@ -15871,6 +16334,7 @@ fi
15871 15871
   MAINT=$MAINTAINER_MODE_TRUE
15872 15872
 
15873 15873
 
15874
+
15874 15875
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib installation" >&5
15875 15876
 $as_echo_n "checking for zlib installation... " >&6; }
15876 15877
 
... ...
@@ -15933,8 +16397,8 @@ $as_echo "$as_me: WARNING: ****** stability problems to the ClamAV developers!"
15933 15933
     if test "$ZLIB_HOME" != "/usr"; then
15934 15934
 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
15935 15935
 	save_LDFLAGS="$LDFLAGS"
15936
-	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
15937
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
15936
+    LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
15937
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
15938 15938
 $as_echo_n "checking for inflateEnd in -lz... " >&6; }
15939 15939
 if ${ac_cv_lib_z_inflateEnd+:} false; then :
15940 15940
   $as_echo_n "(cached) " >&6
... ...
@@ -16118,6 +16582,7 @@ fi
16118 16118
     LIBS="$save_LIBS"
16119 16119
 fi
16120 16120
 
16121
+
16121 16122
 # Check whether --enable-bzip2 was given.
16122 16123
 if test "${enable_bzip2+set}" = set; then :
16123 16124
   enableval=$enable_bzip2; want_bzip2=$enableval
... ...
@@ -16953,92 +17418,6 @@ $as_echo "$as_me: WARNING: ****** bzip2 support disabled" >&2;}
16953 16953
     fi
16954 16954
 fi
16955 16955
 
16956
-have_curl="no"
16957
-curl_msg="Please use the web interface for submitting FPs/FNs."
16958
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl installation" >&5
16959
-$as_echo_n "checking for libcurl installation... " >&6; }
16960
-
16961
-
16962
-# Check whether --with-libcurl was given.
16963
-if test "${with_libcurl+set}" = set; then :
16964
-  withval=$with_libcurl;
16965
-if test "$withval"; then
16966
-    LIBCURL_HOME="$withval"
16967
-fi
16968
-
16969
-else
16970
-
16971
-LIBCURL_HOME=/usr/local
16972
-if test ! -f "$LIBCURL_HOME/include/curl/curl.h"
16973
-then
16974
-    LIBCURL_HOME=/usr
16975
-fi
16976
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBCURL_HOME" >&5
16977
-$as_echo "$LIBCURL_HOME" >&6; }
16978
-
16979
-fi
16980
-
16981
-
16982
-if test ! -f "$LIBCURL_HOME/include/curl/curl.h"
16983
-then
16984
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libcurl not found. Please use the web interface for submitting FPs/FNs." >&5
16985
-$as_echo "$as_me: WARNING: libcurl not found. Please use the web interface for submitting FPs/FNs." >&2;}
16986
-else
16987
-    if test -f "$LIBCURL_HOME/bin/curl-config"; then
16988
-        CURL_LDFLAGS=$($LIBCURL_HOME/bin/curl-config --libs)
16989
-        CURL_CPPFLAGS=$($LIBCURL_HOME/bin/curl-config --cflags)
16990
-    else
16991
-        CURL_LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
16992
-        CURL_CPPFLAGS="-I$LIBCURL_HOME/include"
16993
-    fi
16994
-
16995
-    save_LDFLAGS="$LDFLAGS"
16996
-    LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
16997
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5
16998
-$as_echo_n "checking for curl_easy_init in -lcurl... " >&6; }
16999
-if ${ac_cv_lib_curl_curl_easy_init+:} false; then :
17000
-  $as_echo_n "(cached) " >&6
17001
-else
17002
-  ac_check_lib_save_LIBS=$LIBS
17003
-LIBS="-lcurl  $LIBS"
17004
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17005
-/* end confdefs.h.  */
17006
-
17007
-/* Override any GCC internal prototype to avoid an error.
17008
-   Use char because int might match the return type of a GCC
17009
-   builtin and then its argument prototype would still apply.  */
17010
-#ifdef __cplusplus
17011
-extern "C"
17012
-#endif
17013
-char curl_easy_init ();
17014
-int
17015
-main ()
17016
-{
17017
-return curl_easy_init ();
17018
-  ;
17019
-  return 0;
17020
-}
17021
-_ACEOF
17022
-if ac_fn_c_try_link "$LINENO"; then :
17023
-  ac_cv_lib_curl_curl_easy_init=yes
17024
-else
17025
-  ac_cv_lib_curl_curl_easy_init=no
17026
-fi
17027
-rm -f core conftest.err conftest.$ac_objext \
17028
-    conftest$ac_exeext conftest.$ac_ext
17029
-LIBS=$ac_check_lib_save_LIBS
17030
-fi
17031
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5
17032
-$as_echo "$ac_cv_lib_curl_curl_easy_init" >&6; }
17033
-if test "x$ac_cv_lib_curl_curl_easy_init" = xyes; then :
17034
-  curl_msg="";have_curl="yes";CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS";CLAMSUBMIT_CFLAGS="$CLAMSUBMIT_CFLAGS $CURL_CPPFLAGS"
17035
-else
17036
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs." >&5
17037
-$as_echo "$as_me: WARNING: Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs." >&2;}
17038
-fi
17039
-
17040
-fi
17041
-
17042 16956
  if test "x$HAVE_LIBBZ2" = "xyes"; then
17043 16957
   HAVE_LIBBZ2_TRUE=
17044 16958
   HAVE_LIBBZ2_FALSE='#'
... ...
@@ -17064,163 +17443,6 @@ else
17064 17064
 fi
17065 17065
 
17066 17066
 
17067
-want_xml="auto"
17068
-# Check whether --enable-xml was given.
17069
-if test "${enable_xml+set}" = set; then :
17070
-  enableval=$enable_xml; want_xml=$enableval
17071
-else
17072
-  want_xml="auto"
17073
-fi
17074
-
17075
-
17076
-XML_HOME=""
17077
-if test "X$want_xml" != "Xno"; then
17078
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 installation" >&5
17079
-$as_echo_n "checking for libxml2 installation... " >&6; }
17080
-
17081
-# Check whether --with-xml was given.
17082
-if test "${with_xml+set}" = set; then :
17083
-  withval=$with_xml;
17084
-  if test "$withval"
17085
-  then
17086
-    XML_HOME="$withval"
17087
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $XML_HOME" >&5
17088
-$as_echo "using $XML_HOME" >&6; }
17089
-  else
17090
-    as_fn_error $? "cannot assign blank value to --with-xml" "$LINENO" 5
17091
-  fi
17092
-
17093
-else
17094
-
17095
-  XML_HOME=/usr/local
17096
-  if test ! -x "$XML_HOME/bin/xml2-config"
17097
-  then
17098
-    XML_HOME=/usr
17099
-    if test ! -x "$XML_HOME/bin/xml2-config"
17100
-    then
17101
-      XML_HOME=""
17102
-    fi
17103
-  fi
17104
-  if test "x$XML_HOME" != "x"; then
17105
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_HOME" >&5
17106
-$as_echo "$XML_HOME" >&6; }
17107
-  else
17108
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
17109
-$as_echo "not found" >&6; }
17110
-  fi
17111
-
17112
-fi
17113
-
17114
-fi
17115
-
17116
-found_xml="no"
17117
-XMLCONF_VERSION=""
17118
-XML_CPPFLAGS=""
17119
-XML_LIBS=""
17120
-if test "x$XML_HOME" != "x"; then
17121
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking xml2-config version" >&5
17122
-$as_echo_n "checking xml2-config version... " >&6; }
17123
-  XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
17124
-  if test "x%XMLCONF_VERSION" != "x"; then
17125
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLCONF_VERSION" >&5
17126
-$as_echo "$XMLCONF_VERSION" >&6; }
17127
-    found_xml="yes"
17128
-    XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
17129
-    XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
17130
-  else
17131
-    as_fn_error $? "xml2-config failed" "$LINENO" 5
17132
-  fi
17133
-fi
17134
-
17135
-working_xml="no"
17136
-if test "X$found_xml" != "Xno"; then
17137
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlreader.h in $XML_HOME" >&5
17138
-$as_echo_n "checking for xmlreader.h in $XML_HOME... " >&6; }
17139
-
17140
-  if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
17141
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
17142
-$as_echo "not found" >&6; }
17143
-  else
17144
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
17145
-$as_echo "found" >&6; }
17146
-    save_LIBS="$LIBS"
17147
-    save_CPPFLAGS="$CPPFLAGS"
17148
-    CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
17149
-    save_LDFLAGS="$LDFLAGS"
17150
-    LDFLAGS="$LDFLAGS $XML_LIBS"
17151
-
17152
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlTextReaderRead in -lxml2" >&5
17153
-$as_echo_n "checking for xmlTextReaderRead in -lxml2... " >&6; }
17154
-if ${ac_cv_lib_xml2_xmlTextReaderRead+:} false; then :
17155
-  $as_echo_n "(cached) " >&6
17156
-else
17157
-  ac_check_lib_save_LIBS=$LIBS
17158
-LIBS="-lxml2  $LIBS"
17159
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17160
-/* end confdefs.h.  */
17161
-
17162
-/* Override any GCC internal prototype to avoid an error.
17163
-   Use char because int might match the return type of a GCC
17164
-   builtin and then its argument prototype would still apply.  */
17165
-#ifdef __cplusplus
17166
-extern "C"
17167
-#endif
17168
-char xmlTextReaderRead ();
17169
-int
17170
-main ()
17171
-{
17172
-return xmlTextReaderRead ();
17173
-  ;
17174
-  return 0;
17175
-}
17176
-_ACEOF
17177
-if ac_fn_c_try_link "$LINENO"; then :
17178
-  ac_cv_lib_xml2_xmlTextReaderRead=yes
17179
-else
17180
-  ac_cv_lib_xml2_xmlTextReaderRead=no
17181
-fi
17182
-rm -f core conftest.err conftest.$ac_objext \
17183
-    conftest$ac_exeext conftest.$ac_ext
17184
-LIBS=$ac_check_lib_save_LIBS
17185
-fi
17186
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlTextReaderRead" >&5
17187
-$as_echo "$ac_cv_lib_xml2_xmlTextReaderRead" >&6; }
17188
-if test "x$ac_cv_lib_xml2_xmlTextReaderRead" = xyes; then :
17189
-  working_xml="yes"
17190
-else
17191
-  working_xml="no"
17192
-fi
17193
-
17194
-
17195
-    CPPFLAGS="$save_CPPFLAGS"
17196
-    LDFLAGS="$save_LDFLAGS"
17197
-    LIBS="$save_LIBS"
17198
-  fi
17199
-fi
17200
-
17201
-if test "$working_xml" = "yes"; then
17202
-
17203
-$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
17204
-
17205
-
17206
-
17207
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with libxml2 from $XML_HOME" >&5
17208
-$as_echo "$as_me: Compiling and linking with libxml2 from $XML_HOME" >&6;}
17209
-else
17210
-  if test "$want_xml" = "yes"; then
17211
-     as_fn_error $? "****** Please install libxml2 packages!" "$LINENO" 5
17212
-  else
17213
-    if test "$want_xml" != "no"; then
17214
-      { $as_echo "$as_me:${as_lineno-$LINENO}: ****** libxml2 support unavailable" >&5
17215
-$as_echo "$as_me: ****** libxml2 support unavailable" >&6;}
17216
-    fi
17217
-  fi
17218
-  XML_CPPFLAGS=""
17219
-  XML_LIBS=""
17220
-
17221
-
17222
-fi
17223
-
17224 17067
 # Check whether --enable-getaddrinfo was given.
17225 17068
 if test "${enable_getaddrinfo+set}" = set; then :
17226 17069
   enableval=$enable_getaddrinfo; want_getaddrinfo=$enableval
... ...
@@ -17668,6 +17890,14 @@ else
17668 17668
 fi
17669 17669
 
17670 17670
 
17671
+# Check whether --enable-yp-check was given.
17672
+if test "${enable_yp_check+set}" = set; then :
17673
+  enableval=$enable_yp_check; use_yp=$enableval
17674
+else
17675
+  use_yp="no"
17676
+fi
17677
+
17678
+
17671 17679
 
17672 17680
 # Check whether --with-user was given.
17673 17681
 if test "${with_user+set}" = set; then :
... ...
@@ -17697,22 +17927,6 @@ cat >>confdefs.h <<_ACEOF
17697 17697
 _ACEOF
17698 17698
 
17699 17699
 
17700
-# Check whether --enable-clamav was given.
17701
-if test "${enable_clamav+set}" = set; then :
17702
-  enableval=$enable_clamav; test_clamav=$enableval
17703
-else
17704
-  test_clamav=yes
17705
-fi
17706
-
17707
-
17708
-# Check whether --enable-debug was given.
17709
-if test "${enable_debug+set}" = set; then :
17710
-  enableval=$enable_debug; enable_debug=$enableval
17711
-else
17712
-  enable_debug="no"
17713
-fi
17714
-
17715
-
17716 17700
 if test "$enable_debug" = "yes"; then
17717 17701
   VERSION_SUFFIX="$VERSION_SUFFIX-debug"
17718 17702
 
... ...
@@ -17745,6 +17959,7 @@ $as_echo "#define FRESHCLAM_NO_CACHE 1" >>confdefs.h
17745 17745
 
17746 17746
 fi
17747 17747
 
17748
+
17748 17749
 # Check whether --enable-dns-fix was given.
17749 17750
 if test "${enable_dns_fix+set}" = set; then :
17750 17751
   enableval=$enable_dns_fix; enable_dnsfix=$enableval
... ...
@@ -18107,16 +18322,6 @@ $as_echo "#define C_GNU_HURD 1" >>confdefs.h
18107 18107
     ;;
18108 18108
 esac
18109 18109
 
18110
-
18111
-
18112
-
18113
-
18114
-
18115
-
18116
-
18117
-
18118
-
18119
-
18120 18110
 if test "$have_milter" = "yes"; then
18121 18111
 
18122 18112
         save_LIBS="$LIBS"
... ...
@@ -18334,18 +18539,6 @@ $as_echo "#define _REENTRANT 1" >>confdefs.h
18334 18334
 
18335 18335
 fi
18336 18336
 
18337
-for ac_func in enable_extended_FILE_stdio
18338
-do :
18339
-  ac_fn_c_check_func "$LINENO" "enable_extended_FILE_stdio" "ac_cv_func_enable_extended_FILE_stdio"
18340
-if test "x$ac_cv_func_enable_extended_FILE_stdio" = xyes; then :
18341
-  cat >>confdefs.h <<_ACEOF
18342
-#define HAVE_ENABLE_EXTENDED_FILE_STDIO 1
18343
-_ACEOF
18344
-
18345
-fi
18346
-done
18347
-
18348
-
18349 18337
 
18350 18338
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readdir_r" >&5
18351 18339
 $as_echo_n "checking for readdir_r... " >&6; }
... ...
@@ -18640,7 +18833,7 @@ $as_echo_n "checking for $clamav_user using ypmatch... " >&6; }
18640 18640
     then
18641 18641
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18642 18642
 $as_echo "no" >&6; }
18643
-	as_fn_error $? "User $clamav_user (and/or group $clamav_group) does not exist. Please read the documentation !" "$LINENO" 5
18643
+	as_fn_error $? "User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" "$LINENO" 5
18644 18644
     else
18645 18645
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user $clamav_user and group $clamav_group" >&5
18646 18646
 $as_echo "yes, user $clamav_user and group $clamav_group" >&6; }
... ...
@@ -19492,17 +19685,6 @@ $as_echo "disabled" >&6; }
19492 19492
 fi
19493 19493
 
19494 19494
 
19495
-
19496
-cat >>confdefs.h <<_ACEOF
19497
-#define VERSION "$VERSION"
19498
-_ACEOF
19499
-
19500
-
19501
-cat >>confdefs.h <<_ACEOF
19502
-#define VERSION_SUFFIX "$VERSION_SUFFIX"
19503
-_ACEOF
19504
-
19505
-
19506 19495
 # Check whether --enable-clamdtop was given.
19507 19496
 if test "${enable_clamdtop+set}" = set; then :
19508 19497
   enableval=$enable_clamdtop; enable_clamdtop=$enableval
... ...
@@ -21174,6 +21356,426 @@ $as_echo "#define HAVE__INTERNAL__SHA_COLLECT 1" >>confdefs.h
21174 21174
 
21175 21175
 fi
21176 21176
 
21177
+
21178
+case "$host_os" in
21179
+freebsd*)
21180
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getvmmap in -lutil" >&5
21181
+$as_echo_n "checking for kinfo_getvmmap in -lutil... " >&6; }
21182
+if ${ac_cv_lib_util_kinfo_getvmmap+:} false; then :
21183
+  $as_echo_n "(cached) " >&6
21184
+else
21185
+  ac_check_lib_save_LIBS=$LIBS
21186
+LIBS="-lutil  $LIBS"
21187
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21188
+/* end confdefs.h.  */
21189
+
21190
+/* Override any GCC internal prototype to avoid an error.
21191
+   Use char because int might match the return type of a GCC
21192
+   builtin and then its argument prototype would still apply.  */
21193
+#ifdef __cplusplus
21194
+extern "C"
21195
+#endif
21196
+char kinfo_getvmmap ();
21197
+int
21198
+main ()
21199
+{
21200
+return kinfo_getvmmap ();
21201
+  ;
21202
+  return 0;
21203
+}
21204
+_ACEOF
21205
+if ac_fn_c_try_link "$LINENO"; then :
21206
+  ac_cv_lib_util_kinfo_getvmmap=yes
21207
+else
21208
+  ac_cv_lib_util_kinfo_getvmmap=no
21209
+fi
21210
+rm -f core conftest.err conftest.$ac_objext \
21211
+    conftest$ac_exeext conftest.$ac_ext
21212
+LIBS=$ac_check_lib_save_LIBS
21213
+fi
21214
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_kinfo_getvmmap" >&5
21215
+$as_echo "$ac_cv_lib_util_kinfo_getvmmap" >&6; }
21216
+if test "x$ac_cv_lib_util_kinfo_getvmmap" = xyes; then :
21217
+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lutil"
21218
+else
21219
+  as_fn_error $? "You are running BSD but you don't have kinfo_getvmmap in the util library. Please fix manually." "$LINENO" 5
21220
+fi
21221
+
21222
+;;
21223
+esac
21224
+
21225
+
21226
+have_curl="no"
21227
+curl_msg="Please use the web interface for submitting FPs/FNs."
21228
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl installation" >&5
21229
+$as_echo_n "checking for libcurl installation... " >&6; }
21230
+
21231
+
21232
+# Check whether --with-libcurl was given.
21233
+if test "${with_libcurl+set}" = set; then :
21234
+  withval=$with_libcurl;
21235
+if test "$withval"; then
21236
+    LIBCURL_HOME="$withval"
21237
+fi
21238
+
21239
+else
21240
+
21241
+LIBCURL_HOME=/usr/local
21242
+if test ! -f "$LIBCURL_HOME/include/curl/curl.h"
21243
+then
21244
+    LIBCURL_HOME=/usr
21245
+fi
21246
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBCURL_HOME" >&5
21247
+$as_echo "$LIBCURL_HOME" >&6; }
21248
+
21249
+fi
21250
+
21251
+
21252
+if test ! -f "$LIBCURL_HOME/include/curl/curl.h"
21253
+then
21254
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libcurl not found. Please use the web interface for submitting FPs/FNs." >&5
21255
+$as_echo "$as_me: WARNING: libcurl not found. Please use the web interface for submitting FPs/FNs." >&2;}
21256
+else
21257
+    if test -f "$LIBCURL_HOME/bin/curl-config"; then
21258
+        CURL_LDFLAGS=$($LIBCURL_HOME/bin/curl-config --libs)
21259
+        CURL_CPPFLAGS=$($LIBCURL_HOME/bin/curl-config --cflags)
21260
+    else
21261
+        CURL_LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
21262
+        CURL_CPPFLAGS="-I$LIBCURL_HOME/include"
21263
+    fi
21264
+
21265
+    save_LDFLAGS="$LDFLAGS"
21266
+    LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
21267
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5
21268
+$as_echo_n "checking for curl_easy_init in -lcurl... " >&6; }
21269
+if ${ac_cv_lib_curl_curl_easy_init+:} false; then :
21270
+  $as_echo_n "(cached) " >&6
21271
+else
21272
+  ac_check_lib_save_LIBS=$LIBS
21273
+LIBS="-lcurl  $LIBS"
21274
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21275
+/* end confdefs.h.  */
21276
+
21277
+/* Override any GCC internal prototype to avoid an error.
21278
+   Use char because int might match the return type of a GCC
21279
+   builtin and then its argument prototype would still apply.  */
21280
+#ifdef __cplusplus
21281
+extern "C"
21282
+#endif
21283
+char curl_easy_init ();
21284
+int
21285
+main ()
21286
+{
21287
+return curl_easy_init ();
21288
+  ;
21289
+  return 0;
21290
+}
21291
+_ACEOF
21292
+if ac_fn_c_try_link "$LINENO"; then :
21293
+  ac_cv_lib_curl_curl_easy_init=yes
21294
+else
21295
+  ac_cv_lib_curl_curl_easy_init=no
21296
+fi
21297
+rm -f core conftest.err conftest.$ac_objext \
21298
+    conftest$ac_exeext conftest.$ac_ext
21299
+LIBS=$ac_check_lib_save_LIBS
21300
+fi
21301
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5
21302
+$as_echo "$ac_cv_lib_curl_curl_easy_init" >&6; }
21303
+if test "x$ac_cv_lib_curl_curl_easy_init" = xyes; then :
21304
+  curl_msg="";have_curl="yes";CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS";CLAMSUBMIT_CFLAGS="$CLAMSUBMIT_CFLAGS $CURL_CPPFLAGS"
21305
+else
21306
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs." >&5
21307
+$as_echo "$as_me: WARNING: Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs." >&2;}
21308
+fi
21309
+
21310
+fi
21311
+
21312
+
21313
+
21314
+
21315
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libconfig installation" >&5
21316
+$as_echo_n "checking for libconfig installation... " >&6; }
21317
+
21318
+
21319
+# Check whether --with-libconfig was given.
21320
+if test "${with_libconfig+set}" = set; then :
21321
+  withval=$with_libconfig;
21322
+if test "$withval"; then
21323
+    LIBCONFIG_HOME="$withval"
21324
+fi
21325
+
21326
+else
21327
+
21328
+LIBCONFIG_HOME=/usr/local
21329
+if test ! -f "$LIBCONFIG_HOME/include/libconfig.h"
21330
+then
21331
+    LIBCONFIG_HOME=/usr
21332
+fi
21333
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBCONFIG_HOME" >&5
21334
+$as_echo "$LIBCONFIG_HOME" >&6; }
21335
+
21336
+fi
21337
+
21338
+
21339
+if test ! -f "$LIBCONFIG_HOME/include/libconfig.h"
21340
+then
21341
+    as_fn_error $? "libconfig not found." "$LINENO" 5
21342
+fi
21343
+
21344
+save_LDFLAGS="$LDFLAGS"
21345
+LDFLAGS="-L$LIBCONFIG_HOME/lib -lconfig"
21346
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for config_init in -lconfig" >&5
21347
+$as_echo_n "checking for config_init in -lconfig... " >&6; }
21348
+if ${ac_cv_lib_config_config_init+:} false; then :
21349
+  $as_echo_n "(cached) " >&6
21350
+else
21351
+  ac_check_lib_save_LIBS=$LIBS
21352
+LIBS="-lconfig  $LIBS"
21353
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21354
+/* end confdefs.h.  */
21355
+
21356
+/* Override any GCC internal prototype to avoid an error.
21357
+   Use char because int might match the return type of a GCC
21358
+   builtin and then its argument prototype would still apply.  */
21359
+#ifdef __cplusplus
21360
+extern "C"
21361
+#endif
21362
+char config_init ();
21363
+int
21364
+main ()
21365
+{
21366
+return config_init ();
21367
+  ;
21368
+  return 0;
21369
+}
21370
+_ACEOF
21371
+if ac_fn_c_try_link "$LINENO"; then :
21372
+  ac_cv_lib_config_config_init=yes
21373
+else
21374
+  ac_cv_lib_config_config_init=no
21375
+fi
21376
+rm -f core conftest.err conftest.$ac_objext \
21377
+    conftest$ac_exeext conftest.$ac_ext
21378
+LIBS=$ac_check_lib_save_LIBS
21379
+fi
21380
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_config_config_init" >&5
21381
+$as_echo "$ac_cv_lib_config_config_init" >&6; }
21382
+if test "x$ac_cv_lib_config_config_init" = xyes; then :
21383
+  FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
21384
+else
21385
+  as_fn_error $? "Your libconfig installation is misconfigured" "$LINENO" 5
21386
+fi
21387
+
21388
+
21389
+CLAMSCAN_LIBS="$CLAMSCAN_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
21390
+CLAMDSCAN_LIBS="$CLAMDSCAN_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
21391
+CLAMD_LIBS="$CLAMD_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
21392
+CLAMMEM_LIBS="$CLAMMEM_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
21393
+CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
21394
+LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
21395
+CLAMDTOP_LIBS="$CLAMDTOP_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
21396
+CLAMBC_LIBS="$CLAMBC_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
21397
+
21398
+CLAMSCAN_CPPFLAGS="$FRESHCLAM_CPPFLAGS -I$LIBCONFIG_HOME/include"
21399
+CLAMDSCAN_CPPFLAGS="$CLAMDSCAN_CPPFLAGS -I$LIBCONFIG_HOME/include"
21400
+CLAMD_CPPFLAGS="$CLAMD_CPPFLAGS -I$LIBCONFIG_HOME/include"
21401
+CLAMMEM_CPPFLAGS="$CLAMMEM_CPPFLAGS -I$LIBCONFIG_HOME/include"
21402
+CLAMAV_MILTER_CPPFLAGS="$CLAMAV_MILTER_CPPFLAGS -I$LIBCONFIG_HOME/include"
21403
+LIBCLAMAV_CPPFLAGS="$LIBCLAMAV_CPPFLAGS -I$LIBCONFIG_HOME/include"
21404
+LIBCLAMSHARED_CPPFLAGS="$LIBCLAMSHARED_CPPFLAGS -I$LIBCONFIG_HOME/include"
21405
+SIGTOOL_CPPFLAGS="$SIGTOOL_CPPFLAGS -I$LIBCONFIG_HOME/include"
21406
+CLAMCONF_CPPFLAGS="$CLAMCONF_CPPFLAGS -I$LIBCONFIG_HOME/include"
21407
+CLAMDTOP_CPPFLAGS="$CLAMDTOP_CPPFLAGS -I$LIBCONFIG_HOME/include"
21408
+CLAMBC_CPPFLAGS="$CLAMBC_CPPFLAGS -I$LIBCONFIG_HOME/include"
21409
+
21410
+LDFLAGS="$save_ldflags"
21411
+
21412
+
21413
+want_xml="auto"
21414
+# Check whether --enable-xml was given.
21415
+if test "${enable_xml+set}" = set; then :
21416
+  enableval=$enable_xml; want_xml=$enableval
21417
+else
21418
+  want_xml="auto"
21419
+fi
21420
+
21421
+
21422
+XML_HOME=""
21423
+if test "X$want_xml" != "Xno"; then
21424
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2 installation" >&5
21425
+$as_echo_n "checking for libxml2 installation... " >&6; }
21426
+
21427
+# Check whether --with-xml was given.
21428
+if test "${with_xml+set}" = set; then :
21429
+  withval=$with_xml;
21430
+  if test "$withval"
21431
+  then
21432
+    XML_HOME="$withval"
21433
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $XML_HOME" >&5
21434
+$as_echo "using $XML_HOME" >&6; }
21435
+  else
21436
+    as_fn_error $? "cannot assign blank value to --with-xml" "$LINENO" 5
21437
+  fi
21438
+
21439
+else
21440
+
21441
+  XML_HOME=/usr/local
21442
+  if test ! -x "$XML_HOME/bin/xml2-config"
21443
+  then
21444
+    XML_HOME=/usr
21445
+    if test ! -x "$XML_HOME/bin/xml2-config"
21446
+    then
21447
+      XML_HOME=""
21448
+    fi
21449
+  fi
21450
+  if test "x$XML_HOME" != "x"; then
21451
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_HOME" >&5
21452
+$as_echo "$XML_HOME" >&6; }
21453
+  else
21454
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
21455
+$as_echo "not found" >&6; }
21456
+  fi
21457
+
21458
+fi
21459
+
21460
+fi
21461
+
21462
+found_xml="no"
21463
+XMLCONF_VERSION=""
21464
+XML_CPPFLAGS=""
21465
+XML_LIBS=""
21466
+if test "x$XML_HOME" != "x"; then
21467
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking xml2-config version" >&5
21468
+$as_echo_n "checking xml2-config version... " >&6; }
21469
+  XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
21470
+  if test "x%XMLCONF_VERSION" != "x"; then
21471
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLCONF_VERSION" >&5
21472
+$as_echo "$XMLCONF_VERSION" >&6; }
21473
+    found_xml="yes"
21474
+    XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
21475
+    XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
21476
+  else
21477
+    as_fn_error $? "xml2-config failed" "$LINENO" 5
21478
+  fi
21479
+fi
21480
+
21481
+working_xml="no"
21482
+if test "X$found_xml" != "Xno"; then
21483
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlreader.h in $XML_HOME" >&5
21484
+$as_echo_n "checking for xmlreader.h in $XML_HOME... " >&6; }
21485
+
21486
+  if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
21487
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
21488
+$as_echo "not found" >&6; }
21489
+  else
21490
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
21491
+$as_echo "found" >&6; }
21492
+    save_LIBS="$LIBS"
21493
+    save_CPPFLAGS="$CPPFLAGS"
21494
+    CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
21495
+    save_LDFLAGS="$LDFLAGS"
21496
+    LDFLAGS="$LDFLAGS $XML_LIBS"
21497
+
21498
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlTextReaderRead in -lxml2" >&5
21499
+$as_echo_n "checking for xmlTextReaderRead in -lxml2... " >&6; }
21500
+if ${ac_cv_lib_xml2_xmlTextReaderRead+:} false; then :
21501
+  $as_echo_n "(cached) " >&6
21502
+else
21503
+  ac_check_lib_save_LIBS=$LIBS
21504
+LIBS="-lxml2  $LIBS"
21505
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21506
+/* end confdefs.h.  */
21507
+
21508
+/* Override any GCC internal prototype to avoid an error.
21509
+   Use char because int might match the return type of a GCC
21510
+   builtin and then its argument prototype would still apply.  */
21511
+#ifdef __cplusplus
21512
+extern "C"
21513
+#endif
21514
+char xmlTextReaderRead ();
21515
+int
21516
+main ()
21517
+{
21518
+return xmlTextReaderRead ();
21519
+  ;
21520
+  return 0;
21521
+}
21522
+_ACEOF
21523
+if ac_fn_c_try_link "$LINENO"; then :
21524
+  ac_cv_lib_xml2_xmlTextReaderRead=yes
21525
+else
21526
+  ac_cv_lib_xml2_xmlTextReaderRead=no
21527
+fi
21528
+rm -f core conftest.err conftest.$ac_objext \
21529
+    conftest$ac_exeext conftest.$ac_ext
21530
+LIBS=$ac_check_lib_save_LIBS
21531
+fi
21532
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlTextReaderRead" >&5
21533
+$as_echo "$ac_cv_lib_xml2_xmlTextReaderRead" >&6; }
21534
+if test "x$ac_cv_lib_xml2_xmlTextReaderRead" = xyes; then :
21535
+  working_xml="yes"
21536
+else
21537
+  working_xml="no"
21538
+fi
21539
+
21540
+
21541
+    CPPFLAGS="$save_CPPFLAGS"
21542
+    LDFLAGS="$save_LDFLAGS"
21543
+    LIBS="$save_LIBS"
21544
+  fi
21545
+fi
21546
+
21547
+if test "$working_xml" = "yes"; then
21548
+
21549
+$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
21550
+
21551
+
21552
+
21553
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with libxml2 from $XML_HOME" >&5
21554
+$as_echo "$as_me: Compiling and linking with libxml2 from $XML_HOME" >&6;}
21555
+else
21556
+  if test "$want_xml" = "yes"; then
21557
+     as_fn_error $? "****** Please install libxml2 packages!" "$LINENO" 5
21558
+  else
21559
+    if test "$want_xml" != "no"; then
21560
+      { $as_echo "$as_me:${as_lineno-$LINENO}: ****** libxml2 support unavailable" >&5
21561
+$as_echo "$as_me: ****** libxml2 support unavailable" >&6;}
21562
+    fi
21563
+  fi
21564
+  XML_CPPFLAGS=""
21565
+  XML_LIBS=""
21566
+
21567
+
21568
+fi
21569
+
21570
+
21571
+
21572
+
21573
+
21574
+
21575
+
21576
+
21577
+
21578
+
21579
+
21580
+
21581
+
21582
+
21583
+
21584
+
21585
+
21586
+
21587
+
21588
+
21589
+
21590
+
21591
+
21592
+
21593
+
21594
+
21595
+
21596
+
21177 21597
  if test "$have_curl" = "yes"; then
21178 21598
   ENABLE_CLAMSUBMIT_TRUE=
21179 21599
   ENABLE_CLAMSUBMIT_FALSE='#'
... ...
@@ -21183,7 +21785,8 @@ else
21183 21183
 fi
21184 21184
 
21185 21185
 
21186
-ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile clamsubmit/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"
21186
+ac_config_files="$ac_config_files shared/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamsubmit/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"
21187
+
21187 21188
 
21188 21189
 cat >confcache <<\_ACEOF
21189 21190
 # This file is a shell script that caches the results of configure
... ...
@@ -21294,14 +21897,6 @@ LIBOBJS=$ac_libobjs
21294 21294
 LTLIBOBJS=$ac_ltlibobjs
21295 21295
 
21296 21296
 
21297
- if test -n "$EXEEXT"; then
21298
-  am__EXEEXT_TRUE=
21299
-  am__EXEEXT_FALSE='#'
21300
-else
21301
-  am__EXEEXT_TRUE='#'
21302
-  am__EXEEXT_FALSE=
21303
-fi
21304
-
21305 21297
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
21306 21298
   as_fn_error $? "conditional \"AMDEP\" was never defined.
21307 21299
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -21310,6 +21905,14 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
21310 21310
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
21311 21311
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
21312 21312
 fi
21313
+ if test -n "$EXEEXT"; then
21314
+  am__EXEEXT_TRUE=
21315
+  am__EXEEXT_FALSE='#'
21316
+else
21317
+  am__EXEEXT_TRUE='#'
21318
+  am__EXEEXT_FALSE=
21319
+fi
21320
+
21313 21321
 if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
21314 21322
   as_fn_error $? "conditional \"INSTALL_LTDL\" was never defined.
21315 21323
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -22250,16 +22853,17 @@ do
22250 22250
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
22251 22251
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
22252 22252
     "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;;
22253
+    "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;;
22253 22254
     "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;;
22254 22255
     "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;;
22255 22256
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
22256 22257
     "clamd/Makefile") CONFIG_FILES="$CONFIG_FILES clamd/Makefile" ;;
22257 22258
     "clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;;
22259
+    "clamsubmit/Makefile") CONFIG_FILES="$CONFIG_FILES clamsubmit/Makefile" ;;
22258 22260
     "clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;;
22259 22261
     "freshclam/Makefile") CONFIG_FILES="$CONFIG_FILES freshclam/Makefile" ;;
22260 22262
     "sigtool/Makefile") CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;;
22261 22263
     "clamconf/Makefile") CONFIG_FILES="$CONFIG_FILES clamconf/Makefile" ;;
22262
-    "clamsubmit/Makefile") CONFIG_FILES="$CONFIG_FILES clamsubmit/Makefile" ;;
22263 22264
     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
22264 22265
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
22265 22266
     "unit_tests/Makefile") CONFIG_FILES="$CONFIG_FILES unit_tests/Makefile" ;;
... ...
@@ -23911,14 +24515,6 @@ LIBOBJS=$ac_libobjs
23911 23911
 LTLIBOBJS=$ac_ltlibobjs
23912 23912
 
23913 23913
 
23914
- if test -n "$EXEEXT"; then
23915
-  am__EXEEXT_TRUE=
23916
-  am__EXEEXT_FALSE='#'
23917
-else
23918
-  am__EXEEXT_TRUE='#'
23919
-  am__EXEEXT_FALSE=
23920
-fi
23921
-
23922 23914
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
23923 23915
   as_fn_error $? "conditional \"AMDEP\" was never defined.
23924 23916
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -23927,6 +24523,14 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
23927 23927
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
23928 23928
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
23929 23929
 fi
23930
+ if test -n "$EXEEXT"; then
23931
+  am__EXEEXT_TRUE=
23932
+  am__EXEEXT_FALSE='#'
23933
+else
23934
+  am__EXEEXT_TRUE='#'
23935
+  am__EXEEXT_FALSE=
23936
+fi
23937
+
23930 23938
 if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
23931 23939
   as_fn_error $? "conditional \"INSTALL_LTDL\" was never defined.
23932 23940
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -24876,16 +25480,17 @@ do
24876 24876
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
24877 24877
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
24878 24878
     "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;;
24879
+    "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;;
24879 24880
     "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;;
24880 24881
     "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;;
24881 24882
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
24882 24883
     "clamd/Makefile") CONFIG_FILES="$CONFIG_FILES clamd/Makefile" ;;
24883 24884
     "clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;;
24885
+    "clamsubmit/Makefile") CONFIG_FILES="$CONFIG_FILES clamsubmit/Makefile" ;;
24884 24886
     "clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;;
24885 24887
     "freshclam/Makefile") CONFIG_FILES="$CONFIG_FILES freshclam/Makefile" ;;
24886 24888
     "sigtool/Makefile") CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;;
24887 24889
     "clamconf/Makefile") CONFIG_FILES="$CONFIG_FILES clamconf/Makefile" ;;
24888
-    "clamsubmit/Makefile") CONFIG_FILES="$CONFIG_FILES clamsubmit/Makefile" ;;
24889 24890
     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
24890 24891
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
24891 24892
     "unit_tests/Makefile") CONFIG_FILES="$CONFIG_FILES unit_tests/Makefile" ;;
... ...
@@ -31,6 +31,7 @@ dnl safety check, this used to be a parameter to AC_INIT
31 31
 AC_CONFIG_SRCDIR([clamscan/clamscan.c])
32 32
 AC_CONFIG_MACRO_DIR([m4])
33 33
 AC_CREATE_TARGET_H([target.h])
34
+AC_USE_SYSTEM_EXTENSIONS
34 35
 
35 36
 dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings
36 37
 dnl enable stealth builds and psychedelic tests
... ...
@@ -41,386 +42,23 @@ dnl we told automake to not define these, since we want to include
41 41
 dnl the date in the version
42 42
 AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
43 43
 
44
-dnl change this on a release
45
-VERSION="devel-`date +%Y%m%d`"
46
-dnl VERSION="0.98"
47
-
48
-LC_CURRENT=7
49
-LC_REVISION=19
50
-LC_AGE=1
51
-LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
52
-AC_SUBST([LIBCLAMAV_VERSION])
53
-
54
-AC_PROG_AWK
55
-AC_PROG_INSTALL
56
-AC_PROG_LN_S
57
-AC_PROG_MAKE_SET
44
+m4_include([m4/reorganization/version.m4])
58 45
 
59 46
 LT_CONFIG_LTDL_DIR([libltdl])
60 47
 LT_INIT([dlopen disable-static])
61 48
 LTDL_INIT([recursive])
49
+
50
+m4_include([m4/reorganization/build_tools.m4])
51
+m4_include([m4/reorganization/headers.m4])
52
+
62 53
 AC_CONFIG_FILES([libltdl/Makefile])
63 54
 
64
-major=`expr $LC_CURRENT - $LC_AGE`
65
-AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$major.$LC_AGE.$LC_REVISION",
66
-	  ["Full library version number"])
67
-AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], $major,
68
-	  ["Major library version number"])
69 55
 AC_DEFINE([SCANBUFF], 131072, [scan buffer size])
70 56
 AC_DEFINE([FILEBUFF], 8192,   [file i/o buffer size])
71 57
 
72
-AC_LIB_MULTILIB_GUESS
73
-
74
-AC_HEADER_STDC
75
-AC_C_RESTRICT
76
-AC_C_CONST
77
-AC_C_INLINE
78
-AC_C_BIGENDIAN
79
-
80
-LT_LIB_M
81
-
82
-AC_ARG_ENABLE([gcc-vcheck],
83
-[  --disable-gcc-vcheck	  do not check for buggy gcc version ],
84
-gcc_check=$enableval, gcc_check="yes")
85
-
86
-msg_gcc_check="use --disable-gcc-vcheck to disable this check. Before reporting any bugs check with a supported version of gcc"
87
-VERSION_SUFFIX=
88
-dnl Check for gcc-4.1.0
89
-if test "$gcc_check" = "yes"; then
90
-	if test "x$ac_compiler_gnu" = "xyes"; then
91
-		AC_MSG_CHECKING([for a supported version of gcc])
92
-		gcc_version=`${CC} -dumpversion`
93
-		case "${gcc_version}" in
94
-			4.1.0*)
95
-				AC_MSG_RESULT([no (${gcc_version})])
96
-				AC_MSG_ERROR([gcc 4.1.0 is known to incorrectly compile upx.c. Upgrade your compiler to at least 4.1.1/4.1.2)])
97
-				;;
98
-			*)
99
-				AC_MSG_RESULT([ok (${gcc_version})])
100
-				;;
101
-		esac
102
-		case "${gcc_version}" in
103
-		    [[56789]].* | 4.[[3456789]].*)
104
-			# bb #1581 - temporarely add -fno-strict-aliasing so gcc 4.4.0
105
-			# works correctly
106
-			CFLAGS="$CFLAGS -fno-strict-aliasing"
107
-			;;
108
-		    *)
109
-			;;
110
-		esac
111
-	fi
112
-else
113
-	CFLAGS="$CFLAGS -O0"
114
-	VERSION_SUFFIX="$VERSION_SUFFIX-broken-compiler"
115
-fi
116
-
117
-# add distcheck warning flags
118
-distcheck_enable_flags=0
119
-if test "x$ac_compiler_gnu" = "xyes"; then
120
-	gcc_version=`${CC} -dumpversion`
121
-	case "${gcc_version}" in
122
-		4.[[3456789]]*)
123
-			distcheck_enable_flags=1
124
-			;;
125
-		[[56789]].*)
126
-			distcheck_enable_flags=1
127
-			;;
128
-	esac
129
-fi
130
-
131
-dnl Checks if compiler produces valid code, regardless of compiler
132
-dnl we do these checks here to avoid receiving endless bugreports about
133
-dnl breakages due to compiler bugs.
134
-
135
-dnl Check if compiler produces invalid code on gcc PR27603 (affects upx.c)
136
-dnl testcase from gcc testsuite
137
-AC_MSG_CHECKING([for gcc bug PR27603])
138
-AC_TRY_RUN(
139
-	   [
140
-/* (C) Richard Guenther */	   
141
-void exit (int);
142
-void abort (void);
143
-int a;
144
-int main(void)
145
-{
146
-  int j;
147
-  for (j = 0; j < 6; j++)
148
-  {
149
-    if ((unsigned)j - 3 <= 1)
150
-      exit (0);
151
-    a = 1000 * (6 - j);
152
-  }
153
-  abort ();
154
-}
155
-], [AC_MSG_RESULT([ok, bug not present])],
156
-[AC_MSG_ERROR([your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
157
-
158
-dnl Check if compiler produces invalid code on gcc PR26763-2 (affects upx.c)
159
-dnl testcase from gcc testsuite
160
-AC_MSG_CHECKING([for gcc bug PR26763-2])
161
-AC_TRY_RUN(
162
-	   [
163
-/* (C) Richard Guenther */	   
164
-extern void abort(void);
165
-
166
-static int try (char *a, int d)
167
-{
168
-  return a + d > a;
169
-}
170
-
171
-int main(void)
172
-{
173
-  char bla[100];
174
-
175
-  if (try (bla + 50, -1))
176
-    abort ();
177
-
178
-  return 0;
179
-}
180
-], [AC_MSG_RESULT([ok, bug not present])],
181
-[AC_MSG_ERROR([your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763])],[AC_MSG_RESULT([cross-compiling, assumed ok])])
182
-
183
-dnl Check if compiler produces invalid code on own testcase based on upx.c
184
-AC_MSG_CHECKING([for valid code generation of CLI_ISCONTAINED])
185
-AC_TRY_RUN(
186
-	   [
187
-#include <stdio.h>
188
-static struct v{
189
-	char* dst;
190
-	unsigned int dsize;
191
-	unsigned int dcur;
192
-	unsigned int backsize;
193
-	signed int unp_offset;
194
-} values[] = {
195
-	{(char*)0xf78ab008, 0x2e000, 1, 4, -1594},
196
-	{(char*)0xb7af1008, 0x2e000, 1, 4, -1594}
197
-
198
-};
199
-extern void abort(void);
200
-
201
-#define CLI_ISCONTAINED(bb, bb_size, sb, sb_size)	\
202
-  ((bb_size) > 0 && (sb_size) > 0 && (size_t)(sb_size) <= (size_t)(bb_size) \
203
-   && (sb) >= (bb) && ((sb) + (sb_size)) <= ((bb) + (bb_size)) && ((sb) + (sb_size)) > (bb) && (sb) < ((bb) + (bb_size)))
204
-
205
-int crashtest()
206
-{
207
-	unsigned int backsize, dcur;
208
-	int dval=0x12000, unp_offset;
209
-	int* dsize = &dval;
210
-	char* dst = (char*)0x12000;
211
-	while(1) {
212
-		backsize=4;
213
-		dcur=0;
214
-		unp_offset=0x800002c7;
215
-
216
-		if (!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) || !CLI_ISCONTAINED(dst, *dsize, dst+dcur, backsize) || unp_offset >=0)
217
-			return -1;
218
-		abort();
219
-	}
220
-	return 0;
221
-}
222
-
223
-int main(void)
224
-{
225
-	int i;
226
-	for(i=0;i<sizeof(values)/sizeof(values[0]);i++) {
227
-		struct v* v= &values[i];
228
-		char* dst = v->dst;
229
-		unsigned int* dsize = &v->dsize;
230
-		unsigned int dcur = v->dcur;
231
-		unsigned int backsize = v->backsize-1;
232
-		signed int  unp_offset = v->unp_offset;
233
-
234
-		if(!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) ||
235
-				!CLI_ISCONTAINED(dst, *dsize,dst+dcur,backsize) || unp_offset >= 0)  {
236
-			continue;
237
-		}
238
-		abort();
239
-	}
240
-	crashtest();
241
-	return 0;
242
-}
243
-], [AC_MSG_RESULT([ok, bug not present])],
244
-[AC_MSG_ERROR([your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
245
-
246
-dnl Check if compiler produces invalid code on gcc PR28045 (affects upx.c)
247
-dnl testcase from gcc testsuite
248
-AC_MSG_CHECKING([for gcc bug PR28045])
249
-AC_TRY_RUN(
250
-	   [
251
-/* (C) Andrew Pinski */
252
-extern void abort(void);
253
-struct a
254
-{
255
-   unsigned int bits : 1;
256
-   signed long val : ((sizeof(long) * 8) - 1);
257
-};
258
-static int Fnegate (struct a b)
259
-{
260
-  if ((-((long)b.val)) <= ((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))
261
-      && (-((long)b.val)) >= (-(((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))) - 1))
262
-     return 0 ;
263
-  abort ();
264
-}
265
-int main (void)
266
-{
267
-  struct a b = {1, 1};
268
-  Fnegate (b);
269
-  return 0;
270
-}
271
-], [AC_MSG_RESULT([ok, bug not present])],
272
-[AC_MSG_ERROR([your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
273
-
274
-dnl Check if compiler produces invalid code on gcc PR37573 (affects autoit.c)
275
-dnl this is a bug in gcc 4.4.0, but for some reason it affects gcc 4.1.2 too
276
-dnl gcc 4.1.3 is OK. This bug occurs only at -O3.
277
-AC_MSG_CHECKING([for gcc bug PR37573])
278
-AC_TRY_RUN(
279
-	   [
280
-#include <stdlib.h>
281
-#include <string.h>
282
-struct S
283
-{
284
-  unsigned int *a;
285
-  unsigned int b;
286
-  unsigned int c[624];
287
-};
288
-static unsigned char
289
-foo (struct S *s)
290
-{
291
-  unsigned int r;
292
-  if (!--s->b)
293
-    {
294
-      unsigned int *c = s->c;
295
-      unsigned int i;
296
-      s->a = c;
297
-      for (i = 0; i < 227; i++)
298
-	c[i] =
299
-	  ((((c[i] ^ c[i + 1]) & 0x7ffffffe) ^ c[i]) >> 1) ^
300
-	  ((0 - (c[i + 1] & 1)) & 0x9908b0df) ^ c[i + 397];
301
-      for (; i < 623; i++)
302
-	c[i] =
303
-	  ((((c[i] ^ c[i + 1]) & 0x7ffffffe) ^ c[i]) >> 1) ^
304
-	  ((0 - (c[i + 1] & 1)) & 0x9908b0df) ^ c[i - 227];
305
-      c[623] =
306
-	((((c[623] ^ c[0]) & 0x7ffffffe) ^ c[623]) >> 1) ^ ((0 - (c[0] & 1)) &
307
-							    0x9908b0df) ^ c[i
308
-									    -
309
-									    227];
310
-    }
311
-  r = *(s->a++);
312
-  r ^= (r >> 11);
313
-  r ^= ((r & 0xff3a58ad) << 7);
314
-  r ^= ((r & 0xffffdf8c) << 15);
315
-  r ^= (r >> 18);
316
-  return (unsigned char) (r >> 1);
317
-}
318
-
319
-void
320
-bar (unsigned char *p, unsigned int q, unsigned int r)
321
-{
322
-  struct S s;
323
-  unsigned int i;
324
-  unsigned int *c = s.c;
325
-  *c = r;
326
-  for (i = 1; i < 624; i++)
327
-    c[i] = i + 0x6c078965 * ((c[i - 1] >> 30) ^ c[i - 1]);
328
-  s.b = 1;
329
-  while (q--)
330
-    *p++ ^= foo (&s);
331
-};
332
-
333
-static unsigned char p[23] = {
334
-  0xc0, 0x49, 0x17, 0x32, 0x62, 0x1e, 0x2e, 0xd5, 0x4c, 0x19, 0x28, 0x49,
335
-    0x91, 0xe4, 0x72, 0x83, 0x91, 0x3d, 0x93, 0x83, 0xb3, 0x61, 0x38
336
-};
337
-
338
-static unsigned char q[23] = {
339
-  0x3e, 0x41, 0x55, 0x54, 0x4f, 0x49, 0x54, 0x20, 0x55, 0x4e, 0x49, 0x43,
340
-    0x4f, 0x44, 0x45, 0x20, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x3c
341
-};
342
-
343
-int
344
-main (void)
345
-{
346
-  unsigned int s;
347
-  s = 23;
348
-  bar (p, s, s + 0xa25e);
349
-  if (memcmp (p, q, s) != 0)
350
-	abort ();
351
-  return 0;
352
-}
353
-
354
-], [AC_MSG_RESULT([ok, bug not present])],
355
-[AC_MSG_ERROR([your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
356
-
357
-dnl Linker feature checks
358
-dnl check for version script support in the linker (GNU ld, or Solaris ld style)
359
-AC_CACHE_CHECK([for ld --version-script], [ac_cv_ld_version_script], [dnl
360
-  cat > conftest.c <<EOF
361
-void cl_symbol1(void) {}
362
-void cli_symbol2(void) {}
363
-EOF
364
-  cat > conftest.map <<EOF
365
-RELEASE
366
-{
367
-	global:
368
-		cl_*;
369
-	local:
370
-		*;
371
-};
372
-PRIVATE
373
-{
374
-	global:
375
-		cli_*;
376
-	local:
377
-		*;
378
-};
379
-EOF
380
-  dnl check for GNU ld style linker version script
381
-  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
382
-				-o conftest.so conftest.c
383
-				-Wl,--version-script,conftest.map
384
-		       1>&AS_MESSAGE_LOG_FD]);
385
-  then
386
-      VERSIONSCRIPTFLAG=--version-script
387
-      ac_cv_ld_version_script=yes
388
-  else
389
-	dnl check for Solaris ld style linker version script
390
-	if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
391
-				-o conftest.so conftest.c
392
-				-Wl,-M,conftest.map
393
-			1>&AS_MESSAGE_LOG_FD]);
394
-	then
395
-		VERSIONSCRIPTFLAG=-M
396
-		ac_cv_ld_version_script=yes;
397
-	else
398
-		ac_cv_ld_version_script=no
399
-	fi
400
-  fi
401
- rm -f conftest*])
402
-AC_SUBST([VERSIONSCRIPTFLAG])
403
-AM_CONDITIONAL([VERSIONSCRIPT], test "x$ac_cv_ld_version_script" = "xyes")
404
-
405
-# it is not fatal if gperf is missing
406
-AM_MISSING_PROG(GPERF, gperf)
407
-AC_SUBST(GPERF)
408
-
409
-AC_CHECK_HEADERS([stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h sys/times.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h])
410
-AC_CHECK_HEADER([syslog.h],AC_DEFINE([USE_SYSLOG],1,[use syslog]),)
411
-
412
-AC_TYPE_OFF_T
413
-AC_COMPILE_CHECK_SIZEOF([short])
414
-AC_COMPILE_CHECK_SIZEOF([int])
415
-AC_COMPILE_CHECK_SIZEOF([long])
416
-AC_COMPILE_CHECK_SIZEOF([long long])
417
-AC_COMPILE_CHECK_SIZEOF([void *])
418
-
419
-AC_CHECK_FUNCS([sysctlbyname])
420
-AC_CHECK_FUNCS([getifaddrs])
421
-AC_CHECK_HEADER([fcntl.h], AC_DEFINE([HAVE_FCNTL_H],1,[Define to 1 if you have the <fcntl.h> header file]))
422
-AC_CHECK_HEADER([pthread.h], AC_DEFINE([HAVE_PTHREAD_H],1,[Define to 1 if you have the <pthread.h> header file]))
423
-AC_CHECK_HEADER([net/if_dl.h], AC_DEFINE([HAVE_NET_IF_DL_H],1,[Define to 1 if you have the <net/if_dl.h> header file]))
58
+m4_include([m4/reorganization/c_options.m4])
59
+m4_include([m4/reorganization/compiler_checks.m4])
60
+m4_include([m4/reorganization/linker_checks.m4])
424 61
 
425 62
 AC_ARG_ENABLE([experimental],
426 63
 [  --enable-experimental	enable experimental code],
... ...
@@ -434,1351 +72,75 @@ fi
434 434
 build_configure_args=`echo "$ac_configure_args" | sed -e 's/[\"]//g'`
435 435
 AC_SUBST([BUILD_CONFIGURE_FLAGS], [$build_configure_args])
436 436
 
437
-AX_CHECK_UNAME_SYSCALL
438
-AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
439
-AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])
440
-
441
-AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise])
442
-AC_FUNC_FSEEKO
443
-
444
-dnl Check if anon maps are available, check if we can determine the page size
445
-AC_C_FUNC_MMAP_PRIVATE
446
-AC_C_FUNC_PAGESIZE
447
-AC_C_FUNC_MMAP_ANONYMOUS
448
-AC_ARG_ENABLE([mempool],[  --disable-mempool       disable memory pools], enable_mempool=$enableval, enable_mempool="yes")
449
-have_mempool="no"
450
-if test "$enable_mempool" = "yes"; then
451
-	if test "$ac_cv_c_mmap_private" != "yes"; then
452
-		AC_MSG_NOTICE([****** mempool support disabled (mmap not available or not usable)])
453
-	else
454
-		if test "$ac_cv_c_can_get_pagesize" != "yes"; then
455
-			AC_MSG_NOTICE([****** mempool support disabled (pagesize cannot be determined)])
456
-		else
457
-			if test "$ac_cv_c_mmap_anonymous" = "no"; then
458
-				AC_MSG_NOTICE([****** mempool support disabled (anonymous mmap not available)])
459
-			else
460
-				AC_DEFINE([USE_MPOOL],1,[enable memory pools])
461
-				have_mempool="yes"
462
-			fi
463
-		fi
464
-	fi
465
-fi
466
-
467
-enable_check_ut=auto
468
-enable_ut_install=no
469
-AC_ARG_ENABLE(check,
470
-[  --enable-check           Enable 'check' unit tests (default=auto)], enable_check_ut=$enableval, enable_check_ut="auto" )
471
-
472
-if test "$enable_check_ut" != "no" ; then
473
-	AC_LIB_FIND([check],[check.h],
474
-			AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
475
-			[CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"],
476
-			[])
477
-fi
478
-AC_SUBST([CHECK_CPPFLAGS])
479
-AC_SUBST([CHECK_LIBS])
480
-AM_CONDITIONAL([HAVE_LIBCHECK],test "X$HAVE_LIBCHECK" = "Xyes")
481
-
482
-if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then
483
-    AC_MSG_ERROR([
484
-
485
-ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/
486
-])
487
-fi
488
-
489
-AC_ARG_ENABLE(coverage,
490
-	      AC_HELP_STRING([--enable-coverage],
491
-			     [turn on test coverage
492
-			      @<:@default=no@:>@]),
493
-[enable_cov=$enableval],[enable_cov="no"])
494
-
495
-if test "x$enable_coverage" = "xyes"; then
496
-	if test "x$CHECK_LIBS" = "x"; then
497
-		AC_MSG_ERROR([Coverage testing required, but unit tests not enabled!])
498
-	fi
499
-	if test "x$ac_compiler_gnu" != "xyes"; then
500
-		AC_MSG_ERROR([coverage testing only works if gcc is used])
501
-	fi
502
-
503
-	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
504
-	LDFLAGS="$LDFLAGS -lgcov"
505
-	AC_CHECK_PROGS(GCOV, gcov, false)
506
-	AC_CHECK_PROGS(LCOV, lcov, false)
507
-	AC_CHECK_PROGS(GENHTML, genhtml, false)
508
-fi
509
-
510
-AM_CONDITIONAL(ENABLE_COVERAGE, test "x$enable_coverage" = "xyes")
511
-
512
-have_pthreads=no
513
-AC_CHECK_HEADER([pthread.h],[have_pthreads=yes],)
437
+m4_include([m4/reorganization/code_checks/functions.m4])
438
+m4_include([m4/reorganization/code_checks/mpool.m4])
439
+m4_include([m4/reorganization/code_checks/unit_tests.m4])
440
+m4_include([m4/reorganization/code_checks/coverage.m4])
514 441
 
515 442
 AM_MAINTAINER_MODE
516
-dnl Check for zlib
517
-AC_MSG_CHECKING([for zlib installation])
518
-AC_ARG_WITH([zlib],
519
-[  --with-zlib=DIR	  path to directory containing zlib library (default=
520
-			  /usr/local or /usr if not found in /usr/local)],
521
-[
522
-if test "$withval"; then
523
-  ZLIB_HOME="$withval"
524
-  AC_MSG_RESULT([using $ZLIB_HOME])
525
-fi
526
-], [
527
-ZLIB_HOME=/usr/local
528
-if test ! -f "$ZLIB_HOME/include/zlib.h"
529
-then
530
-  ZLIB_HOME=/usr
531
-fi
532
-AC_MSG_RESULT([$ZLIB_HOME])
533
-])
534
-
535
-CLAMDSCAN_LIBS="$FRESHCLAM_LIBS"
536
-
537
-AC_ARG_ENABLE([zlib-vcheck],
538
-[  --disable-zlib-vcheck	  do not check for buggy zlib version ],
539
-zlib_check=$enableval, zlib_check="yes")
540
-
541
-if test ! -f "$ZLIB_HOME/include/zlib.h"
542
-then
543
-    AC_MSG_ERROR([Please install zlib and zlib-devel packages])
544
-else
545
-
546
-    vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
547
-    if test -z "$vuln"; then
548
-	vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
549
-    fi
550
-
551
-    if test -n "$vuln"; then
552
-	if test "$zlib_check" = "yes"; then
553
-	    AC_MSG_ERROR(The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!)
554
-	else
555
-	    AC_MSG_WARN([****** This ClamAV installation may be linked against])
556
-	    AC_MSG_WARN([****** a broken zlib version. Please DO NOT report any])
557
-	    AC_MSG_WARN([****** stability problems to the ClamAV developers!])
558
-	fi
559
-    fi
560
-
561
-    save_LIBS="$LIBS"
562
-    if test "$ZLIB_HOME" != "/usr"; then
563
-	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
564
-	save_LDFLAGS="$LDFLAGS"
565
-	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
566
-	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
567
-	AC_CHECK_LIB([z], [gzopen], [], AC_MSG_ERROR([Your zlib is missing gzopen()]))
568
-	LDFLAGS="$save_LDFLAGS"
569
-    else
570
-	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
571
-	AC_CHECK_LIB([z], [gzopen],[], AC_MSG_ERROR([Your zlib is missing gzopen()]))
572
-    fi
573
-    LIBS="$save_LIBS"
574
-fi
575
-
576
-AC_ARG_ENABLE([bzip2],
577
-[  --disable-bzip2	  disable bzip2 support],
578
-want_bzip2=$enableval, want_bzip2="yes")
579
-
580
-bzip_check="ok"
581
-if test "$want_bzip2" = "yes"
582
-then
583
-    AC_LIB_LINKFLAGS([bz2])
584
-    save_LDFLAGS="$LDFLAGS"
585
-    # Only add -L if prefix is not empty
586
-    test -z "$LIBBZ2_PREFIX" || LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";
587
-
588
-    have_bzprefix="no"
589
-    AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], [have_bzprefix="yes"])
590
-    if test "x$have_bzprefix" = "xno"; then
591
-        AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])
592
-    fi
593
-    LDFLAGS="$save_LDFLAGS"
594
-    if test "$HAVE_LIBBZ2" = "yes"; then
595
-	AC_CHECK_HEADER([bzlib.h],
596
-			[AC_C_CVE_2008_1372],
597
-			[ac_cv_c_cve_2008_1372="no"])
598
-	if test "$ac_cv_c_cve_2008_1372" = "bugged"; then
599
-		AC_MSG_WARN([****** bzip2 libraries are affected by the CVE-2008-1372 bug])
600
-		AC_MSG_WARN([****** We strongly suggest you to update to bzip2 1.0.5.])
601
-		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])
602
-		bzip_check="bugged (CVE-2008-1372)"
603
-	fi
604
-	if test "$ac_cv_c_cve_2008_1372" = "linkfailed"; then
605
-		dnl This shouldn't happen
606
-		dnl We failed to link but libtool may still be able to link, so don't disable bzip2 just yet
607
-		AC_MSG_WARN([****** Unable to link bzip2 testcase])
608
-		AC_MSG_WARN([****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify])
609
-		AC_MSG_WARN([****** It is recommended to fix your build environment so that we can run the testcase!])
610
-		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])
611
-		bzip_check="link failed (CVE-2008-1372)"
612
-	fi
613
-
614
-	case "$ac_cv_c_cve_2008_1372" in
615
-	ok|bugged|linkfailed)
616
-		;;
617
-	*)
618
-		HAVE_LIBBZ2=no
619
-		;;
620
-	esac
621
-    fi
622
-
623
-    if test "$HAVE_LIBBZ2" = "yes"; then
624
-	AC_C_CVE_2010_0405
625
-	if test "$ac_cv_c_cve_2010_0405" = "bugged"; then
626
-		AC_MSG_WARN([****** bzip2 libraries are affected by the CVE-2010-0405 bug])
627
-		AC_MSG_WARN([****** We strongly suggest you to update bzip2])
628
-		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])
629
-		bzip_check="bugged (CVE-2010-0405)"
630
-	fi
631
-	if test "$ac_cv_c_cve_2010_0405" = "linkfailed"; then
632
-		dnl This shouldn't happen
633
-		dnl We failed to link but libtool may still be able to link, so don't disable bzip2 just yet
634
-		AC_MSG_WARN([****** Unable to link bzip2 testcase])
635
-		AC_MSG_WARN([****** You may be affected by CVE-2010-0405 bug, but I need to be able to link a testcase to verify])
636
-		AC_MSG_WARN([****** It is recommended to fix your build environment so that we can run the testcase!])
637
-		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])
638
-		bzip_check="link failed (CVE-2010-0405)"
639
-	fi
640
-
641
-	case "$ac_cv_c_cve_2010_0405" in
642
-	ok|bugged|linkfailed)
643
-		LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2"
644
-		AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2])
645
-		;;
646
-	*)
647
-		AC_MSG_WARN([****** bzip2 support disabled])
648
-		;;
649
-	esac
650
-
651
-    else
652
-	AC_MSG_WARN([****** bzip2 support disabled])
653
-    fi
654
-fi
655
-
656
-have_curl="no"
657
-curl_msg="Please use the web interface for submitting FPs/FNs."
658
-AC_MSG_CHECKING([for libcurl installation])
659
-
660
-AC_ARG_WITH([libcurl],
661
-[  --with-libcurl=DIR   path to directory containing libcurl (default=
662
-    /usr/local or /usr if not found in /usr/local)],
663
-[
664
-if test "$withval"; then
665
-    LIBCURL_HOME="$withval"
666
-fi
667
-], [
668
-LIBCURL_HOME=/usr/local
669
-if test ! -f "$LIBCURL_HOME/include/curl/curl.h"
670
-then
671
-    LIBCURL_HOME=/usr
672
-fi
673
-AC_MSG_RESULT([$LIBCURL_HOME])
674
-])
675
-
676
-if test ! -f "$LIBCURL_HOME/include/curl/curl.h"
677
-then
678
-    AC_MSG_WARN([libcurl not found. Please use the web interface for submitting FPs/FNs.])
679
-else
680
-    if test -f "$LIBCURL_HOME/bin/curl-config"; then
681
-        CURL_LDFLAGS=$($LIBCURL_HOME/bin/curl-config --libs)
682
-        CURL_CPPFLAGS=$($LIBCURL_HOME/bin/curl-config --cflags)
683
-    else
684
-        CURL_LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
685
-        CURL_CPPFLAGS="-I$LIBCURL_HOME/include"
686
-    fi
687
-
688
-    save_LDFLAGS="$LDFLAGS"
689
-    LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
690
-    AC_CHECK_LIB([curl], [curl_easy_init], [curl_msg="";have_curl="yes";CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS";CLAMSUBMIT_CFLAGS="$CLAMSUBMIT_CFLAGS $CURL_CPPFLAGS"],
691
-            [AC_MSG_WARN([Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs.])])
692
-fi
693
-
694
-AM_CONDITIONAL([HAVE_LIBBZ2], test "x$HAVE_LIBBZ2" = "xyes")
695
-
696
-AC_ARG_ENABLE([unrar],
697
-[  --disable-unrar	  do not build libclamunrar and libclamunrar_iface ],
698
-want_unrar=$enableval, want_unrar="yes")
699
-AM_CONDITIONAL([ENABLE_UNRAR],[test "$want_unrar" = "yes"])
700
-
701
-dnl libxml2
702
-want_xml="auto"
703
-AC_ARG_ENABLE([xml],
704
-[  --disable-xml	  disable DMG and XAR support],
705
-want_xml=$enableval, want_xml="auto")
706
-
707
-XML_HOME=""
708
-if test "X$want_xml" != "Xno"; then
709
-  AC_MSG_CHECKING([for libxml2 installation])
710
-  AC_ARG_WITH([xml],
711
-  [  --with-xml=DIR	  path to directory containing libxml2 library (default=
712
-			  /usr/local or /usr if not found in /usr/local)],
713
-  [
714
-  if test "$withval"
715
-  then
716
-    XML_HOME="$withval"
717
-    AC_MSG_RESULT([using $XML_HOME])
718
-  else
719
-    AC_MSG_ERROR([cannot assign blank value to --with-xml])
720
-  fi
721
-  ], [
722
-  XML_HOME=/usr/local
723
-  if test ! -x "$XML_HOME/bin/xml2-config"
724
-  then
725
-    XML_HOME=/usr
726
-    if test ! -x "$XML_HOME/bin/xml2-config"
727
-    then
728
-      XML_HOME=""
729
-    fi
730
-  fi
731
-  if test "x$XML_HOME" != "x"; then
732
-    AC_MSG_RESULT([$XML_HOME])
733
-  else
734
-    AC_MSG_RESULT([not found])
735
-  fi
736
-  ])
737
-fi
738
-
739
-found_xml="no"
740
-XMLCONF_VERSION=""
741
-XML_CPPFLAGS=""
742
-XML_LIBS=""
743
-if test "x$XML_HOME" != "x"; then
744
-  AC_MSG_CHECKING([xml2-config version])
745
-  XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
746
-  if test "x%XMLCONF_VERSION" != "x"; then
747
-    AC_MSG_RESULT([$XMLCONF_VERSION])
748
-    found_xml="yes"
749
-    XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
750
-    XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
751
-  else
752
-    AC_MSG_ERROR([xml2-config failed])
753
-  fi
754
-fi
755
-
756
-working_xml="no"
757
-if test "X$found_xml" != "Xno"; then
758
-  AC_MSG_CHECKING([for xmlreader.h in $XML_HOME])
759
-
760
-  if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
761
-    AC_MSG_RESULT([not found])
762
-  else
763
-    AC_MSG_RESULT([found])
764
-    save_LIBS="$LIBS"
765
-    save_CPPFLAGS="$CPPFLAGS"
766
-    CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
767
-    save_LDFLAGS="$LDFLAGS"
768
-    LDFLAGS="$LDFLAGS $XML_LIBS"
769
-
770
-    AC_CHECK_LIB([xml2], [xmlTextReaderRead], [working_xml="yes"], [working_xml="no"])
771
-
772
-    CPPFLAGS="$save_CPPFLAGS"
773
-    LDFLAGS="$save_LDFLAGS"
774
-    LIBS="$save_LIBS"
775
-  fi
776
-fi
777
-
778
-if test "$working_xml" = "yes"; then
779
-  AC_DEFINE([HAVE_LIBXML2],1,[Define to 1 if you have the 'libxml2' library (-lxml2).])
780
-  AC_SUBST(XML_CPPFLAGS)
781
-  AC_SUBST(XML_LIBS)
782
-  AC_MSG_NOTICE([Compiling and linking with libxml2 from $XML_HOME])
783
-else
784
-  if test "$want_xml" = "yes"; then
785
-     AC_MSG_ERROR([****** Please install libxml2 packages!])
786
-  else
787
-    if test "$want_xml" != "no"; then
788
-      AC_MSG_NOTICE([****** libxml2 support unavailable])
789
-    fi
790
-  fi
791
-  XML_CPPFLAGS=""
792
-  XML_LIBS=""
793
-  AC_SUBST(XML_CPPFLAGS)
794
-  AC_SUBST(XML_LIBS)
795
-fi
796
-
797
-AC_ARG_ENABLE([getaddrinfo],
798
-[  --disable-getaddrinfo          disable support for getaddrinfo],
799
-want_getaddrinfo=$enableval, want_getaddrinfo="yes")
800
-
801
-if test "$want_getaddrinfo" = "yes"
802
-then
803
-    AC_MSG_CHECKING([for getaddrinfo])
804
-    AC_CACHE_VAL([have_cv_gai],[
805
-		AC_TRY_RUN([
806
-		    #include <sys/types.h>
807
-		    #include <sys/socket.h>
808
-		    #include <netdb.h>
809
-		    #include <unistd.h>
810
-		    int main(int argc, char **argv)
811
-		    {
812
-			    struct addrinfo *res;
813
-			    int sd;
814
-
815
-			if(getaddrinfo("127.0.0.1", NULL, NULL, &res) < 0)
816
-			    return 1;
817
-			freeaddrinfo(res);
818
-
819
-			return 0;
820
-		    }
821
-		],
822
-		[have_cv_gai=yes],
823
-		[have_cv_gai=no],
824
-		[have_cv_gai=no])
825
-		])
826
-    AC_MSG_RESULT([$have_cv_gai])
827
-    if test "$have_cv_gai" = yes; then
828
-	AC_DEFINE(HAVE_GETADDRINFO, 1, [have getaddrinfo()])
829
-    fi
830
-fi
831
-
832
-AC_ARG_ENABLE([ipv6],
833
-[  --disable-ipv6          disable IPv6 support],
834
-want_ipv6=$enableval, want_ipv6="yes")
835
-
836
-if test "$want_ipv6" = "yes"
837
-then
838
-    AC_MSG_CHECKING([for IPv6 support])
839
-    AC_CACHE_VAL([have_cv_ipv6],[
840
-		AC_TRY_RUN([
841
-		    #include <sys/types.h>
842
-		    #include <sys/socket.h>
843
-		    #include <netdb.h>
844
-		    #include <unistd.h>
845
-		    int main(int argc, char **argv)
846
-		    {
847
-			    struct addrinfo *res, hints;
848
-			    int sd;
849
-
850
-			if((sd = socket(AF_INET6, SOCK_STREAM, 0)) < 0)
851
-			    return 1;
852
-			close(sd);
853
-			/* also check if getaddrinfo() handles AF_UNSPEC -- bb#1196 */
854
-			memset(&hints, 0, sizeof(hints));
855
-			hints.ai_family = AF_UNSPEC;
856
-			if(getaddrinfo("127.0.0.1", NULL, &hints, &res) < 0)
857
-			    return 1;
858
-			freeaddrinfo(res);
859
-			return 0;
860
-		    }
861
-		],
862
-		[have_cv_ipv6=yes],
863
-		[have_cv_ipv6=no],
864
-		[have_cv_ipv6=no])
865
-		])
866
-    AC_MSG_RESULT([$have_cv_ipv6])
867
-    if test "$have_cv_ipv6" = yes; then
868
-	AC_DEFINE(SUPPORT_IPv6, 1, [Support for IPv6])
869
-    fi
870
-fi
871
-
872
-AC_C_DNS
873
-
874
-AC_ARG_ENABLE([fanotify],
875
-[  --disable-fanotify	  disable fanotify support (Linux only)],
876
-want_fanotify=$enableval, want_fanotify="yes")
877
-
878
-dnl AC_FUNC_SETPGRP does not work when cross compiling
879
-dnl Instead, assume we will have a prototype for setpgrp if cross compiling.
880
-dnl testcase from gdb/configure.ac
881
-if test "$cross_compiling" = no; then
882
- AC_FUNC_SETPGRP
883
-else
884
- AC_CACHE_CHECK([whether setpgrp takes no argument], [ac_cv_func_setpgrp_void],
885
-   [AC_TRY_COMPILE([
886
-#include <unistd.h>
887
-], [
888
- if (setpgrp(1,1) == -1)
889
-   exit (0);
890
- else
891
-   exit (1);
892
-], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes)])
893
-if test $ac_cv_func_setpgrp_void = yes; then
894
- AC_DEFINE([SETPGRP_VOID], 1)
895
-fi
896
-fi
897
-
898
-AC_ARG_ENABLE([milter],
899
-[  --enable-milter	  build clamav-milter],
900
-have_milter=$enableval, have_milter="no")
901
-
902
-dnl we need to try to link with iconv, otherwise there could be a 
903
-dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.
904
-dnl we need to check after zlib/bzip2, because they can change the include path
905
-AC_ARG_WITH([iconv], [  --with-iconv supports iconv() (default=auto)],
906
-[
907
- case "$withval" in
908
-	 yes|no) wiconv="$withval";;
909
-	 *) AC_MSG_ERROR([--with-iconv does not take an argument]);;
910
- esac],
911
-[ wiconv=auto ])
912
-if test "X$wiconv" != "Xno"; then
913
-	AC_CHECK_LIB([iconv], [libiconv_open], LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv")
914
-	AC_MSG_CHECKING([for iconv])
915
-	save_LIBS="$LIBS"
916
-	LIBS="$LIBCLAMAV_LIBS"
917
-	AC_TRY_LINK([
918
-		     #include <iconv.h>
919
-	],[
920
-	char** xin,**xout;
921
-	unsigned long il,ol;
922
-	int rc;
923
-	iconv_t iconv_struct = iconv_open("UTF-16BE","UTF-8");
924
-	rc = iconv(iconv_struct,xin,&il,xout,&ol);
925
-	iconv_close(iconv_struct);
926
-],[
927
-   AC_MSG_RESULT(yes)
928
-   AC_DEFINE([HAVE_ICONV], 1, [iconv() available])
929
-],[
930
-	AC_MSG_RESULT(no)
931
-])
932
-	LIBS="$save_LIBS"
933
-fi
934
-
935
-AC_ARG_ENABLE([pthreads],
936
-[  --disable-pthreads      disable POSIX threads support],
937
-have_pthreads=$enableval,)
938
-
939
-AC_ARG_ENABLE([cr],
940
-[  --disable-cr		  do not link with C reentrant library (BSD) ],
941
-use_cr=$enableval,)
942
-
943
-AC_ARG_ENABLE([id-check],
944
-[  --enable-id-check	  use id utility instead of /etc/passwd parsing],
945
-use_id=$enableval, use_id="no")
946
-
947
-AC_ARG_ENABLE([yp-check],
948
-[  --enable-yp-check	  use ypmatch utility instead of /etc/passwd parsing],
949
-use_yp=$enableval, use_yp="no")
950
-
951
-AC_ARG_WITH([user], 
952
-[  --with-user=uid	  name of the clamav user (default=clamav)],
953
-clamav_user="$withval", clamav_user="clamav")
954
-
955
-AC_ARG_WITH([group], 
956
-[  --with-group=gid	  name of the clamav group (default=clamav)],
957
-clamav_group="$withval", clamav_group="clamav")
958
-
959
-AC_DEFINE_UNQUOTED([CLAMAVUSER],"$clamav_user",[name of the clamav user])
960
-AC_DEFINE_UNQUOTED([CLAMAVGROUP],"$clamav_group",[name of the clamav group])
961
-
962
-AC_ARG_ENABLE([clamav],
963
-[  --disable-clamav	  disable test for clamav user/group],
964
-test_clamav=$enableval, test_clamav=yes)
965
-
966
-AC_ARG_ENABLE([debug],
967
-[  --enable-debug	  enable debug code],
968
-enable_debug=$enableval, enable_debug="no")
969
-
970
-if test "$enable_debug" = "yes"; then
971
-  VERSION_SUFFIX="$VERSION_SUFFIX-debug"
972
-  AC_DEFINE([CL_DEBUG],1,[enable debugging])
973
-else
974
-  AC_DEFINE([NDEBUG],1,[disable assertions])
975
-fi
976
-
977
-AC_ARG_WITH([version], 
978
-[  --with-version=STR    use custom version string (dev only)],
979
-VERSION="$withval", )
980
-
981
-AC_ARG_ENABLE([no-cache],
982
-[  --enable-no-cache	  use "Cache-Control: no-cache" in freshclam],
983
-enable_nocache=$enableval, enable_nocache="no")
984
-
985
-if test "$enable_nocache" = "yes"; then
986
-  AC_DEFINE([FRESHCLAM_NO_CACHE],1,[use "Cache-Control: no-cache" in freshclam])
987
-fi
988
-
989
-AC_ARG_ENABLE([dns-fix],
990
-[  --enable-dns-fix	  enable workaround for broken DNS servers (as in SpeedTouch 510)],
991
-enable_dnsfix=$enableval, enable_dnsfix="no")
992
-
993
-if test "$enable_dnsfix" = "yes"; then
994
-  AC_DEFINE([FRESHCLAM_DNS_FIX],1,[enable workaround for broken DNS servers])
995
-fi
996
-
997
-AC_ARG_ENABLE([bigstack],
998
-[  --enable-bigstack	  increase thread stack size],
999
-enable_bigstack=$enableval, enable_bigstack="no")
1000
-
1001
-if test "$enable_bigstack" = "yes"; then
1002
-  AC_DEFINE([C_BIGSTACK],1,[Increase thread stack size.])
1003
-fi
1004
-
1005
-AC_ARG_WITH([dbdir], 
1006
-[  --with-dbdir=path	  path to virus database directory],
1007
-db_dir="$withval", db_dir="_default_")
1008
-
1009
-dnl I had problems with $pkgdatadir thus these funny checks
1010
-if test "$db_dir" = "_default_"
1011
-then
1012
-    if test "$prefix" = "NONE"
1013
-    then
1014
-	db_dir="$ac_default_prefix/share/clamav"
1015
-    else
1016
-	db_dir="$prefix/share/clamav"
1017
-    fi
1018
-fi
1019
-
1020
-AC_DEFINE_UNQUOTED([DATADIR],"$db_dir", [Path to virus database directory.])
1021
-DBDIR="$db_dir"
1022
-AC_SUBST([DBDIR])
1023
-
1024
-dnl configure config directory
1025
-cfg_dir=`echo $sysconfdir | grep prefix`
1026
-
1027
-if test -n "$cfg_dir"; then
1028
-    if test "$prefix" = "NONE"
1029
-    then
1030
-	cfg_dir="$ac_default_prefix/etc"
1031
-    else
1032
-	cfg_dir="$prefix/etc"
1033
-    fi
1034
-else
1035
-    cfg_dir="$sysconfdir"
1036
-fi
1037
-
1038
-CFGDIR=$cfg_dir
1039
-AC_SUBST([CFGDIR])
1040
-AC_DEFINE_UNQUOTED([CONFDIR],"$cfg_dir",[where to look for the config file])
1041
-
1042
-dnl check for in_port_t definition
1043
-AC_MSG_CHECKING([whether in_port_t is defined])
1044
-AC_TRY_COMPILE([
1045
-#include <sys/types.h>
1046
-#include <netinet/in.h>
1047
-],
1048
-[in_port_t pt; pt = 0; return pt;],
1049
-[
1050
-    AC_MSG_RESULT(yes)
1051
-    AC_DEFINE([HAVE_IN_PORT_T],1,[in_port_t is defined])
1052
-],
1053
-AC_MSG_RESULT(no))
1054
-
1055
-dnl check for in_addr_t definition
1056
-AC_MSG_CHECKING([for in_addr_t definition])
1057
-AC_TRY_COMPILE([
1058
-#include <sys/types.h>
1059
-#include <netinet/in.h>
1060
-],
1061
-[ in_addr_t pt; pt = 0; return pt; ],
1062
-[
1063
-    AC_MSG_RESULT(yes)
1064
-    AC_DEFINE([HAVE_IN_ADDR_T],1,[in_addr_t is defined])
1065
-],
1066
-AC_MSG_RESULT(no))
1067
-
1068
-case "$target_os" in
1069
-linux*)
1070
-    AC_DEFINE([C_LINUX],1,[target is linux])
1071
-    if test "$have_pthreads" = "yes"; then
1072
-	THREAD_LIBS="-lpthread"
1073
-	TH_SAFE="-thread-safe"
1074
-	if test "$want_fanotify" = "yes"; then
1075
-	    AC_CHECK_HEADER([linux/fanotify.h],AC_DEFINE([FANOTIFY],1,[use fanotify]),)
1076
-	fi
1077
-    fi
1078
-    ;;
1079
-kfreebsd*-gnu)
1080
-    AC_DEFINE([C_KFREEBSD_GNU],1,[target is kfreebsd-gnu])
1081
-    if test "$have_pthreads" = "yes"; then
1082
-       THREAD_LIBS="-lpthread"
1083
-       TH_SAFE="-thread-safe"
1084
-    fi
1085
-    ;;
1086
-solaris*)
1087
-    CLAMDSCAN_LIBS="$CLAMDSCAN_LIBS -lresolv"
1088
-    FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
1089
-    if test "$have_pthreads" = "yes"; then
1090
-	THREAD_LIBS="-lpthread"
1091
-	CLAMD_LIBS="$CLAMD_LIBS -lresolv"
1092
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
1093
-	TH_SAFE="-thread-safe"
1094
-    fi
1095
-    AC_DEFINE([C_SOLARIS],1,[os is solaris])
1096
-    ;;
1097
-freebsd[[45]]*)
1098
-    if test "$have_pthreads" = "yes"; then
1099
-	THREAD_LIBS="-pthread -lc_r"
1100
-	TH_SAFE="-thread-safe"
1101
-    fi
1102
-    AC_DEFINE([C_BSD],1,[os is freebsd 4 or 5])
1103
-    ;;
1104
-freebsd*)
1105
-    if test "$have_pthreads" = "yes"; then
1106
-	THREAD_LIBS="-lthr"
1107
-	TH_SAFE="-thread-safe"
1108
-    fi
1109
-    AC_DEFINE([C_BSD],1,[os is freebsd 6])
1110
-    ;;
1111
-dragonfly*)
1112
-    if test "$have_pthreads" = "yes"; then
1113
-	THREAD_LIBS="-pthread"
1114
-	TH_SAFE="-thread-safe"
1115
-    fi
1116
-    AC_DEFINE([C_BSD],1,[os is dragonfly])
1117
-    ;;
1118
-openbsd*)
1119
-    if test "$have_pthreads" = "yes"; then
1120
-	THREAD_LIBS="-pthread"
1121
-	CLAMD_LIBS="$CLAMD_LIBS -pthread"
1122
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
1123
-	TH_SAFE="-thread-safe"
1124
-    fi
1125
-    AC_DEFINE([C_BSD],1,[os is OpenBSD])
1126
-    ;;
1127
-bsdi*)
1128
-    if test "$have_pthreads" = "yes"; then
1129
-	THREAD_LIBS="-pthread"
1130
-	TH_SAFE="-thread-safe"
1131
-    fi
1132
-    AC_DEFINE([C_BSD],1,[os is BSDI BSD/OS])
1133
-    ;;
1134
-netbsd*)
1135
-     if test "$have_pthreads" = "yes"; then
1136
-	THREAD_LIBS="-lpthread"
1137
-     fi
1138
-    AC_DEFINE([C_BSD],1,[os is NetBSD])
1139
-    ;;
1140
-bsd*)
1141
-    AC_MSG_RESULT([Unknown BSD detected. Disabling thread support.])
1142
-    have_pthreads="no"
1143
-    AC_DEFINE([C_BSD],1,[os is bsd flavor])
1144
-    ;;
1145
-beos*)
1146
-    AC_MSG_RESULT([BeOS detected. Disabling thread support.])
1147
-    have_pthreads="no"
1148
-    AC_DEFINE([C_BEOS],1,[os is beos])
1149
-    ;;
1150
-x86:Interix*)
1151
-    AC_DEFINE([C_INTERIX],1,[os is Interix])
1152
-    ;;
1153
-darwin*)
1154
-    AC_DEFINE([C_BSD],1,[os is bsd flavor])
1155
-    AC_DEFINE([C_DARWIN],1,[os is darwin])
1156
-    AC_DEFINE([BIND_8_COMPAT],1,[enable bind8 compatibility])
1157
-    AC_DEFINE([CLAMAUTH],1,[use ClamAuth])
1158
-    use_netinfo="yes"
1159
-    ;;
1160
-os2*)
1161
-    CLAMDSCAN_LIBS="$CLAMDSCAN_LIBS -lsyslog"
1162
-    FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsyslog"
1163
-    CLAMD_LIBS="$CLAMD_LIBS -lsyslog"
1164
-    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsyslog"
1165
-    if test "$have_pthreads" = "yes"; then
1166
-	THREAD_LIBS="-lpthread"
1167
-	TH_SAFE="-thread-safe"
1168
-    fi
1169
-    AC_DEFINE([C_OS2],1,[os is OS/2])
1170
-    ;;
1171
-sco*)
1172
-    dnl njh@bandsman.sco.uk: SCO Unix port
1173
-    dnl FRESHCLAM_LIBS="-lsocket"
1174
-    dnl CLAMD_LIBS="-lsocket"
1175
-    dnl CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"
1176
-    ;;
1177
-hpux*)
1178
-    if test "$have_pthreads" = "yes"; then
1179
-	THREAD_LIBS="-lpthread"
1180
-	TH_SAFE="-thread-safe"
1181
-    fi
1182
-    AC_DEFINE([C_HPUX],1,[os is hpux])
1183
-    if test "$have_mempool" = "yes"; then
1184
-	LDFLAGS="$LDFLAGS -Wl,+pd,1M"
1185
-    fi
1186
-    ;;
1187
-aix*)
1188
-    if test "$have_pthreads" = "yes"; then
1189
-	THREAD_LIBS="-lpthread"
1190
-	TH_SAFE="-thread-safe"
1191
-	AC_DEFINE([_THREAD_SAFE],1,[thread safe])
1192
-    fi
1193
-    AC_DEFINE([C_AIX],1,[os is aix])
1194
-    ;;
1195
-*-*-osf*)
1196
-    if test "$have_pthreads" = "yes"; then
1197
-	THREAD_LIBS="-pthread"
1198
-	TH_SAFE="-thread-safe"
1199
-	AC_DEFINE([_POSIX_PII_SOCKET],1,[POSIX compatibility])
1200
-    fi
1201
-    AC_DEFINE([C_OSF],1,[os is osf/tru64])
1202
-    ;;
1203
-nto-qnx*)
1204
-    AC_DEFINE([C_QNX6],1,[os is QNX 6.x.x])
1205
-    ;;
1206
-irix*)
1207
-    if test "$have_pthreads" = "yes"; then
1208
-	THREAD_LIBS="-lpthread"
1209
-	TH_SAFE="-thread-safe"
1210
-    fi
1211
-    LIBS="$LIBS -lgen"
1212
-    AC_DEFINE([C_IRIX],1,[os is irix])
1213
-    ;;
1214
-interix*)
1215
-    AC_DEFINE([C_INTERIX],1,[os is interix])
1216
-    if test "$test_clamav" = "yes"; then
1217
-	if test ! -r /etc/passwd; then
1218
-	   test_clamav="no"
1219
-	fi
1220
-    fi
1221
-    if test "$have_pthreads" = "yes"; then
1222
-	THREAD_LIBS="-lpthread"
1223
-	TH_SAFE="-thread-safe"
1224
-    fi
1225
-    ;;
1226
-gnu*)
1227
-    AC_DEFINE([C_GNU_HURD],1,[target is gnu-hurd])
1228
-    if test "$have_pthreads" = "yes"; then
1229
-       THREAD_LIBS="-lpthread"
1230
-       TH_SAFE="-thread-safe"
1231
-    fi
1232
-    ;;
1233
-*)
1234
-    ;;
1235
-esac
1236
-
1237
-AC_SUBST([LIBCLAMAV_LIBS])
1238
-AC_SUBST([CLAMD_LIBS])
1239
-AC_SUBST([CLAMAV_MILTER_LIBS])
1240
-AC_SUBST([FRESHCLAM_LIBS])
1241
-AC_SUBST([CLAMDSCAN_LIBS])
1242
-AC_SUBST([TH_SAFE])
1243
-AC_SUBST([THREAD_LIBS])
1244
-AC_SUBST([CLAMSUBMIT_LIBS])
1245
-AC_SUBST([CLAMSUBMIT_CFLAGS])
1246
-
1247
-dnl --enable-milter
1248
-if test "$have_milter" = "yes"; then
1249
-    dnl libmilter checking code adapted from spamass-milter by
1250
-    dnl Tom G. Christensen <tgc@statsbiblioteket.dk>
1251
-
1252
-    dnl Check for libmilter and it's header files in the usual locations
1253
-    save_LIBS="$LIBS"
1254
-    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
1255
-    if test -d /usr/lib/libmilter ; then
1256
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
1257
-    fi
1258
-    LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
1259
-    AC_CHECK_LIB([milter],[mi_stop],[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"],[
1260
-	dnl Older sendmails require libsm or libsmutil for support functions
1261
-	AC_SEARCH_LIBS([strlcpy], [sm smutil], [test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"])
1262
-	LIBS="$save_LIBS $CLAMAV_MILTER_LIBS $CLAMAV_MILTER_XLIB"
1263
-	$as_unset ac_cv_lib_milter_mi_stop
1264
-	AC_CHECK_LIB([milter],[mi_stop],[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"],[
1265
-	    AC_MSG_ERROR([Cannot find libmilter])
1266
-	])
1267
-    ])
1268
-    LIBS="$save_LIBS"
1269
-    AC_CHECK_HEADERS([libmilter/mfapi.h],[have_milter="yes"],[
1270
-	AC_MSG_ERROR([Please install mfapi.h from the sendmail distribution])
1271
-    ])
1272
-fi
1273
-
1274
-AM_CONDITIONAL([BUILD_CLAMD],[test "$have_pthreads" = "yes"])
1275
-AM_CONDITIONAL([HAVE_MILTER],[test "$have_milter" = "yes"])
1276
-
1277
-if test "$have_pthreads" = "yes"
1278
-then
1279
-    save_LIBS="$LIBS"
1280
-    LIBS="$THREAD_LIBS $LIBS"
1281
-    AC_CHECK_FUNCS([sched_yield pthread_yield])
1282
-    LIBS="$save_LIBS"
1283
-    AC_DEFINE([BUILD_CLAMD], 1, "build clamd")
1284
-    dnl define these here, so we don't forget any system
1285
-    AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1286
-    AC_DEFINE([_REENTRANT],1,[thread safe])
1287
-fi
1288
-
1289
-AC_CHECK_FUNCS([enable_extended_FILE_stdio])
1290
-
1291
-dnl Check for readdir_r and number of its arguments
1292
-dnl Code from libwww/configure.in
1293
-
1294
-AC_MSG_CHECKING([for readdir_r])
1295
-if test -z "$ac_cv_readdir_args"; then
1296
-    AC_TRY_COMPILE(
1297
-    [
1298
-#include <sys/types.h>
1299
-#include <dirent.h>
1300
-    ],
1301
-    [
1302
-    struct dirent dir, *dirp;
1303
-    DIR *mydir;
1304
-    dirp = readdir_r(mydir, &dir);
1305
-    ], ac_cv_readdir_args=2)
1306
-fi
1307
-if test -z "$ac_cv_readdir_args"; then
1308
-    AC_TRY_COMPILE(
1309
-        [
1310
-#include <sys/types.h>
1311
-#include <dirent.h>
1312
-    ],
1313
-    [
1314
-        struct dirent dir, *dirp;
1315
-        DIR *mydir;
1316
-        int rc;
1317
-        rc = readdir_r(mydir, &dir, &dirp);
1318
-    ], ac_cv_readdir_args=3)
1319
-fi
1320
-
1321
-AC_ARG_ENABLE([readdir_r],
1322
-[  --enable-readdir_r		    enable support for readdir_r],
1323
-enable_readdir_r=$enableval, enable_readdir_r="no")
1324
-
1325
-if test "$enable_readdir_r" = "no"; then
1326
-    AC_MSG_RESULT(support disabled)
1327
-elif test -z "$ac_cv_readdir_args"; then
1328
-    AC_MSG_RESULT(no)
1329
-else
1330
-    if test "$ac_cv_readdir_args" = 2; then
1331
-	AC_DEFINE([HAVE_READDIR_R_2],1,[readdir_r takes 2 arguments])
1332
-    elif test "$ac_cv_readdir_args" = 3; then
1333
-	AC_DEFINE([HAVE_READDIR_R_3],1,[readdir_r takes 3 arguments])
1334
-    fi
1335
-    AC_MSG_RESULT([yes, and it takes $ac_cv_readdir_args arguments])
1336
-fi
1337
-
1338
-AC_MSG_CHECKING([for ctime_r])
1339
-if test "$ac_cv_func_ctime_r" = "yes"; then
1340
-    AC_TRY_COMPILE([
1341
-	#include <time.h>
1342
-    ],[
1343
-	char buf[31];
1344
-	time_t t;
1345
-	ctime_r(&t, buf, 30);
1346
-    ],[
1347
-	ac_cv_ctime_args=3
1348
-	AC_DEFINE([HAVE_CTIME_R_3],1,[ctime_r takes 3 arguments])
1349
-    ],[
1350
-	ac_cv_ctime_args=2
1351
-	AC_DEFINE([HAVE_CTIME_R_2],1,[ctime_r takes 2 arguments])
1352
-    ])
1353
-
1354
-    AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments])
1355
-fi
1356
-
1357
-dnl Determine socklen_t type. Code from lftp.
1358
-AC_MSG_CHECKING([for socklen_t])
1359
-AC_CACHE_VAL([ac_cv_socklen_t],
1360
-[
1361
-    ac_cv_socklen_t=no
1362
-    AC_TRY_COMPILE([
1363
-	#include <sys/types.h>
1364
-        #include <sys/socket.h>
1365
-    ],
1366
-    [
1367
-	socklen_t len;
1368
-        getpeername(0,0,&len);
1369
-    ],
1370
-    [
1371
-	ac_cv_socklen_t=yes
1372
-    ])
1373
-])
1374
-AC_MSG_RESULT([$ac_cv_socklen_t])
1375
-    if test $ac_cv_socklen_t = no; then
1376
-    AC_MSG_CHECKING([for socklen_t equivalent])
1377
-    AC_CACHE_VAL([ac_cv_socklen_t_equiv],
1378
-    [
1379
-	ac_cv_socklen_t_equiv=int
1380
-        for t in int size_t unsigned long "unsigned long"; do
1381
-	    AC_TRY_COMPILE([
1382
-		#include <sys/types.h>
1383
-		#include <sys/socket.h>
1384
-	    ],
1385
-            [
1386
-		$t len;
1387
-		getpeername(0,0,&len);
1388
-            ],
1389
-            [
1390
-		ac_cv_socklen_t_equiv="$t"
1391
-		break
1392
-            ])
1393
-	done
1394
-    ])
1395
-    AC_MSG_RESULT([$ac_cv_socklen_t_equiv])
1396
-    AC_DEFINE_UNQUOTED([socklen_t], $ac_cv_socklen_t_equiv, [Define to "int" if <sys/socket.h> does not define.])
1397
-fi
1398
-
1399
-dnl Check for clamav in /etc/passwd
1400
-if test "$test_clamav" = "yes"
1401
-then
1402
-    dnl parse /etc/passwd
1403
-    if test "$use_id" = "no"
1404
-    then
1405
-	AC_MSG_CHECKING([for $clamav_user in /etc/passwd])
1406
-	if test -r /etc/passwd; then
1407
-	    clamavuser=`cat /etc/passwd|grep "^$clamav_user:"`
1408
-	    clamavgroup=`cat /etc/group|grep "^$clamav_group:"`
1409
-	fi
1410
-    else
1411
-	AC_MSG_CHECKING([for $clamav_user using id])
1412
-	id $clamav_user > /dev/null 2>&1
1413
-	if test "$?" = 0 ; then
1414
-	    clamavuser=1
1415
-	    AC_PATH_PROG(GETENT, getent)
1416
-	    if test -n "$GETENT" ; then
1417
-		clamavgroup=`$GETENT group | grep "^${clamav_group}:"`
1418
-	    else
1419
-		clamavgroup=`cat /etc/group|grep $clamav_group`
1420
-	    fi
1421
-	fi
1422
-    fi
1423
-
1424
-    if test "$use_netinfo" = "yes"
1425
-    then
1426
-	if test -x /usr/bin/dscl; then
1427
-	    AC_MSG_CHECKING([for $clamav_user using dscl])
1428
-	    clamavuser=`/usr/bin/dscl . -list /Users |grep ${clamav_user}`
1429
-	    clamavgroup=`/usr/bin/dscl . -list /Groups |grep ${clamav_group}`
1430
-	else
1431
-	    AC_MSG_CHECKING([for $clamav_user using netinfo])
1432
-	    clamavuser=`/usr/bin/nidump passwd . |grep ${clamav_user}`
1433
-	    clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`
1434
-	fi
1435
-    fi
1436
-
1437
-    if test "$use_yp" = "yes"
1438
-    then
1439
-	AC_MSG_CHECKING([for $clamav_user using ypmatch])
1440
-        clamavuser=`ypmatch ${clamav_user} passwd`
1441
-        clamavgroup=`ypmatch ${clamav_group} group`
1442
-    fi
1443
-
1444
-    if test -z "$clamavuser" || test -z "$clamavgroup"
1445
-    then
1446
-	AC_MSG_RESULT(no)
1447
-	AC_MSG_ERROR([User $clamav_user (and/or group $clamav_group) does not exist. Please read the documentation !])
1448
-    else
1449
-	AC_MSG_RESULT([yes, user $clamav_user and group $clamav_group])
1450
-        CLAMAVUSER="$clamav_user"
1451
-        CLAMAVGROUP="$clamav_group"
1452
-        AC_SUBST([CLAMAVUSER])
1453
-        AC_SUBST([CLAMAVGROUP])
1454
-    fi
1455
-fi
1456
-
1457
-dnl check for __attribute__((packed))
1458
-dnl but only on compilers claiming to be gcc compatible
1459
-dnl because for example Sun's compiler silently ignores the packed attribute.
1460
-AC_MSG_CHECKING([for structure packing via __attribute__((packed))])
1461
-AC_CACHE_VAL([have_cv_attrib_packed],[
1462
-	AC_TRY_COMPILE(,
1463
-		[#ifdef __GNUC__
1464
-		 struct { int i __attribute__((packed)); } s;
1465
-		 #else
1466
-		 #error Only checking for packed attribute on gcc-like compilers
1467
-		 #endif],
1468
-		[have_cv_attrib_packed=yes],
1469
-		[have_cv_attrib_packed=no])
1470
-	])
1471
-AC_MSG_RESULT([$have_cv_attrib_packed])
1472
-
1473
-if test "$have_cv_attrib_packed" = no; then
1474
-	AC_MSG_CHECKING([for structure packing via pragma])
1475
-	AC_CACHE_VAL([have_cv_pragma_pack],[
1476
-		AC_TRY_RUN([
1477
-			    int main(int argc, char **argv) {
1478
-#pragma pack(1)			/* has to be in column 1 ! */
1479
-			struct { char c; long l; } s;
1480
-			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],
1481
-			[have_cv_pragma_pack=yes],
1482
-			[have_cv_pragma_pack=no])
1483
-		])
1484
-	AC_MSG_RESULT([$have_cv_pragma_pack])
1485
-	if test "$have_cv_pragma_pack" = yes; then
1486
-		AC_DEFINE([HAVE_PRAGMA_PACK], 1, "pragma pack")
1487
-	else
1488
-		AC_MSG_CHECKING([for structure packing via hppa/hp-ux pragma])
1489
-		AC_CACHE_VAL([have_cv_pragma_pack_hpux],[
1490
-			AC_TRY_RUN([
1491
-			/* hppa/hp-ux wants pragma outside of function */
1492
-#pragma pack 1 /* has to be in column 1 ! */
1493
-			struct { char c; long l; } s;
1494
-			    int main(int argc, char **argv) {
1495
-			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],
1496
-			[have_cv_pragma_pack_hpux=yes],
1497
-			[have_cv_pragma_pack_hpux=no])
1498
-		])
1499
-		AC_MSG_RESULT([$have_cv_pragma_pack_hpux])
1500
-		AC_DEFINE([HAVE_PRAGMA_PACK_HPPA], 1, "pragma pack hppa/hp-ux style")
1501
-	fi
1502
-fi
1503
-
1504
-dnl check for __attribute__((aligned))
1505
-AC_MSG_CHECKING([for type aligning via __attribute__((aligned))])
1506
-AC_CACHE_VAL([have_cv_attrib_aligned],[
1507
-	AC_TRY_COMPILE(,
1508
-		[typedef int cl_aligned_int __attribute__((aligned));],
1509
-		[have_cv_attrib_aligned=yes],
1510
-		[have_cv_attrib_aligned=no])
1511
-	])
1512
-AC_MSG_RESULT([$have_cv_attrib_aligned])
1513
-
1514
-if test "$have_cv_attrib_packed" = no -a "$have_cv_pragma_pack" = no -a "$have_cv_pragma_pack_hpux" = no; then
1515
-	AC_MSG_ERROR(Need to know how to pack structures with this compiler)
1516
-fi
1517
-
1518
-if test "$have_cv_attrib_packed" = yes; then
1519
-	AC_DEFINE([HAVE_ATTRIB_PACKED], 1, [attrib packed])
1520
-fi
1521
-
1522
-if test "$have_cv_attrib_aligned" = yes; then
1523
-	AC_DEFINE([HAVE_ATTRIB_ALIGNED], 1, [attrib aligned])
1524
-fi
1525
-
1526
-dnl Sanity check that struct packing works
1527
-AC_MSG_CHECKING([that structure packing works])
1528
-AC_CACHE_VAL([have_cv_struct_pack],[
1529
-    AC_TRY_RUN([
1530
-#ifndef HAVE_ATTRIB_PACKED
1531
-#define __attribute__(x)
1532
-#endif
1533
-#ifdef HAVE_PRAGMA_PACK
1534
-#pragma pack(1) /* has to be in column 1 ! */
1535
-#endif
1536
-#ifdef HAVE_PRAGMA_PACK_HPPA
1537
-#pragma pack 1 /* has to be in column 1 ! */
1538
-#endif
1539
-
1540
-struct { char c __attribute__((packed)); long l __attribute__((packed)); } s;
1541
-
1542
-#ifdef HAVE_PRAGMA_PACK
1543
-#pragma pack()
1544
-#endif
1545
-#ifdef HAVE_PRAGMA_PACK_HPPA
1546
-#pragma pack
1547
-#endif
1548
-
1549
-struct { char c; long l;} s2;
1550
-
1551
-#ifdef HAVE_PRAGMA_PACK
1552
-#pragma pack(1) /* has to be in column 1 ! */
1553
-#endif
1554
-#ifdef HAVE_PRAGMA_PACK_HPPA
1555
-#pragma pack 1 /* has to be in column 1 ! */
1556
-#endif
1557
-
1558
-struct { char c; long l; } __attribute__((packed)) s3;
1559
-
1560
-#ifdef HAVE_PRAGMA_PACK
1561
-#pragma pack()
1562
-#endif
1563
-#ifdef HAVE_PRAGMA_PACK_HPPA
1564
-#pragma pack
1565
-#endif
1566
-
1567
-    int main(int argc, char **argv) {
1568
-        if (sizeof(s)!=sizeof(s.c)+sizeof(s.l))
1569
-	    return 1;
1570
-	if (sizeof(s) != sizeof(s3))
1571
-	    return 2;
1572
-	return (sizeof(s2) >= sizeof(s)) ? 0 : 3;
1573
-    }],
1574
-    [have_cv_struct_pack=yes],
1575
-    [have_cv_struct_pack=no],
1576
-    [have_cv_struct_pack=yes])
1577
-])
1578
-AC_MSG_RESULT([$have_cv_struct_pack])
1579
-
1580
-if test "$have_cv_struct_pack" = "no"; then
1581
-    AC_MSG_ERROR([Structure packing seems to be available, but is not working with this compiler])
1582
-fi
1583
-
1584
-dnl Check if <sys/select.h> needs to be included for fd_set
1585
-AC_MSG_CHECKING([for fd_set])
1586
-AC_HEADER_EGREP([fd_mask], [sys/select.h], [have_fd_set=yes])
1587
-if test "$have_fd_set" = yes; then
1588
-	AC_DEFINE([HAVE_SYS_SELECT_H], 1, "have <sys/select.h>")
1589
-	AC_MSG_RESULT([yes, found in sys/select.h])
1590
-else
1591
-	AC_TRY_COMPILE([#include <sys/time.h>
1592
-			#include <sys/types.h>
1593
-			#ifdef HAVE_UNISTD_H
1594
-			#include <unistd.h>
1595
-			#endif],
1596
-		[fd_set readMask, writeMask;], have_fd_set=yes, have_fd_set=no)
1597
-	if test "$have_fd_set" = yes; then
1598
-		AC_MSG_RESULT([yes, found in sys/types.h])
1599
-	else
1600
-		AC_DEFINE([NO_FD_SET], 1, "no fd_set")
1601
-		AC_MSG_RESULT(no)
1602
-	fi
1603
-fi
1604
-
1605
-AC_MSG_CHECKING([default FD_SETSIZE value])
1606
-AC_TRY_RUN([
1607
-#include <stdio.h>
1608
-#include <unistd.h>
1609
-#include <sys/time.h>
1610
-#ifdef HAVE_SYS_SELECT_H
1611
-#include <sys/select.h>
1612
-#endif
1613
-#ifdef HAVE_SYS_TYPES_H
1614
-#include <sys/types.h>
1615
-#endif
1616
-#include <errno.h>
1617
-int main(void) {
1618
-        FILE *fp = fopen("conftestval", "w");
1619
-	if(fp) {
1620
-		if(fprintf (fp, "%d\n", FD_SETSIZE) < 1)  {
1621
-			perror("fprintf failed");
1622
-			return errno;
1623
-		}
1624
-	} else {
1625
-		perror("fopen failed");
1626
-		return errno;
1627
-	}
1628
-        return 0;
1629
-}
1630
-],
1631
-DEFAULT_FD_SETSIZE=`cat conftestval`,
1632
-DEFAULT_FD_SETSIZE=256,
1633
-DEFAULT_FD_SETSIZE=256)
1634
-AC_MSG_RESULT([$DEFAULT_FD_SETSIZE])
1635
-AC_DEFINE_UNQUOTED([DEFAULT_FD_SETSIZE], $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value")
1636
-
1637
-AC_MSG_CHECKING([stat64])
1638
-AC_TRY_RUN([
1639
-#define _LARGEFILE_SOURCE
1640
-#define _LARGEFILE64_SOURCE
1641
-#include <stdio.h>
1642
-#include <sys/types.h>
1643
-#include <sys/stat.h>
1644
-#include <unistd.h>
1645
-#include <errno.h>
1646
-
1647
-int main(void) {
1648
-    struct stat64 sb;
1649
-
1650
-    if (stat64(".", &sb) == -1)
1651
-        return errno;
1652
-
1653
-    return 0;
1654
-}
1655
-],
1656
-[enable_stat64=yes],
1657
-[enable_stat64=no],
1658
-[enable_stat64=no],
1659
-)
1660
-
1661
-if test "$enable_stat64" != "no"; then
1662
-AC_DEFINE([HAVE_STAT64],1,[enable stat64])
1663
-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
1664
-fi
1665
-AC_MSG_RESULT([$enable_stat64])
1666
-
1667
-dnl Check signed right shift implementation
1668
-AC_MSG_CHECKING([whether signed right shift is sign extended])
1669
-AC_TRY_RUN([int main(void){int a=-1;int b=a>>1;return(a!=b);}],
1670
-    [have_signed_rightshift_extended=yes],
1671
-    [have_signed_rightshift_extended=no],
1672
-    [have_signed_rightshift_extended=no])
1673
-if test $have_signed_rightshift_extended = yes; then
1674
-    AC_DEFINE([HAVE_SAR], 1, [Define signed right shift implementation])
1675
-fi
1676
-AC_MSG_RESULT([$have_signed_rightshift_extended]);
1677
-
1678
-AC_C_FDPASSING
1679
-
1680
-AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
1681
-AC_DEFINE_UNQUOTED([VERSION_SUFFIX],"$VERSION_SUFFIX",[Version suffix for package])
1682
-
1683
-AC_ARG_ENABLE(clamdtop,
1684
-	      AC_HELP_STRING([--enable-clamdtop],
1685
-			     [Enable 'clamdtop' tool @<:@default=auto@:>@]),
1686
-[enable_clamdtop=$enableval], [enable_clamdtop="auto"])
1687
-
1688
-if test "$enable_clamdtop" != "no"; then
1689
-
1690
-AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
1691
-	    AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
1692
-			    [initscr(); KEY_RESIZE;]),
1693
-	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
1694
-	     CURSES_INCLUDE="<ncurses/ncurses.h>"],
1695
-	    [])
1696
-
1697
-if test "X$HAVE_LIBNCURSES" != "Xyes"; then
1698
-    HAVE_LIBNCURSES=
1699
-    AC_LIB_FIND([ncurses], [ncurses.h],
1700
-	    AC_LANG_PROGRAM([#include <ncurses.h>],
1701
-			    [initscr(); KEY_RESIZE;]),
1702
-	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
1703
-	     CURSES_INCLUDE="<ncurses.h>"],
1704
-	    [])
1705
-fi
1706
-
1707
-if test "X$HAVE_LIBNCURSES" != "Xyes"; then
1708
-    AC_LIB_FIND([pdcurses],[curses.h],
1709
-			    AC_LANG_PROGRAM([#include <curses.h>],
1710
-					    [initscr(); KEY_RESIZE;]),
1711
-			    [CURSES_CPPFLAGS="$INCPDCURSES";
1712
-			     CURSES_LIBS="$LTLIBPDCURSES";
1713
-			     CURSES_INCLUDE="<curses.h>"],
1714
-			    [AC_MSG_WARN([****** not building clamdtop: ncurses not found])])
1715
-fi
1716
-
1717
-if test "x$CURSES_LIBS" = "x" -a "$enable_clamdtop" = "yes"; then
1718
-    AC_MSG_ERROR([
1719
-
1720
-ERROR!  Clamdtop was configured, but not found.  You need to install libncurses5-dev.
1721
-])
1722
-fi
1723
-
1724
-fi
1725
-
1726
-AC_DEFINE_UNQUOTED([CURSES_INCLUDE], $CURSES_INCLUDE, [curses header location])
1727
-AC_SUBST([CURSES_CPPFLAGS])
1728
-AC_SUBST([CURSES_LIBS])
1729
-AM_CONDITIONAL([HAVE_CURSES],
1730
-	       [test "X$HAVE_LIBNCURSES" = "Xyes" || test "X$HAVE_LIBPDCURSES" = "Xyes"])
1731
-
1732
-AC_ARG_ENABLE([distcheck-werror],
1733
-	      AC_HELP_STRING([--enable-distcheck-werror],
1734
-			     [enable warnings as error for distcheck
1735
-			      @<:@default=no@:>@]),
1736
-[enable_distcheckwerror=$enableval],[enable_distcheckwerror="no"])
1737
-
1738
-# Enable distcheck warnings and Werror only for gcc versions that support them,
1739
-# and only after we've run the configure tests.
1740
-# Some configure tests fail (like checking for cos in -lm) if we enable these
1741
-# Werror flags for configure too (for example -Wstrict-prototypes makes
1742
-# configure think that -lm doesn't have cos, hence its in libc).
1743
-WERR_CFLAGS=
1744
-WERR_CFLAGS_MILTER=
1745
-if test "x$enable_distcheckwerror" = "xyes"; then
1746
-    if test "$distcheck_enable_flags" = "1"; then
1747
-	WERR_COMMON="-Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=strict-aliasing -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
1748
-	WERR_CFLAGS="$WERR_COMMON -Wwrite-strings"
1749
-	WERR_CFLAGS_MILTER="$WERR_COMMON -Wno-error=format-nonliteral"
1750
-    fi
1751
-fi
1752
-AC_SUBST([WERR_CFLAGS])
1753
-AC_SUBST([WERR_CFLAGS_MILTER])
1754
-
1755
-AC_ARG_ENABLE([llvm],AC_HELP_STRING([--enable-llvm],
1756
-				    [Enable 'llvm' JIT/verifier support @<:@default=auto@:>@]),
1757
-				    [enable_llvm=$enableval], [enable_llvm="auto"])
1758
-
1759
-if test "$enable_llvm" != "no"; then
1760
-    dnl Try to configure subdir, optionally
1761
-    AC_CONFIG_SUBDIRS_OPTIONAL([libclamav/c++])
1762
-fi
1763
-
1764
-AC_ARG_ENABLE([sha-collector-for-internal-use], [], [enable_sha_collector="yes"], [enable_sha_collector="no"])
1765
-if test "$enable_sha_collector" != "no"; then
1766
-    AC_DEFINE([HAVE__INTERNAL__SHA_COLLECT], 1, [For internal use only - DO NOT DEFINE])
1767
-fi
443
+m4_include([m4/reorganization/libs/libz.m4])
444
+m4_include([m4/reorganization/libs/bzip.m4])
445
+m4_include([m4/reorganization/libs/unrar.m4])
446
+m4_include([m4/reorganization/code_checks/ipv6.m4])
447
+m4_include([m4/reorganization/code_checks/dns.m4])
448
+m4_include([m4/reorganization/code_checks/fanotify.m4])
449
+m4_include([m4/reorganization/code_checks/setpgrp.m4])
450
+m4_include([m4/reorganization/milter/enable.m4])
451
+m4_include([m4/reorganization/code_checks/iconv.m4])
452
+m4_include([m4/reorganization/code_checks/pthreads.m4])
453
+m4_include([m4/reorganization/code_checks/reentrant.m4])
454
+m4_include([m4/reorganization/utility_checks/id.m4])
455
+m4_include([m4/reorganization/utility_checks/yp.m4])
456
+m4_include([m4/reorganization/usergroup.m4])
457
+m4_include([m4/reorganization/debug.m4])
458
+m4_include([m4/reorganization/customversion.m4])
459
+m4_include([m4/reorganization/nocache.m4])
460
+m4_include([m4/reorganization/dns.m4])
461
+m4_include([m4/reorganization/bigstack.m4])
462
+m4_include([m4/reorganization/dbdir.m4])
463
+m4_include([m4/reorganization/cfgdir.m4])
464
+m4_include([m4/reorganization/code_checks/in_port_t.m4])
465
+m4_include([m4/reorganization/code_checks/in_addr_t.m4])
466
+m4_include([m4/reorganization/os_checks.m4])
467
+m4_include([m4/reorganization/milter/check.m4])
468
+m4_include([m4/reorganization/code_checks/pthread_02.m4])
469
+m4_include([m4/reorganization/code_checks/readdir.m4])
470
+m4_include([m4/reorganization/code_checks/ctime.m4])
471
+m4_include([m4/reorganization/code_checks/socklen_t.m4])
472
+m4_include([m4/reorganization/clamav_user.m4])
473
+m4_include([m4/reorganization/code_checks/compiler_attribs.m4])
474
+m4_include([m4/reorganization/code_checks/select.m4])
475
+m4_include([m4/reorganization/code_checks/stat64.m4])
476
+m4_include([m4/reorganization/code_checks/shift.m4])
477
+m4_include([m4/reorganization/code_checks/features.m4])
478
+m4_include([m4/reorganization/clamdtop.m4])
479
+m4_include([m4/reorganization/distcheck.m4])
480
+m4_include([m4/reorganization/llvm.m4])
481
+m4_include([m4/reorganization/sha_collect.m4])
482
+
483
+m4_include([m4/reorganization/bsd.m4])
484
+
485
+dnl Freshclam dependencies
486
+m4_include([m4/reorganization/libs/curl.m4])
487
+m4_include([m4/reorganization/libs/libconfig.m4])
488
+m4_include([m4/reorganization/libs/xml.m4])
489
+
490
+m4_include([m4/reorganization/substitutions.m4])
1768 491
 
1769 492
 AM_CONDITIONAL([ENABLE_CLAMSUBMIT], [test "$have_curl" = "yes"])
1770 493
 
1771
-AC_OUTPUT([
494
+AC_CONFIG_FILES([
495
+shared/Makefile
1772 496
 clamscan/Makefile
1773 497
 database/Makefile
1774 498
 docs/Makefile
1775 499
 clamd/Makefile
1776 500
 clamdscan/Makefile
501
+clamsubmit/Makefile
1777 502
 clamav-milter/Makefile
1778 503
 freshclam/Makefile
1779 504
 sigtool/Makefile
1780 505
 clamconf/Makefile
1781
-clamsubmit/Makefile
1782 506
 etc/Makefile
1783 507
 test/Makefile
1784 508
 unit_tests/Makefile
... ...
@@ -1802,6 +164,8 @@ docs/man/sigtool.1
1802 1802
 docs/man/clamdtop.1
1803 1803
 ])
1804 1804
 
1805
+AC_OUTPUT
1806
+
1805 1807
 if test "$enable_llvm" = "yes" && test "$subdirfailed" != "no"; then
1806 1808
     AC_MSG_ERROR([Failed to configure LLVM, and LLVM was explicitly requested])
1807 1809
 fi
... ...
@@ -1855,7 +219,7 @@ AC_MSG_NOTICE([Summary of engine detection features])
1855 1855
 CL_MSG_STATUS([bzip2       ],[$bzip_check],[$want_bzip2])
1856 1856
 CL_MSG_STATUS([zlib        ],[$ZLIB_HOME],[yes])
1857 1857
 CL_MSG_STATUS([unrar       ],[$want_unrar],[$want_unrar])
1858
-if test "x$XML_LIBS" = "x"; then
1858
+if test "x$XML_LIBS" = "x"; then 
1859 1859
     CL_MSG_STATUS([dmg and xar ],[no],[])
1860 1860
 else
1861 1861
     CL_MSG_STATUS([dmg and xar ],[yes, from $XML_HOME],[])
... ...
@@ -83,6 +83,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
83 83
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
84 84
 	$(top_srcdir)/m4/lt~obsolete.m4 \
85 85
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
86
+	$(top_srcdir)/m4/reorganization/version.m4 \
87
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
88
+	$(top_srcdir)/m4/reorganization/headers.m4 \
89
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
90
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
91
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
92
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
93
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
96
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
97
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
99
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
103
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
104
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
107
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
108
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
109
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
110
+	$(top_srcdir)/m4/reorganization/debug.m4 \
111
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
112
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
113
+	$(top_srcdir)/m4/reorganization/dns.m4 \
114
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
115
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
116
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
117
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
118
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
119
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
120
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
121
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
122
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
125
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
126
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
127
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
131
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
132
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
133
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
134
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
135
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
136
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
137
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
139
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
86 140
 	$(top_srcdir)/configure.ac
87 141
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
88 142
 	$(ACLOCAL_M4)
... ...
@@ -122,9 +176,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
122 122
 CHECK_LIBS = @CHECK_LIBS@
123 123
 CLAMAVGROUP = @CLAMAVGROUP@
124 124
 CLAMAVUSER = @CLAMAVUSER@
125
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
125 126
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
127
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
128
+CLAMBC_LIBS = @CLAMBC_LIBS@
129
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
130
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
126 131
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
132
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
133
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
134
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
127 135
 CLAMD_LIBS = @CLAMD_LIBS@
136
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
137
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
138
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
139
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
128 140
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
129 141
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
130 142
 CPP = @CPP@
... ...
@@ -144,6 +210,7 @@ ECHO_T = @ECHO_T@
144 144
 EGREP = @EGREP@
145 145
 EXEEXT = @EXEEXT@
146 146
 FGREP = @FGREP@
147
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
147 148
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
148 149
 GCOV = @GCOV@
149 150
 GENHTML = @GENHTML@
... ...
@@ -165,8 +232,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
165 165
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
166 166
 LIBBZ2 = @LIBBZ2@
167 167
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
168
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
168 169
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
169 170
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
171
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
170 172
 LIBLTDL = @LIBLTDL@
171 173
 LIBM = @LIBM@
172 174
 LIBOBJS = @LIBOBJS@
... ...
@@ -204,6 +273,7 @@ RANLIB = @RANLIB@
204 204
 SED = @SED@
205 205
 SET_MAKE = @SET_MAKE@
206 206
 SHELL = @SHELL@
207
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
207 208
 STRIP = @STRIP@
208 209
 THREAD_LIBS = @THREAD_LIBS@
209 210
 TH_SAFE = @TH_SAFE@
... ...
@@ -82,6 +82,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
82 82
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
83 83
 	$(top_srcdir)/m4/lt~obsolete.m4 \
84 84
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
85
+	$(top_srcdir)/m4/reorganization/version.m4 \
86
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
87
+	$(top_srcdir)/m4/reorganization/headers.m4 \
88
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
89
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
90
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
91
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
92
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
93
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
95
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
96
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
97
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
98
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
99
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
102
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
104
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
106
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
107
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
108
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
109
+	$(top_srcdir)/m4/reorganization/debug.m4 \
110
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
111
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
112
+	$(top_srcdir)/m4/reorganization/dns.m4 \
113
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
114
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
115
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
116
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
117
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
118
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
119
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
120
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
121
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
122
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
124
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
126
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
127
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
130
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
131
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
132
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
133
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
134
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
135
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
136
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
137
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
138
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
85 139
 	$(top_srcdir)/configure.ac
86 140
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
87 141
 	$(ACLOCAL_M4)
... ...
@@ -155,9 +209,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
155 155
 CHECK_LIBS = @CHECK_LIBS@
156 156
 CLAMAVGROUP = @CLAMAVGROUP@
157 157
 CLAMAVUSER = @CLAMAVUSER@
158
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
158 159
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
160
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
161
+CLAMBC_LIBS = @CLAMBC_LIBS@
162
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
163
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
159 164
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
165
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
166
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
167
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
160 168
 CLAMD_LIBS = @CLAMD_LIBS@
169
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
170
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
171
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
172
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
161 173
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
162 174
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
163 175
 CPP = @CPP@
... ...
@@ -177,6 +243,7 @@ ECHO_T = @ECHO_T@
177 177
 EGREP = @EGREP@
178 178
 EXEEXT = @EXEEXT@
179 179
 FGREP = @FGREP@
180
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
180 181
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
181 182
 GCOV = @GCOV@
182 183
 GENHTML = @GENHTML@
... ...
@@ -198,8 +265,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
198 198
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
199 199
 LIBBZ2 = @LIBBZ2@
200 200
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
201
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
201 202
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
202 203
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
204
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
203 205
 LIBLTDL = @LIBLTDL@
204 206
 LIBM = @LIBM@
205 207
 LIBOBJS = @LIBOBJS@
... ...
@@ -237,6 +306,7 @@ RANLIB = @RANLIB@
237 237
 SED = @SED@
238 238
 SET_MAKE = @SET_MAKE@
239 239
 SHELL = @SHELL@
240
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
240 241
 STRIP = @STRIP@
241 242
 THREAD_LIBS = @THREAD_LIBS@
242 243
 TH_SAFE = @TH_SAFE@
... ...
@@ -84,6 +84,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
84 84
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
85 85
 	$(top_srcdir)/m4/lt~obsolete.m4 \
86 86
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
87
+	$(top_srcdir)/m4/reorganization/version.m4 \
88
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
89
+	$(top_srcdir)/m4/reorganization/headers.m4 \
90
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
91
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
92
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
93
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
97
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
99
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
104
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
108
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
109
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
110
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
111
+	$(top_srcdir)/m4/reorganization/debug.m4 \
112
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
113
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
114
+	$(top_srcdir)/m4/reorganization/dns.m4 \
115
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
116
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
117
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
118
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
120
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
121
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
122
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
126
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
127
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
131
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
132
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
133
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
134
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
135
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
136
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
137
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
139
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
140
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
87 141
 	$(top_srcdir)/configure.ac
88 142
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
89 143
 	$(ACLOCAL_M4)
... ...
@@ -152,9 +206,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
152 152
 CHECK_LIBS = @CHECK_LIBS@
153 153
 CLAMAVGROUP = @CLAMAVGROUP@
154 154
 CLAMAVUSER = @CLAMAVUSER@
155
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
155 156
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
157
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
158
+CLAMBC_LIBS = @CLAMBC_LIBS@
159
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
160
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
156 161
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
162
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
163
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
164
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
157 165
 CLAMD_LIBS = @CLAMD_LIBS@
166
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
167
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
168
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
169
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
158 170
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
159 171
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
160 172
 CPP = @CPP@
... ...
@@ -174,6 +240,7 @@ ECHO_T = @ECHO_T@
174 174
 EGREP = @EGREP@
175 175
 EXEEXT = @EXEEXT@
176 176
 FGREP = @FGREP@
177
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
177 178
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
178 179
 GCOV = @GCOV@
179 180
 GENHTML = @GENHTML@
... ...
@@ -195,8 +262,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
195 195
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
196 196
 LIBBZ2 = @LIBBZ2@
197 197
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
198
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
198 199
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
199 200
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
201
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
200 202
 LIBLTDL = @LIBLTDL@
201 203
 LIBM = @LIBM@
202 204
 LIBOBJS = @LIBOBJS@
... ...
@@ -234,6 +303,7 @@ RANLIB = @RANLIB@
234 234
 SED = @SED@
235 235
 SET_MAKE = @SET_MAKE@
236 236
 SHELL = @SHELL@
237
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
237 238
 STRIP = @STRIP@
238 239
 THREAD_LIBS = @THREAD_LIBS@
239 240
 TH_SAFE = @TH_SAFE@
... ...
@@ -85,6 +85,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
85 85
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
86 86
 	$(top_srcdir)/m4/lt~obsolete.m4 \
87 87
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
88
+	$(top_srcdir)/m4/reorganization/version.m4 \
89
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
90
+	$(top_srcdir)/m4/reorganization/headers.m4 \
91
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
92
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
93
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
97
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
99
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
100
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
104
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
105
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
108
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
109
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
110
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
111
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
112
+	$(top_srcdir)/m4/reorganization/debug.m4 \
113
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
114
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
115
+	$(top_srcdir)/m4/reorganization/dns.m4 \
116
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
117
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
118
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
120
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
121
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
122
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
126
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
127
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
131
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
132
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
133
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
134
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
135
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
136
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
137
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
139
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
140
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
141
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
88 142
 	$(top_srcdir)/configure.ac
89 143
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
90 144
 	$(ACLOCAL_M4)
... ...
@@ -158,9 +212,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
158 158
 CHECK_LIBS = @CHECK_LIBS@
159 159
 CLAMAVGROUP = @CLAMAVGROUP@
160 160
 CLAMAVUSER = @CLAMAVUSER@
161
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
161 162
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
163
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
164
+CLAMBC_LIBS = @CLAMBC_LIBS@
165
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
166
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
162 167
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
168
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
169
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
170
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
163 171
 CLAMD_LIBS = @CLAMD_LIBS@
172
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
173
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
174
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
175
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
164 176
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
165 177
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
166 178
 CPP = @CPP@
... ...
@@ -180,6 +246,7 @@ ECHO_T = @ECHO_T@
180 180
 EGREP = @EGREP@
181 181
 EXEEXT = @EXEEXT@
182 182
 FGREP = @FGREP@
183
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
183 184
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
184 185
 GCOV = @GCOV@
185 186
 GENHTML = @GENHTML@
... ...
@@ -201,8 +268,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
201 201
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
202 202
 LIBBZ2 = @LIBBZ2@
203 203
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
204
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
204 205
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
205 206
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
207
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
206 208
 LIBLTDL = @LIBLTDL@
207 209
 LIBM = @LIBM@
208 210
 LIBOBJS = @LIBOBJS@
... ...
@@ -240,6 +309,7 @@ RANLIB = @RANLIB@
240 240
 SED = @SED@
241 241
 SET_MAKE = @SET_MAKE@
242 242
 SHELL = @SHELL@
243
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
243 244
 STRIP = @STRIP@
244 245
 THREAD_LIBS = @THREAD_LIBS@
245 246
 TH_SAFE = @TH_SAFE@
... ...
@@ -95,6 +95,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
95 95
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
96 96
 	$(top_srcdir)/m4/lt~obsolete.m4 \
97 97
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
98
+	$(top_srcdir)/m4/reorganization/version.m4 \
99
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
100
+	$(top_srcdir)/m4/reorganization/headers.m4 \
101
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
102
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
103
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
104
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
108
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
109
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
110
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
111
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
112
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
113
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
114
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
115
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
116
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
117
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
118
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
119
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
120
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
121
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
122
+	$(top_srcdir)/m4/reorganization/debug.m4 \
123
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
124
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
125
+	$(top_srcdir)/m4/reorganization/dns.m4 \
126
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
127
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
128
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
131
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
132
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
133
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
134
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
135
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
136
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
137
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
138
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
139
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
140
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
141
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
142
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
143
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
144
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
145
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
146
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
147
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
148
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
149
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
150
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
151
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
98 152
 	$(top_srcdir)/configure.ac
99 153
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
100 154
 	$(ACLOCAL_M4)
... ...
@@ -428,9 +482,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
428 428
 CHECK_LIBS = @CHECK_LIBS@
429 429
 CLAMAVGROUP = @CLAMAVGROUP@
430 430
 CLAMAVUSER = @CLAMAVUSER@
431
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
431 432
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
433
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
434
+CLAMBC_LIBS = @CLAMBC_LIBS@
435
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
436
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
432 437
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
438
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
439
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
440
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
433 441
 CLAMD_LIBS = @CLAMD_LIBS@
442
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
443
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
444
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
445
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
434 446
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
435 447
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
436 448
 CPP = @CPP@
... ...
@@ -450,6 +516,7 @@ ECHO_T = @ECHO_T@
450 450
 EGREP = @EGREP@
451 451
 EXEEXT = @EXEEXT@
452 452
 FGREP = @FGREP@
453
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
453 454
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
454 455
 GCOV = @GCOV@
455 456
 GENHTML = @GENHTML@
... ...
@@ -471,8 +538,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
471 471
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
472 472
 LIBBZ2 = @LIBBZ2@
473 473
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
474
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
474 475
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
475 476
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
477
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
476 478
 LIBLTDL = @LIBLTDL@
477 479
 LIBM = @LIBM@
478 480
 LIBOBJS = @LIBOBJS@
... ...
@@ -510,6 +579,7 @@ RANLIB = @RANLIB@
510 510
 SED = @SED@
511 511
 SET_MAKE = @SET_MAKE@
512 512
 SHELL = @SHELL@
513
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
513 514
 STRIP = @STRIP@
514 515
 THREAD_LIBS = @THREAD_LIBS@
515 516
 TH_SAFE = @TH_SAFE@
... ...
@@ -73,6 +73,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
73 73
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
74 74
 	$(top_srcdir)/m4/lt~obsolete.m4 \
75 75
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
76
+	$(top_srcdir)/m4/reorganization/version.m4 \
77
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
78
+	$(top_srcdir)/m4/reorganization/headers.m4 \
79
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
80
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
81
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
82
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
83
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
84
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
85
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
86
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
87
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
88
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
89
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
90
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
91
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
92
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
93
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
97
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
98
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
99
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
100
+	$(top_srcdir)/m4/reorganization/debug.m4 \
101
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
102
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
103
+	$(top_srcdir)/m4/reorganization/dns.m4 \
104
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
105
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
106
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
108
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
109
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
110
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
111
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
112
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
113
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
114
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
115
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
116
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
117
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
118
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
120
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
121
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
122
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
123
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
124
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
125
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
126
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
127
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
128
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
129
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
76 130
 	$(top_srcdir)/configure.ac
77 131
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
78 132
 	$(ACLOCAL_M4)
... ...
@@ -234,9 +288,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
234 234
 CHECK_LIBS = @CHECK_LIBS@
235 235
 CLAMAVGROUP = @CLAMAVGROUP@
236 236
 CLAMAVUSER = @CLAMAVUSER@
237
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
237 238
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
239
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
240
+CLAMBC_LIBS = @CLAMBC_LIBS@
241
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
242
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
238 243
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
244
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
245
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
246
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
239 247
 CLAMD_LIBS = @CLAMD_LIBS@
248
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
249
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
250
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
251
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
240 252
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
241 253
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
242 254
 CPP = @CPP@
... ...
@@ -256,6 +322,7 @@ ECHO_T = @ECHO_T@
256 256
 EGREP = @EGREP@
257 257
 EXEEXT = @EXEEXT@
258 258
 FGREP = @FGREP@
259
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
259 260
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
260 261
 GCOV = @GCOV@
261 262
 GENHTML = @GENHTML@
... ...
@@ -277,8 +344,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
277 277
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
278 278
 LIBBZ2 = @LIBBZ2@
279 279
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
280
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
280 281
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
281 282
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
283
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
282 284
 LIBLTDL = @LIBLTDL@
283 285
 LIBM = @LIBM@
284 286
 LIBOBJS = @LIBOBJS@
... ...
@@ -316,6 +385,7 @@ RANLIB = @RANLIB@
316 316
 SED = @SED@
317 317
 SET_MAKE = @SET_MAKE@
318 318
 SHELL = @SHELL@
319
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
319 320
 STRIP = @STRIP@
320 321
 THREAD_LIBS = @THREAD_LIBS@
321 322
 TH_SAFE = @TH_SAFE@
322 323
new file mode 100644
... ...
@@ -0,0 +1,7 @@
0
+AC_ARG_ENABLE([bigstack],
1
+[  --enable-bigstack	  increase thread stack size],
2
+enable_bigstack=$enableval, enable_bigstack="no")
3
+
4
+if test "$enable_bigstack" = "yes"; then
5
+  AC_DEFINE([C_BIGSTACK],1,[Increase thread stack size.])
6
+fi
0 7
new file mode 100644
... ...
@@ -0,0 +1,5 @@
0
+case "$host_os" in
1
+freebsd*)
2
+AC_CHECK_LIB([util], [kinfo_getvmmap], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lutil"], AC_MSG_ERROR([You are running BSD but you don't have kinfo_getvmmap in the util library. Please fix manually.]))
3
+;;
4
+esac
0 5
new file mode 100644
... ...
@@ -0,0 +1,7 @@
0
+AC_PROG_CC
1
+AC_PROG_INSTALL
2
+AC_PROG_LN_S
3
+AC_PROG_MAKE_SET
4
+AC_PROG_LIBTOOL
5
+
6
+LT_LIB_M
0 7
new file mode 100644
... ...
@@ -0,0 +1,6 @@
0
+AC_LIB_MULTILIB_GUESS
1
+
2
+AC_C_RESTRICT
3
+AC_C_CONST
4
+AC_C_INLINE
5
+AC_C_BIGENDIAN
0 6
new file mode 100644
... ...
@@ -0,0 +1,17 @@
0
+dnl configure config directory
1
+cfg_dir=`echo $sysconfdir | grep prefix`
2
+
3
+if test -n "$cfg_dir"; then
4
+    if test "$prefix" = "NONE"
5
+    then
6
+	cfg_dir="$ac_default_prefix/etc"
7
+    else
8
+	cfg_dir="$prefix/etc"
9
+    fi
10
+else
11
+    cfg_dir="$sysconfdir"
12
+fi
13
+
14
+CFGDIR=$cfg_dir
15
+AC_SUBST([CFGDIR])
16
+AC_DEFINE_UNQUOTED([CONFDIR],"$cfg_dir",[where to look for the config file])
0 17
new file mode 100644
... ...
@@ -0,0 +1,57 @@
0
+dnl Check for clamav in /etc/passwd
1
+if test "$test_clamav" = "yes"
2
+then
3
+    dnl parse /etc/passwd
4
+    if test "$use_id" = "no"
5
+    then
6
+	AC_MSG_CHECKING([for $clamav_user in /etc/passwd])
7
+	if test -r /etc/passwd; then
8
+	    clamavuser=`cat /etc/passwd|grep "^$clamav_user:"`
9
+	    clamavgroup=`cat /etc/group|grep "^$clamav_group:"`
10
+	fi
11
+    else
12
+	AC_MSG_CHECKING([for $clamav_user using id])
13
+	id $clamav_user > /dev/null 2>&1
14
+	if test "$?" = 0 ; then
15
+	    clamavuser=1
16
+	    AC_PATH_PROG(GETENT, getent)
17
+	    if test -n "$GETENT" ; then
18
+		clamavgroup=`$GETENT group | grep "^${clamav_group}:"`
19
+	    else
20
+		clamavgroup=`cat /etc/group|grep $clamav_group`
21
+	    fi
22
+	fi
23
+    fi
24
+
25
+    if test "$use_netinfo" = "yes"
26
+    then
27
+	if test -x /usr/bin/dscl; then
28
+	    AC_MSG_CHECKING([for $clamav_user using dscl])
29
+	    clamavuser=`/usr/bin/dscl . -list /Users |grep ${clamav_user}`
30
+	    clamavgroup=`/usr/bin/dscl . -list /Groups |grep ${clamav_group}`
31
+	else
32
+	    AC_MSG_CHECKING([for $clamav_user using netinfo])
33
+	    clamavuser=`/usr/bin/nidump passwd . |grep ${clamav_user}`
34
+	    clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`
35
+	fi
36
+    fi
37
+
38
+    if test "$use_yp" = "yes"
39
+    then
40
+	AC_MSG_CHECKING([for $clamav_user using ypmatch])
41
+        clamavuser=`ypmatch ${clamav_user} passwd`
42
+        clamavgroup=`ypmatch ${clamav_group} group`
43
+    fi
44
+
45
+    if test -z "$clamavuser" || test -z "$clamavgroup"
46
+    then
47
+	AC_MSG_RESULT(no)
48
+	AC_MSG_ERROR([User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !])
49
+    else
50
+	AC_MSG_RESULT([yes, user $clamav_user and group $clamav_group])
51
+        CLAMAVUSER="$clamav_user"
52
+        CLAMAVGROUP="$clamav_group"
53
+        AC_SUBST([CLAMAVUSER])
54
+        AC_SUBST([CLAMAVGROUP])
55
+    fi
56
+fi
0 57
new file mode 100644
... ...
@@ -0,0 +1,48 @@
0
+AC_ARG_ENABLE(clamdtop,
1
+	      AC_HELP_STRING([--enable-clamdtop],
2
+			     [Enable 'clamdtop' tool @<:@default=auto@:>@]),
3
+[enable_clamdtop=$enableval], [enable_clamdtop="auto"])
4
+
5
+if test "$enable_clamdtop" != "no"; then
6
+
7
+AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
8
+	    AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
9
+			    [initscr(); KEY_RESIZE;]),
10
+	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
11
+	     CURSES_INCLUDE="<ncurses/ncurses.h>"],
12
+	    [])
13
+
14
+if test "X$HAVE_LIBNCURSES" != "Xyes"; then
15
+    HAVE_LIBNCURSES=
16
+    AC_LIB_FIND([ncurses], [ncurses.h],
17
+	    AC_LANG_PROGRAM([#include <ncurses.h>],
18
+			    [initscr(); KEY_RESIZE;]),
19
+	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
20
+	     CURSES_INCLUDE="<ncurses.h>"],
21
+	    [])
22
+fi
23
+
24
+if test "X$HAVE_LIBNCURSES" != "Xyes"; then
25
+    AC_LIB_FIND([pdcurses],[curses.h],
26
+			    AC_LANG_PROGRAM([#include <curses.h>],
27
+					    [initscr(); KEY_RESIZE;]),
28
+			    [CURSES_CPPFLAGS="$INCPDCURSES";
29
+			     CURSES_LIBS="$LTLIBPDCURSES";
30
+			     CURSES_INCLUDE="<curses.h>"],
31
+			    [AC_MSG_WARN([****** not building clamdtop: ncurses not found])])
32
+fi
33
+
34
+if test "x$CURSES_LIBS" = "x" -a "$enable_clamdtop" = "yes"; then
35
+    AC_MSG_ERROR([
36
+
37
+ERROR!  Clamdtop was configured, but not found.  You need to install libncurses5-dev.
38
+])
39
+fi
40
+
41
+fi
42
+
43
+AC_DEFINE_UNQUOTED([CURSES_INCLUDE], $CURSES_INCLUDE, [curses header location])
44
+AC_SUBST([CURSES_CPPFLAGS])
45
+AC_SUBST([CURSES_LIBS])
46
+AM_CONDITIONAL([HAVE_CURSES],
47
+	       [test "X$HAVE_LIBNCURSES" = "Xyes" || test "X$HAVE_LIBPDCURSES" = "Xyes"])
0 48
new file mode 100644
... ...
@@ -0,0 +1,126 @@
0
+dnl check for __attribute__((packed))
1
+dnl but only on compilers claiming to be gcc compatible
2
+dnl because for example Sun's compiler silently ignores the packed attribute.
3
+AC_MSG_CHECKING([for structure packing via __attribute__((packed))])
4
+AC_CACHE_VAL([have_cv_attrib_packed],[
5
+	AC_TRY_COMPILE(,
6
+		[#ifdef __GNUC__
7
+		 struct { int i __attribute__((packed)); } s;
8
+		 #else
9
+		 #error Only checking for packed attribute on gcc-like compilers
10
+		 #endif],
11
+		[have_cv_attrib_packed=yes],
12
+		[have_cv_attrib_packed=no])
13
+	])
14
+AC_MSG_RESULT([$have_cv_attrib_packed])
15
+
16
+if test "$have_cv_attrib_packed" = no; then
17
+	AC_MSG_CHECKING([for structure packing via pragma])
18
+	AC_CACHE_VAL([have_cv_pragma_pack],[
19
+		AC_TRY_RUN([
20
+			    int main(int argc, char **argv) {
21
+#pragma pack(1)			/* has to be in column 1 ! */
22
+			struct { char c; long l; } s;
23
+			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],
24
+			[have_cv_pragma_pack=yes],
25
+			[have_cv_pragma_pack=no])
26
+		])
27
+	AC_MSG_RESULT([$have_cv_pragma_pack])
28
+	if test "$have_cv_pragma_pack" = yes; then
29
+		AC_DEFINE([HAVE_PRAGMA_PACK], 1, "pragma pack")
30
+	else
31
+		AC_MSG_CHECKING([for structure packing via hppa/hp-ux pragma])
32
+		AC_CACHE_VAL([have_cv_pragma_pack_hpux],[
33
+			AC_TRY_RUN([
34
+			/* hppa/hp-ux wants pragma outside of function */
35
+#pragma pack 1 /* has to be in column 1 ! */
36
+			struct { char c; long l; } s;
37
+			    int main(int argc, char **argv) {
38
+			return sizeof(s)==sizeof(s.c)+sizeof(s.l) ? 0:1; } ],
39
+			[have_cv_pragma_pack_hpux=yes],
40
+			[have_cv_pragma_pack_hpux=no])
41
+		])
42
+		AC_MSG_RESULT([$have_cv_pragma_pack_hpux])
43
+		AC_DEFINE([HAVE_PRAGMA_PACK_HPPA], 1, "pragma pack hppa/hp-ux style")
44
+	fi
45
+fi
46
+
47
+dnl check for __attribute__((aligned))
48
+AC_MSG_CHECKING([for type aligning via __attribute__((aligned))])
49
+AC_CACHE_VAL([have_cv_attrib_aligned],[
50
+	AC_TRY_COMPILE(,
51
+		[typedef int cl_aligned_int __attribute__((aligned));],
52
+		[have_cv_attrib_aligned=yes],
53
+		[have_cv_attrib_aligned=no])
54
+	])
55
+AC_MSG_RESULT([$have_cv_attrib_aligned])
56
+
57
+if test "$have_cv_attrib_packed" = no -a "$have_cv_pragma_pack" = no -a "$have_cv_pragma_pack_hpux" = no; then
58
+	AC_MSG_ERROR(Need to know how to pack structures with this compiler)
59
+fi
60
+
61
+if test "$have_cv_attrib_packed" = yes; then
62
+	AC_DEFINE([HAVE_ATTRIB_PACKED], 1, [attrib packed])
63
+fi
64
+
65
+if test "$have_cv_attrib_aligned" = yes; then
66
+	AC_DEFINE([HAVE_ATTRIB_ALIGNED], 1, [attrib aligned])
67
+fi
68
+
69
+dnl Sanity check that struct packing works
70
+AC_MSG_CHECKING([that structure packing works])
71
+AC_CACHE_VAL([have_cv_struct_pack],[
72
+    AC_TRY_RUN([
73
+#ifndef HAVE_ATTRIB_PACKED
74
+#define __attribute__(x)
75
+#endif
76
+#ifdef HAVE_PRAGMA_PACK
77
+#pragma pack(1) /* has to be in column 1 ! */
78
+#endif
79
+#ifdef HAVE_PRAGMA_PACK_HPPA
80
+#pragma pack 1 /* has to be in column 1 ! */
81
+#endif
82
+
83
+struct { char c __attribute__((packed)); long l __attribute__((packed)); } s;
84
+
85
+#ifdef HAVE_PRAGMA_PACK
86
+#pragma pack()
87
+#endif
88
+#ifdef HAVE_PRAGMA_PACK_HPPA
89
+#pragma pack
90
+#endif
91
+
92
+struct { char c; long l;} s2;
93
+
94
+#ifdef HAVE_PRAGMA_PACK
95
+#pragma pack(1) /* has to be in column 1 ! */
96
+#endif
97
+#ifdef HAVE_PRAGMA_PACK_HPPA
98
+#pragma pack 1 /* has to be in column 1 ! */
99
+#endif
100
+
101
+struct { char c; long l; } __attribute__((packed)) s3;
102
+
103
+#ifdef HAVE_PRAGMA_PACK
104
+#pragma pack()
105
+#endif
106
+#ifdef HAVE_PRAGMA_PACK_HPPA
107
+#pragma pack
108
+#endif
109
+
110
+    int main(int argc, char **argv) {
111
+        if (sizeof(s)!=sizeof(s.c)+sizeof(s.l))
112
+	    return 1;
113
+	if (sizeof(s) != sizeof(s3))
114
+	    return 2;
115
+	return (sizeof(s2) >= sizeof(s)) ? 0 : 3;
116
+    }],
117
+    [have_cv_struct_pack=yes],
118
+    [have_cv_struct_pack=no],
119
+    [have_cv_struct_pack=yes])
120
+])
121
+AC_MSG_RESULT([$have_cv_struct_pack])
122
+
123
+if test "$have_cv_struct_pack" = "no"; then
124
+    AC_MSG_ERROR([Structure packing seems to be available, but is not working with this compiler])
125
+fi
0 126
new file mode 100644
... ...
@@ -0,0 +1,22 @@
0
+AC_ARG_ENABLE(coverage,
1
+	      AC_HELP_STRING([--enable-coverage],
2
+			     [turn on test coverage
3
+			      @<:@default=no@:>@]),
4
+[enable_cov=$enableval],[enable_cov="no"])
5
+
6
+if test "x$enable_coverage" = "xyes"; then
7
+	if test "x$CHECK_LIBS" = "x"; then
8
+		AC_MSG_ERROR([Coverage testing required, but unit tests not enabled!])
9
+	fi
10
+	if test "x$ac_compiler_gnu" != "xyes"; then
11
+		AC_MSG_ERROR([coverage testing only works if gcc is used])
12
+	fi
13
+
14
+	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
15
+	LDFLAGS="$LDFLAGS -lgcov"
16
+	AC_CHECK_PROGS(GCOV, gcov, false)
17
+	AC_CHECK_PROGS(LCOV, lcov, false)
18
+	AC_CHECK_PROGS(GENHTML, genhtml, false)
19
+fi
20
+
21
+AM_CONDITIONAL(ENABLE_COVERAGE, test "x$enable_coverage" = "xyes")
0 22
new file mode 100644
... ...
@@ -0,0 +1,18 @@
0
+AC_MSG_CHECKING([for ctime_r])
1
+if test "$ac_cv_func_ctime_r" = "yes"; then
2
+    AC_TRY_COMPILE([
3
+	#include <time.h>
4
+    ],[
5
+	char buf[31];
6
+	time_t t;
7
+	ctime_r(&t, buf, 30);
8
+    ],[
9
+	ac_cv_ctime_args=3
10
+	AC_DEFINE([HAVE_CTIME_R_3],1,[ctime_r takes 3 arguments])
11
+    ],[
12
+	ac_cv_ctime_args=2
13
+	AC_DEFINE([HAVE_CTIME_R_2],1,[ctime_r takes 2 arguments])
14
+    ])
15
+
16
+    AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments])
17
+fi
0 18
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+AC_C_DNS
0 1
new file mode 100644
... ...
@@ -0,0 +1,3 @@
0
+AC_ARG_ENABLE([fanotify],
1
+[  --disable-fanotify	  disable fanotify support (Linux only)],
2
+want_fanotify=$enableval, want_fanotify="yes")
0 3
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+AC_C_FDPASSING
0 1
new file mode 100644
... ...
@@ -0,0 +1,13 @@
0
+AX_CHECK_UNAME_SYSCALL
1
+AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
2
+AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])
3
+
4
+AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo madvise])
5
+AC_FUNC_FSEEKO
6
+
7
+dnl Check if anon maps are available, check if we can determine the page size
8
+AC_C_FUNC_MMAP_PRIVATE
9
+AC_C_FUNC_PAGESIZE
10
+AC_C_FUNC_MMAP_ANONYMOUS
11
+
12
+AC_CHECK_FUNCS([enable_extended_FILE_stdio])
0 13
new file mode 100644
... ...
@@ -0,0 +1,32 @@
0
+dnl we need to try to link with iconv, otherwise there could be a 
1
+dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.
2
+dnl we need to check after zlib/bzip2, because they can change the include path
3
+AC_ARG_WITH([iconv], [  --with-iconv supports iconv() (default=auto)],
4
+[
5
+ case "$withval" in
6
+	 yes|no) wiconv="$withval";;
7
+	 *) AC_MSG_ERROR([--with-iconv does not take an argument]);;
8
+ esac],
9
+[ wiconv=auto ])
10
+if test "X$wiconv" != "Xno"; then
11
+	AC_CHECK_LIB([iconv], [libiconv_open], LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv")
12
+	AC_MSG_CHECKING([for iconv])
13
+	save_LIBS="$LIBS"
14
+	LIBS="$LIBCLAMAV_LIBS"
15
+	AC_TRY_LINK([
16
+		     #include <iconv.h>
17
+	],[
18
+	char** xin,**xout;
19
+	unsigned long il,ol;
20
+	int rc;
21
+	iconv_t iconv_struct = iconv_open("UTF-16BE","UTF-8");
22
+	rc = iconv(iconv_struct,xin,&il,xout,&ol);
23
+	iconv_close(iconv_struct);
24
+],[
25
+   AC_MSG_RESULT(yes)
26
+   AC_DEFINE([HAVE_ICONV], 1, [iconv() available])
27
+],[
28
+	AC_MSG_RESULT(no)
29
+])
30
+	LIBS="$save_LIBS"
31
+fi
0 32
new file mode 100644
... ...
@@ -0,0 +1,12 @@
0
+dnl check for in_addr_t definition
1
+AC_MSG_CHECKING([for in_addr_t definition])
2
+AC_TRY_COMPILE([
3
+#include <sys/types.h>
4
+#include <netinet/in.h>
5
+],
6
+[ in_addr_t pt; pt = 0; return pt; ],
7
+[
8
+    AC_MSG_RESULT(yes)
9
+    AC_DEFINE([HAVE_IN_ADDR_T],1,[in_addr_t is defined])
10
+],
11
+AC_MSG_RESULT(no))
0 12
new file mode 100644
... ...
@@ -0,0 +1,12 @@
0
+dnl check for in_port_t definition
1
+AC_MSG_CHECKING([whether in_port_t is defined])
2
+AC_TRY_COMPILE([
3
+#include <sys/types.h>
4
+#include <netinet/in.h>
5
+],
6
+[in_port_t pt; pt = 0; return pt;],
7
+[
8
+    AC_MSG_RESULT(yes)
9
+    AC_DEFINE([HAVE_IN_PORT_T],1,[in_port_t is defined])
10
+],
11
+AC_MSG_RESULT(no))
0 12
new file mode 100644
... ...
@@ -0,0 +1,39 @@
0
+AC_ARG_ENABLE([ipv6],
1
+[  --disable-ipv6          disable IPv6 support],
2
+want_ipv6=$enableval, want_ipv6="yes")
3
+
4
+if test "$want_ipv6" = "yes"
5
+then
6
+    AC_MSG_CHECKING([for IPv6 support])
7
+    AC_CACHE_VAL([have_cv_ipv6],[
8
+		AC_TRY_RUN([
9
+		    #include <sys/types.h>
10
+		    #include <sys/socket.h>
11
+		    #include <netdb.h>
12
+		    #include <unistd.h>
13
+		    int main(int argc, char **argv)
14
+		    {
15
+			    struct addrinfo *res, hints;
16
+			    int sd;
17
+
18
+			if((sd = socket(AF_INET6, SOCK_STREAM, 0)) < 0)
19
+			    return 1;
20
+			close(sd);
21
+			/* also check if getaddrinfo() handles AF_UNSPEC -- bb#1196 */
22
+			memset(&hints, 0, sizeof(hints));
23
+			hints.ai_family = AF_UNSPEC;
24
+			if(getaddrinfo("127.0.0.1", NULL, &hints, &res) < 0)
25
+			    return 1;
26
+			freeaddrinfo(res);
27
+			return 0;
28
+		    }
29
+		],
30
+		[have_cv_ipv6=yes],
31
+		[have_cv_ipv6=no],
32
+		[have_cv_ipv6=no])
33
+		])
34
+    AC_MSG_RESULT([$have_cv_ipv6])
35
+    if test "$have_cv_ipv6" = yes; then
36
+	AC_DEFINE(SUPPORT_IPv6, 1, [Support for IPv6])
37
+    fi
38
+fi
0 39
new file mode 100644
... ...
@@ -0,0 +1,18 @@
0
+AC_ARG_ENABLE([mempool],[  --disable-mempool       disable memory pools], enable_mempool=$enableval, enable_mempool="yes")
1
+have_mempool="no"
2
+if test "$enable_mempool" = "yes"; then
3
+	if test "$ac_cv_c_mmap_private" != "yes"; then
4
+		AC_MSG_NOTICE([****** mempool support disabled (mmap not available or not usable)])
5
+	else
6
+		if test "$ac_cv_c_can_get_pagesize" != "yes"; then
7
+			AC_MSG_NOTICE([****** mempool support disabled (pagesize cannot be determined)])
8
+		else
9
+			if test "$ac_cv_c_mmap_anonymous" = "no"; then
10
+				AC_MSG_NOTICE([****** mempool support disabled (anonymous mmap not available)])
11
+			else
12
+				AC_DEFINE([USE_MPOOL],1,[enable memory pools])
13
+				have_mempool="yes"
14
+			fi
15
+		fi
16
+	fi
17
+fi
0 18
new file mode 100644
... ...
@@ -0,0 +1,11 @@
0
+if test "$have_pthreads" = "yes"
1
+then
2
+    save_LIBS="$LIBS"
3
+    LIBS="$THREAD_LIBS $LIBS"
4
+    AC_CHECK_FUNCS([sched_yield pthread_yield])
5
+    LIBS="$save_LIBS"
6
+    AC_DEFINE([BUILD_CLAMD], 1, "build clamd")
7
+    dnl define these here, so we don't forget any system
8
+    AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
9
+    AC_DEFINE([_REENTRANT],1,[thread safe])
10
+fi
0 11
new file mode 100644
... ...
@@ -0,0 +1,3 @@
0
+AC_ARG_ENABLE([pthreads],
1
+[  --disable-pthreads      disable POSIX threads support],
2
+have_pthreads=$enableval,)
0 3
new file mode 100644
... ...
@@ -0,0 +1,46 @@
0
+dnl Check for readdir_r and number of its arguments
1
+dnl Code from libwww/configure.in
2
+
3
+AC_MSG_CHECKING([for readdir_r])
4
+if test -z "$ac_cv_readdir_args"; then
5
+    AC_TRY_COMPILE(
6
+    [
7
+#include <sys/types.h>
8
+#include <dirent.h>
9
+    ],
10
+    [
11
+    struct dirent dir, *dirp;
12
+    DIR *mydir;
13
+    dirp = readdir_r(mydir, &dir);
14
+    ], ac_cv_readdir_args=2)
15
+fi
16
+if test -z "$ac_cv_readdir_args"; then
17
+    AC_TRY_COMPILE(
18
+        [
19
+#include <sys/types.h>
20
+#include <dirent.h>
21
+    ],
22
+    [
23
+        struct dirent dir, *dirp;
24
+        DIR *mydir;
25
+        int rc;
26
+        rc = readdir_r(mydir, &dir, &dirp);
27
+    ], ac_cv_readdir_args=3)
28
+fi
29
+
30
+AC_ARG_ENABLE([readdir_r],
31
+[  --enable-readdir_r		    enable support for readdir_r],
32
+enable_readdir_r=$enableval, enable_readdir_r="no")
33
+
34
+if test "$enable_readdir_r" = "no"; then
35
+    AC_MSG_RESULT(support disabled)
36
+elif test -z "$ac_cv_readdir_args"; then
37
+    AC_MSG_RESULT(no)
38
+else
39
+    if test "$ac_cv_readdir_args" = 2; then
40
+	AC_DEFINE([HAVE_READDIR_R_2],1,[readdir_r takes 2 arguments])
41
+    elif test "$ac_cv_readdir_args" = 3; then
42
+	AC_DEFINE([HAVE_READDIR_R_3],1,[readdir_r takes 3 arguments])
43
+    fi
44
+    AC_MSG_RESULT([yes, and it takes $ac_cv_readdir_args arguments])
45
+fi
0 46
new file mode 100644
... ...
@@ -0,0 +1,3 @@
0
+AC_ARG_ENABLE([cr],
1
+[  --disable-cr		  don't link with C reentrant library (BSD) ],
2
+use_cr=$enableval,)
0 3
new file mode 100644
... ...
@@ -0,0 +1,52 @@
0
+dnl Check if <sys/select.h> needs to be included for fd_set
1
+AC_MSG_CHECKING([for fd_set])
2
+AC_HEADER_EGREP([fd_mask], [sys/select.h], [have_fd_set=yes])
3
+if test "$have_fd_set" = yes; then
4
+	AC_DEFINE([HAVE_SYS_SELECT_H], 1, "have <sys/select.h>")
5
+	AC_MSG_RESULT([yes, found in sys/select.h])
6
+else
7
+	AC_TRY_COMPILE([#include <sys/time.h>
8
+			#include <sys/types.h>
9
+			#ifdef HAVE_UNISTD_H
10
+			#include <unistd.h>
11
+			#endif],
12
+		[fd_set readMask, writeMask;], have_fd_set=yes, have_fd_set=no)
13
+	if test "$have_fd_set" = yes; then
14
+		AC_MSG_RESULT([yes, found in sys/types.h])
15
+	else
16
+		AC_DEFINE([NO_FD_SET], 1, "no fd_set")
17
+		AC_MSG_RESULT(no)
18
+	fi
19
+fi
20
+
21
+AC_MSG_CHECKING([default FD_SETSIZE value])
22
+AC_TRY_RUN([
23
+#include <stdio.h>
24
+#include <unistd.h>
25
+#include <sys/time.h>
26
+#ifdef HAVE_SYS_SELECT_H
27
+#include <sys/select.h>
28
+#endif
29
+#ifdef HAVE_SYS_TYPES_H
30
+#include <sys/types.h>
31
+#endif
32
+#include <errno.h>
33
+int main(void) {
34
+        FILE *fp = fopen("conftestval", "w");
35
+	if(fp) {
36
+		if(fprintf (fp, "%d\n", FD_SETSIZE) < 1)  {
37
+			perror("fprintf failed");
38
+			return errno;
39
+		}
40
+	} else {
41
+		perror("fopen failed");
42
+		return errno;
43
+	}
44
+        return 0;
45
+}
46
+],
47
+DEFAULT_FD_SETSIZE=`cat conftestval`,
48
+DEFAULT_FD_SETSIZE=256,
49
+DEFAULT_FD_SETSIZE=256)
50
+AC_MSG_RESULT([$DEFAULT_FD_SETSIZE])
51
+AC_DEFINE_UNQUOTED([DEFAULT_FD_SETSIZE], $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value")
0 52
new file mode 100644
... ...
@@ -0,0 +1,19 @@
0
+dnl AC_FUNC_SETPGRP does not work when cross compiling
1
+dnl Instead, assume we will have a prototype for setpgrp if cross compiling.
2
+dnl testcase from gdb/configure.ac
3
+if test "$cross_compiling" = no; then
4
+ AC_FUNC_SETPGRP
5
+else
6
+ AC_CACHE_CHECK([whether setpgrp takes no argument], [ac_cv_func_setpgrp_void],
7
+   [AC_TRY_COMPILE([
8
+#include <unistd.h>
9
+], [
10
+ if (setpgrp(1,1) == -1)
11
+   exit (0);
12
+ else
13
+   exit (1);
14
+], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes)])
15
+if test $ac_cv_func_setpgrp_void = yes; then
16
+ AC_DEFINE([SETPGRP_VOID], 1)
17
+fi
18
+fi
0 19
new file mode 100644
... ...
@@ -0,0 +1,10 @@
0
+dnl Check signed right shift implementation
1
+AC_MSG_CHECKING([whether signed right shift is sign extended])
2
+AC_TRY_RUN([int main(void){int a=-1;int b=a>>1;return(a!=b);}],
3
+    [have_signed_rightshift_extended=yes],
4
+    [have_signed_rightshift_extended=no],
5
+    [have_signed_rightshift_extended=no])
6
+if test $have_signed_rightshift_extended = yes; then
7
+    AC_DEFINE([HAVE_SAR], 1, [Define signed right shift implementation])
8
+fi
9
+AC_MSG_RESULT([$have_signed_rightshift_extended]);
0 10
new file mode 100644
... ...
@@ -0,0 +1,41 @@
0
+dnl Determine socklen_t type. Code from lftp.
1
+AC_MSG_CHECKING([for socklen_t])
2
+AC_CACHE_VAL([ac_cv_socklen_t],
3
+[
4
+    ac_cv_socklen_t=no
5
+    AC_TRY_COMPILE([
6
+	#include <sys/types.h>
7
+        #include <sys/socket.h>
8
+    ],
9
+    [
10
+	socklen_t len;
11
+        getpeername(0,0,&len);
12
+    ],
13
+    [
14
+	ac_cv_socklen_t=yes
15
+    ])
16
+])
17
+AC_MSG_RESULT([$ac_cv_socklen_t])
18
+    if test $ac_cv_socklen_t = no; then
19
+    AC_MSG_CHECKING([for socklen_t equivalent])
20
+    AC_CACHE_VAL([ac_cv_socklen_t_equiv],
21
+    [
22
+	ac_cv_socklen_t_equiv=int
23
+        for t in int size_t unsigned long "unsigned long"; do
24
+	    AC_TRY_COMPILE([
25
+		#include <sys/types.h>
26
+		#include <sys/socket.h>
27
+	    ],
28
+            [
29
+		$t len;
30
+		getpeername(0,0,&len);
31
+            ],
32
+            [
33
+		ac_cv_socklen_t_equiv="$t"
34
+		break
35
+            ])
36
+	done
37
+    ])
38
+    AC_MSG_RESULT([$ac_cv_socklen_t_equiv])
39
+    AC_DEFINE_UNQUOTED([socklen_t], $ac_cv_socklen_t_equiv, [Define to "int" if <sys/socket.h> does not define.])
40
+fi
0 41
new file mode 100644
... ...
@@ -0,0 +1,29 @@
0
+AC_MSG_CHECKING([stat64])
1
+AC_TRY_RUN([
2
+#define _LARGEFILE_SOURCE
3
+#define _LARGEFILE64_SOURCE
4
+#include <stdio.h>
5
+#include <sys/types.h>
6
+#include <sys/stat.h>
7
+#include <unistd.h>
8
+#include <errno.h>
9
+
10
+int main(void) {
11
+    struct stat64 sb;
12
+
13
+    if (stat64(".", &sb) == -1)
14
+        return errno;
15
+
16
+    return 0;
17
+}
18
+],
19
+[enable_stat64=yes],
20
+[enable_stat64=no],
21
+[enable_stat64=no],
22
+)
23
+
24
+if test "$enable_stat64" != "no"; then
25
+AC_DEFINE([HAVE_STAT64],1,[enable stat64])
26
+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
27
+fi
28
+AC_MSG_RESULT([$enable_stat64])
0 29
new file mode 100644
... ...
@@ -0,0 +1,21 @@
0
+enable_check_ut=auto
1
+enable_ut_install=no
2
+AC_ARG_ENABLE(check,
3
+[  --enable-check           Enable 'check' unit tests (default=auto)], enable_check_ut=$enableval, enable_check_ut="auto" )
4
+
5
+if test "$enable_check_ut" != "no" ; then
6
+	AC_LIB_FIND([check],[check.h],
7
+			AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
8
+			[CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"],
9
+			[])
10
+fi
11
+AC_SUBST([CHECK_CPPFLAGS])
12
+AC_SUBST([CHECK_LIBS])
13
+AM_CONDITIONAL([HAVE_LIBCHECK],test "X$HAVE_LIBCHECK" = "Xyes")
14
+
15
+if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then
16
+    AC_MSG_ERROR([
17
+
18
+ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/
19
+])
20
+fi
0 21
new file mode 100644
... ...
@@ -0,0 +1,285 @@
0
+AC_ARG_ENABLE([gcc-vcheck],
1
+[  --disable-gcc-vcheck	  do not check for buggy gcc version ],
2
+gcc_check=$enableval, gcc_check="yes")
3
+
4
+msg_gcc_check="use --disable-gcc-vcheck to disable this check. Before reporting any bugs check with a supported version of gcc"
5
+VERSION_SUFFIX=
6
+dnl Check for gcc-4.1.0
7
+if test "$gcc_check" = "yes"; then
8
+	if test "x$ac_compiler_gnu" = "xyes"; then
9
+		AC_MSG_CHECKING([for a supported version of gcc])
10
+		gcc_version=`${CC} -dumpversion`
11
+		case "${gcc_version}" in
12
+			4.1.0*)
13
+				AC_MSG_RESULT([no (${gcc_version})])
14
+				AC_MSG_ERROR([gcc 4.1.0 is known to incorrectly compile upx.c. Upgrade your compiler to at least 4.1.1/4.1.2)])
15
+				;;
16
+			*)
17
+				AC_MSG_RESULT([ok (${gcc_version})])
18
+				;;
19
+		esac
20
+		case "${gcc_version}" in
21
+		    [[56789]].* | 4.[[3456789]].*)
22
+			# bb #1581 - temporarely add -fno-strict-aliasing so gcc 4.4.0
23
+			# works correctly
24
+			CFLAGS="$CFLAGS -fno-strict-aliasing"
25
+			;;
26
+		    *)
27
+			;;
28
+		esac
29
+	fi
30
+else
31
+	CFLAGS="$CFLAGS -O0"
32
+	VERSION_SUFFIX="$VERSION_SUFFIX-broken-compiler"
33
+fi
34
+
35
+# add distcheck warning flags
36
+distcheck_enable_flags=0
37
+if test "x$ac_compiler_gnu" = "xyes"; then
38
+	gcc_version=`${CC} -dumpversion`
39
+	case "${gcc_version}" in
40
+		4.[[3456789]]*)
41
+			distcheck_enable_flags=1
42
+			;;
43
+		[[56789]].*)
44
+			distcheck_enable_flags=1
45
+			;;
46
+	esac
47
+fi
48
+
49
+dnl Checks if compiler produces valid code, regardless of compiler
50
+dnl we do these checks here to avoid receiving endless bugreports about
51
+dnl breakages due to compiler bugs.
52
+
53
+dnl Check if compiler produces invalid code on gcc PR27603 (affects upx.c)
54
+dnl testcase from gcc testsuite
55
+AC_MSG_CHECKING([for gcc bug PR27603])
56
+AC_TRY_RUN(
57
+	   [
58
+/* (C) Richard Guenther */	   
59
+void exit (int);
60
+void abort (void);
61
+int a;
62
+int main(void)
63
+{
64
+  int j;
65
+  for (j = 0; j < 6; j++)
66
+  {
67
+    if ((unsigned)j - 3 <= 1)
68
+      exit (0);
69
+    a = 1000 * (6 - j);
70
+  }
71
+  abort ();
72
+}
73
+], [AC_MSG_RESULT([ok, bug not present])],
74
+[AC_MSG_ERROR([your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
75
+
76
+dnl Check if compiler produces invalid code on gcc PR26763-2 (affects upx.c)
77
+dnl testcase from gcc testsuite
78
+AC_MSG_CHECKING([for gcc bug PR26763-2])
79
+AC_TRY_RUN(
80
+	   [
81
+/* (C) Richard Guenther */	   
82
+extern void abort(void);
83
+
84
+static int try (char *a, int d)
85
+{
86
+  return a + d > a;
87
+}
88
+
89
+int main(void)
90
+{
91
+  char bla[100];
92
+
93
+  if (try (bla + 50, -1))
94
+    abort ();
95
+
96
+  return 0;
97
+}
98
+], [AC_MSG_RESULT([ok, bug not present])],
99
+[AC_MSG_ERROR([your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763])],[AC_MSG_RESULT([cross-compiling, assumed ok])])
100
+
101
+dnl Check if compiler produces invalid code on own testcase based on upx.c
102
+AC_MSG_CHECKING([for valid code generation of CLI_ISCONTAINED])
103
+AC_TRY_RUN(
104
+	   [
105
+#include <stdio.h>
106
+static struct v{
107
+	char* dst;
108
+	unsigned int dsize;
109
+	unsigned int dcur;
110
+	unsigned int backsize;
111
+	signed int unp_offset;
112
+} values[] = {
113
+	{(char*)0xf78ab008, 0x2e000, 1, 4, -1594},
114
+	{(char*)0xb7af1008, 0x2e000, 1, 4, -1594}
115
+
116
+};
117
+extern void abort(void);
118
+
119
+#define CLI_ISCONTAINED(bb, bb_size, sb, sb_size)	\
120
+  ((bb_size) > 0 && (sb_size) > 0 && (size_t)(sb_size) <= (size_t)(bb_size) \
121
+   && (sb) >= (bb) && ((sb) + (sb_size)) <= ((bb) + (bb_size)) && ((sb) + (sb_size)) > (bb) && (sb) < ((bb) + (bb_size)))
122
+
123
+int crashtest()
124
+{
125
+	unsigned int backsize, dcur;
126
+	int dval=0x12000, unp_offset;
127
+	int* dsize = &dval;
128
+	char* dst = (char*)0x12000;
129
+	while(1) {
130
+		backsize=4;
131
+		dcur=0;
132
+		unp_offset=0x800002c7;
133
+
134
+		if (!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) || !CLI_ISCONTAINED(dst, *dsize, dst+dcur, backsize) || unp_offset >=0)
135
+			return -1;
136
+		abort();
137
+	}
138
+	return 0;
139
+}
140
+
141
+int main(void)
142
+{
143
+	int i;
144
+	for(i=0;i<sizeof(values)/sizeof(values[0]);i++) {
145
+		struct v* v= &values[i];
146
+		char* dst = v->dst;
147
+		unsigned int* dsize = &v->dsize;
148
+		unsigned int dcur = v->dcur;
149
+		unsigned int backsize = v->backsize-1;
150
+		signed int  unp_offset = v->unp_offset;
151
+
152
+		if(!CLI_ISCONTAINED(dst, *dsize, dst+dcur+unp_offset, backsize) ||
153
+				!CLI_ISCONTAINED(dst, *dsize,dst+dcur,backsize) || unp_offset >= 0)  {
154
+			continue;
155
+		}
156
+		abort();
157
+	}
158
+	crashtest();
159
+	return 0;
160
+}
161
+], [AC_MSG_RESULT([ok, bug not present])],
162
+[AC_MSG_ERROR([your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
163
+
164
+dnl Check if compiler produces invalid code on gcc PR28045 (affects upx.c)
165
+dnl testcase from gcc testsuite
166
+AC_MSG_CHECKING([for gcc bug PR28045])
167
+AC_TRY_RUN(
168
+	   [
169
+/* (C) Andrew Pinski */
170
+extern void abort(void);
171
+struct a
172
+{
173
+   unsigned int bits : 1;
174
+   signed long val : ((sizeof(long) * 8) - 1);
175
+};
176
+static int Fnegate (struct a b)
177
+{
178
+  if ((-((long)b.val)) <= ((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))
179
+      && (-((long)b.val)) >= (-(((long) ((1UL << ((sizeof(long) * 8) - 2)) -1UL))) - 1))
180
+     return 0 ;
181
+  abort ();
182
+}
183
+int main (void)
184
+{
185
+  struct a b = {1, 1};
186
+  Fnegate (b);
187
+  return 0;
188
+}
189
+], [AC_MSG_RESULT([ok, bug not present])],
190
+[AC_MSG_ERROR([your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
191
+
192
+dnl Check if compiler produces invalid code on gcc PR37573 (affects autoit.c)
193
+dnl this is a bug in gcc 4.4.0, but for some reason it affects gcc 4.1.2 too
194
+dnl gcc 4.1.3 is OK. This bug occurs only at -O3.
195
+AC_MSG_CHECKING([for gcc bug PR37573])
196
+AC_TRY_RUN(
197
+	   [
198
+#include <stdlib.h>
199
+#include <string.h>
200
+struct S
201
+{
202
+  unsigned int *a;
203
+  unsigned int b;
204
+  unsigned int c[624];
205
+};
206
+static unsigned char
207
+foo (struct S *s)
208
+{
209
+  unsigned int r;
210
+  if (!--s->b)
211
+    {
212
+      unsigned int *c = s->c;
213
+      unsigned int i;
214
+      s->a = c;
215
+      for (i = 0; i < 227; i++)
216
+	c[i] =
217
+	  ((((c[i] ^ c[i + 1]) & 0x7ffffffe) ^ c[i]) >> 1) ^
218
+	  ((0 - (c[i + 1] & 1)) & 0x9908b0df) ^ c[i + 397];
219
+      for (; i < 623; i++)
220
+	c[i] =
221
+	  ((((c[i] ^ c[i + 1]) & 0x7ffffffe) ^ c[i]) >> 1) ^
222
+	  ((0 - (c[i + 1] & 1)) & 0x9908b0df) ^ c[i - 227];
223
+      c[623] =
224
+	((((c[623] ^ c[0]) & 0x7ffffffe) ^ c[623]) >> 1) ^ ((0 - (c[0] & 1)) &
225
+							    0x9908b0df) ^ c[i
226
+									    -
227
+									    227];
228
+    }
229
+  r = *(s->a++);
230
+  r ^= (r >> 11);
231
+  r ^= ((r & 0xff3a58ad) << 7);
232
+  r ^= ((r & 0xffffdf8c) << 15);
233
+  r ^= (r >> 18);
234
+  return (unsigned char) (r >> 1);
235
+}
236
+
237
+void
238
+bar (unsigned char *p, unsigned int q, unsigned int r)
239
+{
240
+  struct S s;
241
+  unsigned int i;
242
+  unsigned int *c = s.c;
243
+  *c = r;
244
+  for (i = 1; i < 624; i++)
245
+    c[i] = i + 0x6c078965 * ((c[i - 1] >> 30) ^ c[i - 1]);
246
+  s.b = 1;
247
+  while (q--)
248
+    *p++ ^= foo (&s);
249
+};
250
+
251
+static unsigned char p[23] = {
252
+  0xc0, 0x49, 0x17, 0x32, 0x62, 0x1e, 0x2e, 0xd5, 0x4c, 0x19, 0x28, 0x49,
253
+    0x91, 0xe4, 0x72, 0x83, 0x91, 0x3d, 0x93, 0x83, 0xb3, 0x61, 0x38
254
+};
255
+
256
+static unsigned char q[23] = {
257
+  0x3e, 0x41, 0x55, 0x54, 0x4f, 0x49, 0x54, 0x20, 0x55, 0x4e, 0x49, 0x43,
258
+    0x4f, 0x44, 0x45, 0x20, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x3c
259
+};
260
+
261
+int
262
+main (void)
263
+{
264
+  unsigned int s;
265
+  s = 23;
266
+  bar (p, s, s + 0xa25e);
267
+  if (memcmp (p, q, s) != 0)
268
+	abort ();
269
+  return 0;
270
+}
271
+
272
+], [AC_MSG_RESULT([ok, bug not present])],
273
+[AC_MSG_ERROR([your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
274
+
275
+# It's not fatal if gperf is missing
276
+AM_MISSING_PROG(GPERF, gperf)
277
+AC_SUBST(GPERF)
278
+
279
+AC_TYPE_OFF_T
280
+AC_COMPILE_CHECK_SIZEOF([short])
281
+AC_COMPILE_CHECK_SIZEOF([int])
282
+AC_COMPILE_CHECK_SIZEOF([long])
283
+AC_COMPILE_CHECK_SIZEOF([long long])
284
+AC_COMPILE_CHECK_SIZEOF([void *])
0 285
new file mode 100644
... ...
@@ -0,0 +1,3 @@
0
+AC_ARG_WITH([version], 
1
+[  --with-version=STR    use custom version string (dev only)],
2
+VERSION="$withval", )
0 3
new file mode 100644
... ...
@@ -0,0 +1,18 @@
0
+AC_ARG_WITH([dbdir], 
1
+[  --with-dbdir=path	  path to virus database directory],
2
+db_dir="$withval", db_dir="_default_")
3
+
4
+dnl I had problems with $pkgdatadir thus these funny checks
5
+if test "$db_dir" = "_default_"
6
+then
7
+    if test "$prefix" = "NONE"
8
+    then
9
+	db_dir="$ac_default_prefix/share/clamav"
10
+    else
11
+	db_dir="$prefix/share/clamav"
12
+    fi
13
+fi
14
+
15
+AC_DEFINE_UNQUOTED([DATADIR],"$db_dir", [Path to virus database directory.])
16
+DBDIR="$db_dir"
17
+AC_SUBST([DBDIR])
0 18
new file mode 100644
... ...
@@ -0,0 +1,6 @@
0
+if test "$enable_debug" = "yes"; then
1
+  VERSION_SUFFIX="$VERSION_SUFFIX-debug"
2
+  AC_DEFINE([CL_DEBUG],1,[enable debugging])
3
+else
4
+  AC_DEFINE([NDEBUG],1,[disable assertions])
5
+fi
0 6
new file mode 100644
... ...
@@ -0,0 +1,22 @@
0
+AC_ARG_ENABLE([distcheck-werror],
1
+	      AC_HELP_STRING([--enable-distcheck-werror],
2
+			     [enable warnings as error for distcheck
3
+			      @<:@default=no@:>@]),
4
+[enable_distcheckwerror=$enableval],[enable_distcheckwerror="no"])
5
+
6
+# Enable distcheck warnings and Werror only for gcc versions that support them,
7
+# and only after we've run the configure tests.
8
+# Some configure tests fail (like checking for cos in -lm) if we enable these
9
+# Werror flags for configure too (for example -Wstrict-prototypes makes
10
+# configure think that -lm doesn't have cos, hence its in libc).
11
+WERR_CFLAGS=
12
+WERR_CFLAGS_MILTER=
13
+if test "x$enable_distcheckwerror" = "xyes"; then
14
+    if test "$distcheck_enable_flags" = "1"; then
15
+	WERR_COMMON="-Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=strict-aliasing -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
16
+	WERR_CFLAGS="$WERR_COMMON -Wwrite-strings"
17
+	WERR_CFLAGS_MILTER="$WERR_COMMON -Wno-error=format-nonliteral"
18
+    fi
19
+fi
20
+AC_SUBST([WERR_CFLAGS])
21
+AC_SUBST([WERR_CFLAGS_MILTER])
0 22
new file mode 100644
... ...
@@ -0,0 +1,7 @@
0
+AC_ARG_ENABLE([dns-fix],
1
+[  --enable-dns-fix	  enable workaround for broken DNS servers (as in SpeedTouch 510)],
2
+enable_dnsfix=$enableval, enable_dnsfix="no")
3
+
4
+if test "$enable_dnsfix" = "yes"; then
5
+  AC_DEFINE([FRESHCLAM_DNS_FIX],1,[enable workaround for broken DNS servers])
6
+fi
0 7
new file mode 100644
... ...
@@ -0,0 +1,10 @@
0
+AC_INCLUDES_DEFAULT
1
+
2
+AC_CHECK_HEADERS([stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h sys/times.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h])
3
+AC_CHECK_HEADER([syslog.h],AC_DEFINE([USE_SYSLOG],1,[use syslog]),)
4
+
5
+have_pthreads=no
6
+AC_CHECK_HEADER([pthread.h],[have_pthreads=yes])
7
+if test "$have_pthreads" = "yes"; then
8
+    AC_DEFINE([HAVE_PTHREAD_H],1,[Define to 1 if you have the <pthread.h> header file])
9
+fi
0 10
new file mode 100644
... ...
@@ -0,0 +1,82 @@
0
+
1
+AC_ARG_ENABLE([bzip2],
2
+[  --disable-bzip2	  disable bzip2 support],
3
+want_bzip2=$enableval, want_bzip2="yes")
4
+
5
+bzip_check="ok"
6
+if test "$want_bzip2" = "yes"
7
+then
8
+    AC_LIB_LINKFLAGS([bz2])
9
+    save_LDFLAGS="$LDFLAGS"
10
+    # Only add -L if prefix is not empty
11
+    test -z "$LIBBZ2_PREFIX" || LDFLAGS="$LDFLAGS -L$LIBBZ2_PREFIX/$acl_libdirstem";
12
+
13
+    have_bzprefix="no"
14
+    AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], [have_bzprefix="yes"])
15
+    if test "x$have_bzprefix" = "xno"; then
16
+        AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])
17
+    fi
18
+    LDFLAGS="$save_LDFLAGS"
19
+    if test "$HAVE_LIBBZ2" = "yes"; then
20
+	AC_CHECK_HEADER([bzlib.h],
21
+			[AC_C_CVE_2008_1372],
22
+			[ac_cv_c_cve_2008_1372="no"])
23
+	if test "$ac_cv_c_cve_2008_1372" = "bugged"; then
24
+		AC_MSG_WARN([****** bzip2 libraries are affected by the CVE-2008-1372 bug])
25
+		AC_MSG_WARN([****** We strongly suggest you to update to bzip2 1.0.5.])
26
+		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])
27
+		bzip_check="bugged (CVE-2008-1372)"
28
+	fi
29
+	if test "$ac_cv_c_cve_2008_1372" = "linkfailed"; then
30
+		dnl This shouldn't happen
31
+		dnl We failed to link but libtool may still be able to link, so don't disable bzip2 just yet
32
+		AC_MSG_WARN([****** Unable to link bzip2 testcase])
33
+		AC_MSG_WARN([****** You may be affected by CVE-2008-1372 bug, but I need to be able to link a testcase to verify])
34
+		AC_MSG_WARN([****** It is recommended to fix your build environment so that we can run the testcase!])
35
+		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])
36
+		bzip_check="link failed (CVE-2008-1372)"
37
+	fi
38
+
39
+	case "$ac_cv_c_cve_2008_1372" in
40
+	ok|bugged|linkfailed)
41
+		;;
42
+	*)
43
+		HAVE_LIBBZ2=no
44
+		;;
45
+	esac
46
+    fi
47
+
48
+    if test "$HAVE_LIBBZ2" = "yes"; then
49
+	AC_C_CVE_2010_0405
50
+	if test "$ac_cv_c_cve_2010_0405" = "bugged"; then
51
+		AC_MSG_WARN([****** bzip2 libraries are affected by the CVE-2010-0405 bug])
52
+		AC_MSG_WARN([****** We strongly suggest you to update bzip2])
53
+		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])
54
+		bzip_check="bugged (CVE-2010-0405)"
55
+	fi
56
+	if test "$ac_cv_c_cve_2010_0405" = "linkfailed"; then
57
+		dnl This shouldn't happen
58
+		dnl We failed to link but libtool may still be able to link, so don't disable bzip2 just yet
59
+		AC_MSG_WARN([****** Unable to link bzip2 testcase])
60
+		AC_MSG_WARN([****** You may be affected by CVE-2010-0405 bug, but I need to be able to link a testcase to verify])
61
+		AC_MSG_WARN([****** It is recommended to fix your build environment so that we can run the testcase!])
62
+		AC_MSG_WARN([****** Please do not report stability problems to the ClamAV developers!])
63
+		bzip_check="link failed (CVE-2010-0405)"
64
+	fi
65
+
66
+	case "$ac_cv_c_cve_2010_0405" in
67
+	ok|bugged|linkfailed)
68
+		LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2"
69
+		AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2])
70
+		;;
71
+	*)
72
+		AC_MSG_WARN([****** bzip2 support disabled])
73
+		;;
74
+	esac
75
+
76
+    else
77
+	AC_MSG_WARN([****** bzip2 support disabled])
78
+    fi
79
+fi
80
+
81
+AM_CONDITIONAL([HAVE_LIBBZ2], test "x$HAVE_LIBBZ2" = "xyes")
0 82
new file mode 100644
... ...
@@ -0,0 +1,40 @@
0
+have_curl="no"
1
+curl_msg="Please use the web interface for submitting FPs/FNs."
2
+AC_MSG_CHECKING([for libcurl installation])
3
+
4
+AC_ARG_WITH([libcurl],
5
+[  --with-libcurl=DIR   path to directory containing libcurl (default=
6
+    /usr/local or /usr if not found in /usr/local)],
7
+[
8
+if test "$withval"; then
9
+    LIBCURL_HOME="$withval"
10
+fi
11
+], [
12
+LIBCURL_HOME=/usr/local
13
+if test ! -f "$LIBCURL_HOME/include/curl/curl.h"
14
+then
15
+    LIBCURL_HOME=/usr
16
+fi
17
+AC_MSG_RESULT([$LIBCURL_HOME])
18
+])
19
+
20
+if test ! -f "$LIBCURL_HOME/include/curl/curl.h"
21
+then
22
+    AC_MSG_WARN([libcurl not found. Please use the web interface for submitting FPs/FNs.])
23
+else
24
+    if test -f "$LIBCURL_HOME/bin/curl-config"; then
25
+        CURL_LDFLAGS=$($LIBCURL_HOME/bin/curl-config --libs)
26
+        CURL_CPPFLAGS=$($LIBCURL_HOME/bin/curl-config --cflags)
27
+    else
28
+        CURL_LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
29
+        CURL_CPPFLAGS="-I$LIBCURL_HOME/include"
30
+    fi
31
+
32
+    save_LDFLAGS="$LDFLAGS"
33
+    LDFLAGS="-L$LIBCURL_HOME/lib -lcurl"
34
+    AC_CHECK_LIB([curl], [curl_easy_init], [curl_msg="";have_curl="yes";CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS";CLAMSUBMIT_CFLAGS="$CLAMSUBMIT_CFLAGS $CURL_CPPFLAGS"],
35
+            [AC_MSG_WARN([Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs.])])
36
+fi
37
+
38
+AC_SUBST([CLAMSUBMIT_LIBS])
39
+AC_SUBST([CLAMSUBMIT_CFLAGS])
0 40
new file mode 100644
... ...
@@ -0,0 +1,51 @@
0
+dnl Check for libconfig
1
+AC_MSG_CHECKING([for libconfig installation])
2
+
3
+AC_ARG_WITH([libconfig],
4
+[  --with-libconfig=DIR   path to directory containing libconfig (default=
5
+    /usr/local or /usr if not found in /usr/local)],
6
+[
7
+if test "$withval"; then
8
+    LIBCONFIG_HOME="$withval"
9
+fi
10
+], [
11
+LIBCONFIG_HOME=/usr/local
12
+if test ! -f "$LIBCONFIG_HOME/include/libconfig.h"
13
+then
14
+    LIBCONFIG_HOME=/usr
15
+fi
16
+AC_MSG_RESULT([$LIBCONFIG_HOME])
17
+])
18
+
19
+if test ! -f "$LIBCONFIG_HOME/include/libconfig.h"
20
+then
21
+    AC_MSG_ERROR([libconfig not found.])
22
+fi
23
+
24
+save_LDFLAGS="$LDFLAGS"
25
+LDFLAGS="-L$LIBCONFIG_HOME/lib -lconfig"
26
+AC_CHECK_LIB([config], [config_init], [FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$LIBCONFIG_HOME/lib -lconfig"],
27
+        [AC_MSG_ERROR([Your libconfig installation is misconfigured])])
28
+
29
+CLAMSCAN_LIBS="$CLAMSCAN_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
30
+CLAMDSCAN_LIBS="$CLAMDSCAN_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
31
+CLAMD_LIBS="$CLAMD_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
32
+CLAMMEM_LIBS="$CLAMMEM_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
33
+CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
34
+LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
35
+CLAMDTOP_LIBS="$CLAMDTOP_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
36
+CLAMBC_LIBS="$CLAMBC_LIBS -L$LIBCONFIG_HOME/lib -lconfig"
37
+
38
+CLAMSCAN_CPPFLAGS="$FRESHCLAM_CPPFLAGS -I$LIBCONFIG_HOME/include"
39
+CLAMDSCAN_CPPFLAGS="$CLAMDSCAN_CPPFLAGS -I$LIBCONFIG_HOME/include"
40
+CLAMD_CPPFLAGS="$CLAMD_CPPFLAGS -I$LIBCONFIG_HOME/include"
41
+CLAMMEM_CPPFLAGS="$CLAMMEM_CPPFLAGS -I$LIBCONFIG_HOME/include"
42
+CLAMAV_MILTER_CPPFLAGS="$CLAMAV_MILTER_CPPFLAGS -I$LIBCONFIG_HOME/include"
43
+LIBCLAMAV_CPPFLAGS="$LIBCLAMAV_CPPFLAGS -I$LIBCONFIG_HOME/include"
44
+LIBCLAMSHARED_CPPFLAGS="$LIBCLAMSHARED_CPPFLAGS -I$LIBCONFIG_HOME/include"
45
+SIGTOOL_CPPFLAGS="$SIGTOOL_CPPFLAGS -I$LIBCONFIG_HOME/include"
46
+CLAMCONF_CPPFLAGS="$CLAMCONF_CPPFLAGS -I$LIBCONFIG_HOME/include"
47
+CLAMDTOP_CPPFLAGS="$CLAMDTOP_CPPFLAGS -I$LIBCONFIG_HOME/include"
48
+CLAMBC_CPPFLAGS="$CLAMBC_CPPFLAGS -I$LIBCONFIG_HOME/include"
49
+
50
+LDFLAGS="$save_ldflags"
0 51
new file mode 100644
... ...
@@ -0,0 +1,60 @@
0
+
1
+dnl Check for zlib
2
+AC_MSG_CHECKING([for zlib installation])
3
+AC_ARG_WITH([zlib],
4
+[  --with-zlib=DIR	  path to directory containing zlib library (default=
5
+			  /usr/local or /usr if not found in /usr/local)],
6
+[
7
+if test "$withval"; then
8
+  ZLIB_HOME="$withval"
9
+  AC_MSG_RESULT([using $ZLIB_HOME])
10
+fi
11
+], [
12
+ZLIB_HOME=/usr/local
13
+if test ! -f "$ZLIB_HOME/include/zlib.h"
14
+then
15
+  ZLIB_HOME=/usr
16
+fi
17
+AC_MSG_RESULT([$ZLIB_HOME])
18
+])
19
+
20
+CLAMDSCAN_LIBS="$FRESHCLAM_LIBS"
21
+
22
+AC_ARG_ENABLE([zlib-vcheck],
23
+[  --disable-zlib-vcheck	  do not check for buggy zlib version ],
24
+zlib_check=$enableval, zlib_check="yes")
25
+
26
+if test ! -f "$ZLIB_HOME/include/zlib.h"
27
+then
28
+    AC_MSG_ERROR([Please install zlib and zlib-devel packages])
29
+else
30
+
31
+    vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
32
+    if test -z "$vuln"; then
33
+	vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
34
+    fi
35
+
36
+    if test -n "$vuln"; then
37
+	if test "$zlib_check" = "yes"; then
38
+	    AC_MSG_ERROR(The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!)
39
+	else
40
+	    AC_MSG_WARN([****** This ClamAV installation may be linked against])
41
+	    AC_MSG_WARN([****** a broken zlib version. Please DO NOT report any])
42
+	    AC_MSG_WARN([****** stability problems to the ClamAV developers!])
43
+	fi
44
+    fi
45
+
46
+    save_LIBS="$LIBS"
47
+    if test "$ZLIB_HOME" != "/usr"; then
48
+	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
49
+	save_LDFLAGS="$LDFLAGS"
50
+    LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
51
+    AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
52
+	AC_CHECK_LIB([z], [gzopen], [], AC_MSG_ERROR([Your zlib is missing gzopen()]))
53
+	LDFLAGS="$save_LDFLAGS"
54
+    else
55
+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
56
+	AC_CHECK_LIB([z], [gzopen],[], AC_MSG_ERROR([Your zlib is missing gzopen()]))
57
+    fi
58
+    LIBS="$save_LIBS"
59
+fi
0 60
new file mode 100644
... ...
@@ -0,0 +1,37 @@
0
+dnl Check for OpenSSL
1
+AC_MSG_CHECKING([for OpenSSL installation])
2
+
3
+AC_ARG_WITH([openssl],
4
+[  --with-openssl=DIR   path to directory containing openssl (default=
5
+    /usr/local or /usr if not found in /usr/local)],
6
+[
7
+if test "$withval"; then
8
+    LIBSSL_HOME="$withval"
9
+fi
10
+], [
11
+LIBSSL_HOME=/usr/local
12
+if test ! -f "$LIBSSL_HOME/include/openssl/ssl.h"
13
+then
14
+    LIBSSL_HOME=/usr
15
+fi
16
+AC_MSG_RESULT([$LIBSSL_HOME])
17
+])
18
+
19
+if test ! -f "$LIBSSL_HOME/include/openssl/ssl.h"
20
+then
21
+    AC_MSG_ERROR([OpenSSL not found.])
22
+fi
23
+
24
+SSL_LDFLAGS="-L$LIBSSL_HOME/lib -lssl"
25
+SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
26
+
27
+save_LDFLAGS="$LDFLAGS"
28
+LDFLAGS="-L$LIBSSL_HOME/lib -lssl"
29
+AC_CHECK_LIB([ssl], [SSL_library_init], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $SSL_LDFLAGS"],
30
+        [AC_MSG_ERROR([Your OpenSSL is misconfigured])])
31
+
32
+LDFLAGS="-L$LIBSSL_HOME/lib -lcrypto"
33
+AC_CHECK_LIB([crypto], [EVP_EncryptInit], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lcrypto"],
34
+        [AC_MSG_ERROR([Your OpenSSL installation is misconfigured])])
35
+
36
+LDFLAGS="$save_LDFLAGS"
0 37
new file mode 100644
... ...
@@ -0,0 +1,39 @@
0
+AC_ARG_ENABLE([unrar],
1
+[  --disable-unrar	  don't build libclamunrar and libclamunrar_iface ],
2
+want_unrar=$enableval, want_unrar="yes")
3
+AM_CONDITIONAL([ENABLE_UNRAR],[test "$want_unrar" = "yes"])
4
+
5
+AC_ARG_ENABLE([getaddrinfo],
6
+[  --disable-getaddrinfo          disable support for getaddrinfo],
7
+want_getaddrinfo=$enableval, want_getaddrinfo="yes")
8
+
9
+if test "$want_getaddrinfo" = "yes"
10
+then
11
+    AC_MSG_CHECKING([for getaddrinfo])
12
+    AC_CACHE_VAL([have_cv_gai],[
13
+		AC_TRY_RUN([
14
+		    #include <sys/types.h>
15
+		    #include <sys/socket.h>
16
+		    #include <netdb.h>
17
+		    #include <unistd.h>
18
+		    int main(int argc, char **argv)
19
+		    {
20
+			    struct addrinfo *res;
21
+			    int sd;
22
+
23
+			if(getaddrinfo("127.0.0.1", NULL, NULL, &res) < 0)
24
+			    return 1;
25
+			freeaddrinfo(res);
26
+
27
+			return 0;
28
+		    }
29
+		],
30
+		[have_cv_gai=yes],
31
+		[have_cv_gai=no],
32
+		[have_cv_gai=no])
33
+		])
34
+    AC_MSG_RESULT([$have_cv_gai])
35
+    if test "$have_cv_gai" = yes; then
36
+	AC_DEFINE(HAVE_GETADDRINFO, 1, [have getaddrinfo()])
37
+    fi
38
+fi
0 39
new file mode 100644
... ...
@@ -0,0 +1,95 @@
0
+
1
+want_xml="auto"
2
+AC_ARG_ENABLE([xml],
3
+[  --disable-xml	  disable DMG and XAR support],
4
+want_xml=$enableval, want_xml="auto")
5
+
6
+XML_HOME=""
7
+if test "X$want_xml" != "Xno"; then
8
+  AC_MSG_CHECKING([for libxml2 installation])
9
+  AC_ARG_WITH([xml],
10
+  [  --with-xml=DIR	  path to directory containing libxml2 library (default=
11
+			  /usr/local or /usr if not found in /usr/local)],
12
+  [
13
+  if test "$withval"
14
+  then
15
+    XML_HOME="$withval"
16
+    AC_MSG_RESULT([using $XML_HOME])
17
+  else
18
+    AC_MSG_ERROR([cannot assign blank value to --with-xml])
19
+  fi
20
+  ], [
21
+  XML_HOME=/usr/local
22
+  if test ! -x "$XML_HOME/bin/xml2-config"
23
+  then
24
+    XML_HOME=/usr
25
+    if test ! -x "$XML_HOME/bin/xml2-config"
26
+    then
27
+      XML_HOME=""
28
+    fi
29
+  fi
30
+  if test "x$XML_HOME" != "x"; then
31
+    AC_MSG_RESULT([$XML_HOME])
32
+  else
33
+    AC_MSG_RESULT([not found])
34
+  fi
35
+  ])
36
+fi
37
+
38
+found_xml="no"
39
+XMLCONF_VERSION=""
40
+XML_CPPFLAGS=""
41
+XML_LIBS=""
42
+if test "x$XML_HOME" != "x"; then
43
+  AC_MSG_CHECKING([xml2-config version])
44
+  XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
45
+  if test "x%XMLCONF_VERSION" != "x"; then
46
+    AC_MSG_RESULT([$XMLCONF_VERSION])
47
+    found_xml="yes"
48
+    XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
49
+    XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
50
+  else
51
+    AC_MSG_ERROR([xml2-config failed])
52
+  fi
53
+fi
54
+
55
+working_xml="no"
56
+if test "X$found_xml" != "Xno"; then
57
+  AC_MSG_CHECKING([for xmlreader.h in $XML_HOME])
58
+
59
+  if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
60
+    AC_MSG_RESULT([not found])
61
+  else
62
+    AC_MSG_RESULT([found])
63
+    save_LIBS="$LIBS"
64
+    save_CPPFLAGS="$CPPFLAGS"
65
+    CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
66
+    save_LDFLAGS="$LDFLAGS"
67
+    LDFLAGS="$LDFLAGS $XML_LIBS"
68
+
69
+    AC_CHECK_LIB([xml2], [xmlTextReaderRead], [working_xml="yes"], [working_xml="no"])
70
+
71
+    CPPFLAGS="$save_CPPFLAGS"
72
+    LDFLAGS="$save_LDFLAGS"
73
+    LIBS="$save_LIBS"
74
+  fi
75
+fi
76
+
77
+if test "$working_xml" = "yes"; then
78
+  AC_DEFINE([HAVE_LIBXML2],1,[Define to 1 if you have the 'libxml2' library (-lxml2).])
79
+  AC_SUBST(XML_CPPFLAGS)
80
+  AC_SUBST(XML_LIBS)
81
+  AC_MSG_NOTICE([Compiling and linking with libxml2 from $XML_HOME])
82
+else
83
+  if test "$want_xml" = "yes"; then
84
+     AC_MSG_ERROR([****** Please install libxml2 packages!])
85
+  else
86
+    if test "$want_xml" != "no"; then
87
+      AC_MSG_NOTICE([****** libxml2 support unavailable])
88
+    fi
89
+  fi
90
+  XML_CPPFLAGS=""
91
+  XML_LIBS=""
92
+  AC_SUBST(XML_CPPFLAGS)
93
+  AC_SUBST(XML_LIBS)
94
+fi
0 95
new file mode 100644
... ...
@@ -0,0 +1,47 @@
0
+dnl Linker feature checks
1
+dnl check for version script support in the linker (GNU ld, or Solaris ld style)
2
+AC_CACHE_CHECK([for ld --version-script], [ac_cv_ld_version_script], [dnl
3
+  cat > conftest.c <<EOF
4
+void cl_symbol1(void) {}
5
+void cli_symbol2(void) {}
6
+EOF
7
+  cat > conftest.map <<EOF
8
+RELEASE
9
+{
10
+	global:
11
+		cl_*;
12
+	local:
13
+		*;
14
+};
15
+PRIVATE
16
+{
17
+	global:
18
+		cli_*;
19
+	local:
20
+		*;
21
+};
22
+EOF
23
+  dnl check for GNU ld style linker version script
24
+  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
25
+				-o conftest.so conftest.c
26
+				-Wl,--version-script,conftest.map
27
+		       1>&AS_MESSAGE_LOG_FD]);
28
+  then
29
+      VERSIONSCRIPTFLAG=--version-script
30
+      ac_cv_ld_version_script=yes
31
+  else
32
+	dnl check for Solaris ld style linker version script
33
+	if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
34
+				-o conftest.so conftest.c
35
+				-Wl,-M,conftest.map
36
+			1>&AS_MESSAGE_LOG_FD]);
37
+	then
38
+		VERSIONSCRIPTFLAG=-M
39
+		ac_cv_ld_version_script=yes;
40
+	else
41
+		ac_cv_ld_version_script=no
42
+	fi
43
+  fi
44
+ rm -f conftest*])
45
+AC_SUBST([VERSIONSCRIPTFLAG])
46
+AM_CONDITIONAL([VERSIONSCRIPT], test "x$ac_cv_ld_version_script" = "xyes")
0 47
new file mode 100644
... ...
@@ -0,0 +1,8 @@
0
+AC_ARG_ENABLE([llvm],AC_HELP_STRING([--enable-llvm],
1
+				    [Enable 'llvm' JIT/verifier support @<:@default=auto@:>@]),
2
+				    [enable_llvm=$enableval], [enable_llvm="auto"])
3
+
4
+if test "$enable_llvm" != "no"; then
5
+    dnl Try to configure subdir, optionally
6
+    AC_CONFIG_SUBDIRS_OPTIONAL([libclamav/c++])
7
+fi
0 8
new file mode 100644
... ...
@@ -0,0 +1,29 @@
0
+dnl --enable-milter
1
+if test "$have_milter" = "yes"; then
2
+    dnl libmilter checking code adapted from spamass-milter by
3
+    dnl Tom G. Christensen <tgc@statsbiblioteket.dk>
4
+
5
+    dnl Check for libmilter and it's header files in the usual locations
6
+    save_LIBS="$LIBS"
7
+    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
8
+    if test -d /usr/lib/libmilter ; then
9
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
10
+    fi
11
+    LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
12
+    AC_CHECK_LIB([milter],[mi_stop],[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"],[
13
+	dnl Older sendmails require libsm or libsmutil for support functions
14
+	AC_SEARCH_LIBS([strlcpy], [sm smutil], [test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"])
15
+	LIBS="$save_LIBS $CLAMAV_MILTER_LIBS $CLAMAV_MILTER_XLIB"
16
+	$as_unset ac_cv_lib_milter_mi_stop
17
+	AC_CHECK_LIB([milter],[mi_stop],[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"],[
18
+	    AC_MSG_ERROR([Cannot find libmilter])
19
+	])
20
+    ])
21
+    LIBS="$save_LIBS"
22
+    AC_CHECK_HEADERS([libmilter/mfapi.h],[have_milter="yes"],[
23
+	AC_MSG_ERROR([Please install mfapi.h from the sendmail distribution])
24
+    ])
25
+fi
26
+
27
+AM_CONDITIONAL([BUILD_CLAMD],[test "$have_pthreads" = "yes"])
28
+AM_CONDITIONAL([HAVE_MILTER],[test "$have_milter" = "yes"])
0 29
new file mode 100644
... ...
@@ -0,0 +1,3 @@
0
+AC_ARG_ENABLE([milter],
1
+[  --enable-milter	  build clamav-milter],
2
+have_milter=$enableval, have_milter="no")
0 3
new file mode 100644
... ...
@@ -0,0 +1,8 @@
0
+AC_ARG_ENABLE([no-cache],
1
+[  --enable-no-cache	  use "Cache-Control: no-cache" in freshclam],
2
+enable_nocache=$enableval, enable_nocache="no")
3
+
4
+if test "$enable_nocache" = "yes"; then
5
+  AC_DEFINE([FRESHCLAM_NO_CACHE],1,[use "Cache-Control: no-cache" in freshclam])
6
+fi
7
+
0 8
new file mode 100644
... ...
@@ -0,0 +1,168 @@
0
+case "$target_os" in
1
+linux*)
2
+    AC_DEFINE([C_LINUX],1,[target is linux])
3
+    if test "$have_pthreads" = "yes"; then
4
+	THREAD_LIBS="-lpthread"
5
+	TH_SAFE="-thread-safe"
6
+	if test "$want_fanotify" = "yes"; then
7
+	    AC_CHECK_HEADER([linux/fanotify.h],AC_DEFINE([FANOTIFY],1,[use fanotify]),)
8
+	fi
9
+    fi
10
+    ;;
11
+kfreebsd*-gnu)
12
+    AC_DEFINE([C_KFREEBSD_GNU],1,[target is kfreebsd-gnu])
13
+    if test "$have_pthreads" = "yes"; then
14
+       THREAD_LIBS="-lpthread"
15
+       TH_SAFE="-thread-safe"
16
+    fi
17
+    ;;
18
+solaris*)
19
+    CLAMDSCAN_LIBS="$CLAMDSCAN_LIBS -lresolv"
20
+    FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
21
+    if test "$have_pthreads" = "yes"; then
22
+	THREAD_LIBS="-lpthread"
23
+	CLAMD_LIBS="$CLAMD_LIBS -lresolv"
24
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
25
+	TH_SAFE="-thread-safe"
26
+    fi
27
+    AC_DEFINE([C_SOLARIS],1,[os is solaris])
28
+    ;;
29
+freebsd[[45]]*)
30
+    if test "$have_pthreads" = "yes"; then
31
+	THREAD_LIBS="-pthread -lc_r"
32
+	TH_SAFE="-thread-safe"
33
+    fi
34
+    AC_DEFINE([C_BSD],1,[os is freebsd 4 or 5])
35
+    ;;
36
+freebsd*)
37
+    if test "$have_pthreads" = "yes"; then
38
+	THREAD_LIBS="-lthr"
39
+	TH_SAFE="-thread-safe"
40
+    fi
41
+    AC_DEFINE([C_BSD],1,[os is freebsd 6])
42
+    ;;
43
+dragonfly*)
44
+    if test "$have_pthreads" = "yes"; then
45
+	THREAD_LIBS="-pthread"
46
+	TH_SAFE="-thread-safe"
47
+    fi
48
+    AC_DEFINE([C_BSD],1,[os is dragonfly])
49
+    ;;
50
+openbsd*)
51
+    if test "$have_pthreads" = "yes"; then
52
+	THREAD_LIBS="-pthread"
53
+	CLAMD_LIBS="$CLAMD_LIBS -pthread"
54
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
55
+	TH_SAFE="-thread-safe"
56
+    fi
57
+    AC_DEFINE([C_BSD],1,[os is OpenBSD])
58
+    ;;
59
+bsdi*)
60
+    if test "$have_pthreads" = "yes"; then
61
+	THREAD_LIBS="-pthread"
62
+	TH_SAFE="-thread-safe"
63
+    fi
64
+    AC_DEFINE([C_BSD],1,[os is BSDI BSD/OS])
65
+    ;;
66
+netbsd*)
67
+     if test "$have_pthreads" = "yes"; then
68
+	THREAD_LIBS="-lpthread"
69
+     fi
70
+    AC_DEFINE([C_BSD],1,[os is NetBSD])
71
+    ;;
72
+bsd*)
73
+    AC_MSG_RESULT([Unknown BSD detected. Disabling thread support.])
74
+    have_pthreads="no"
75
+    AC_DEFINE([C_BSD],1,[os is bsd flavor])
76
+    ;;
77
+beos*)
78
+    AC_MSG_RESULT([BeOS detected. Disabling thread support.])
79
+    have_pthreads="no"
80
+    AC_DEFINE([C_BEOS],1,[os is beos])
81
+    ;;
82
+x86:Interix*)
83
+    AC_DEFINE([C_INTERIX],1,[os is Interix])
84
+    ;;
85
+darwin*)
86
+    AC_DEFINE([C_BSD],1,[os is bsd flavor])
87
+    AC_DEFINE([C_DARWIN],1,[os is darwin])
88
+    AC_DEFINE([BIND_8_COMPAT],1,[enable bind8 compatibility])
89
+    AC_DEFINE([CLAMAUTH],1,[use ClamAuth])
90
+    use_netinfo="yes"
91
+    ;;
92
+os2*)
93
+    CLAMDSCAN_LIBS="$CLAMDSCAN_LIBS -lsyslog"
94
+    FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsyslog"
95
+    CLAMD_LIBS="$CLAMD_LIBS -lsyslog"
96
+    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsyslog"
97
+    if test "$have_pthreads" = "yes"; then
98
+	THREAD_LIBS="-lpthread"
99
+	TH_SAFE="-thread-safe"
100
+    fi
101
+    AC_DEFINE([C_OS2],1,[os is OS/2])
102
+    ;;
103
+sco*)
104
+    dnl njh@bandsman.sco.uk: SCO Unix port
105
+    dnl FRESHCLAM_LIBS="-lsocket"
106
+    dnl CLAMD_LIBS="-lsocket"
107
+    dnl CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"
108
+    ;;
109
+hpux*)
110
+    if test "$have_pthreads" = "yes"; then
111
+	THREAD_LIBS="-lpthread"
112
+	TH_SAFE="-thread-safe"
113
+    fi
114
+    AC_DEFINE([C_HPUX],1,[os is hpux])
115
+    if test "$have_mempool" = "yes"; then
116
+	LDFLAGS="$LDFLAGS -Wl,+pd,1M"
117
+    fi
118
+    ;;
119
+aix*)
120
+    if test "$have_pthreads" = "yes"; then
121
+	THREAD_LIBS="-lpthread"
122
+	TH_SAFE="-thread-safe"
123
+	AC_DEFINE([_THREAD_SAFE],1,[thread safe])
124
+    fi
125
+    AC_DEFINE([C_AIX],1,[os is aix])
126
+    ;;
127
+*-*-osf*)
128
+    if test "$have_pthreads" = "yes"; then
129
+	THREAD_LIBS="-pthread"
130
+	TH_SAFE="-thread-safe"
131
+	AC_DEFINE([_POSIX_PII_SOCKET],1,[POSIX compatibility])
132
+    fi
133
+    AC_DEFINE([C_OSF],1,[os is osf/tru64])
134
+    ;;
135
+nto-qnx*)
136
+    AC_DEFINE([C_QNX6],1,[os is QNX 6.x.x])
137
+    ;;
138
+irix*)
139
+    if test "$have_pthreads" = "yes"; then
140
+	THREAD_LIBS="-lpthread"
141
+	TH_SAFE="-thread-safe"
142
+    fi
143
+    LIBS="$LIBS -lgen"
144
+    AC_DEFINE([C_IRIX],1,[os is irix])
145
+    ;;
146
+interix*)
147
+    AC_DEFINE([C_INTERIX],1,[os is interix])
148
+    if test "$test_clamav" = "yes"; then
149
+	if test ! -r /etc/passwd; then
150
+	   test_clamav="no"
151
+	fi
152
+    fi
153
+    if test "$have_pthreads" = "yes"; then
154
+	THREAD_LIBS="-lpthread"
155
+	TH_SAFE="-thread-safe"
156
+    fi
157
+    ;;
158
+gnu*)
159
+    AC_DEFINE([C_GNU_HURD],1,[target is gnu-hurd])
160
+    if test "$have_pthreads" = "yes"; then
161
+       THREAD_LIBS="-lpthread"
162
+       TH_SAFE="-thread-safe"
163
+    fi
164
+    ;;
165
+*)
166
+    ;;
167
+esac
0 168
new file mode 100644
... ...
@@ -0,0 +1,4 @@
0
+AC_ARG_ENABLE([sha-collector-for-internal-use], [], [enable_sha_collector="yes"], [enable_sha_collector="no"])
1
+if test "$enable_sha_collector" != "no"; then
2
+    AC_DEFINE([HAVE__INTERNAL__SHA_COLLECT], 1, [For internal use only - DO NOT DEFINE])
3
+fi
0 4
new file mode 100644
... ...
@@ -0,0 +1,24 @@
0
+AC_SUBST([FRESHCLAM_CPPFLAGS])
1
+AC_SUBST([CLAMSCAN_CPPFLAGS])
2
+AC_SUBST([CLAMDSCAN_CPPFLAGS])
3
+AC_SUBST([CLAMD_CPPFLAGS])
4
+AC_SUBST([CLAMMEM_CPPFLAGS])
5
+AC_SUBST([CLAMAV_MILTER_CPPFLAGS])
6
+AC_SUBST([LIBCLAMAV_CPPFLAGS])
7
+AC_SUBST([SIGTOOL_CPPFLAGS])
8
+AC_SUBST([CLAMCONF_CPPFLAGS])
9
+AC_SUBST([CLAMDTOP_CPPFLAGS])
10
+AC_SUBST([CLAMBC_CPPFLAGS])
11
+AC_SUBST([LIBCLAMSHARED_CPPFLAGS])
12
+
13
+AC_SUBST([LIBCLAMAV_LIBS])
14
+AC_SUBST([CLAMD_LIBS])
15
+AC_SUBST([CLAMMEM_LIBS])
16
+AC_SUBST([CLAMAV_MILTER_LIBS])
17
+AC_SUBST([FRESHCLAM_LIBS])
18
+AC_SUBST([CLAMSCAN_LIBS])
19
+AC_SUBST([CLAMDSCAN_LIBS])
20
+AC_SUBST([TH_SAFE])
21
+AC_SUBST([THREAD_LIBS])
22
+AC_SUBST([CLAMDTOP_LIBS])
23
+AC_SUBST([CLAMBC_LIBS])
0 24
new file mode 100644
... ...
@@ -0,0 +1,14 @@
0
+AC_ARG_ENABLE([yp-check],
1
+[  --enable-yp-check	  use ypmatch utility instead of /etc/passwd parsing],
2
+use_yp=$enableval, use_yp="no")
3
+
4
+AC_ARG_WITH([user], 
5
+[  --with-user=uid	  name of the clamav user (default=clamav)],
6
+clamav_user="$withval", clamav_user="clamav")
7
+
8
+AC_ARG_WITH([group], 
9
+[  --with-group=gid	  name of the clamav group (default=clamav)],
10
+clamav_group="$withval", clamav_group="clamav")
11
+
12
+AC_DEFINE_UNQUOTED([CLAMAVUSER],"$clamav_user",[name of the clamav user])
13
+AC_DEFINE_UNQUOTED([CLAMAVGROUP],"$clamav_group",[name of the clamav group])
0 14
new file mode 100644
... ...
@@ -0,0 +1,3 @@
0
+AC_ARG_ENABLE([id-check],
1
+[  --enable-id-check	  use id utility instead of /etc/passwd parsing],
2
+use_id=$enableval, use_id="no")
0 3
new file mode 100644
... ...
@@ -0,0 +1,3 @@
0
+AC_ARG_ENABLE([yp-check],
1
+[  --enable-yp-check	  use ypmatch utility instead of /etc/passwd parsing],
2
+use_yp=$enableval, use_yp="no")
0 3
new file mode 100644
... ...
@@ -0,0 +1,17 @@
0
+dnl change this on a release
1
+VERSION="devel-`date +%Y%m%d`"
2
+dnl VERSION="1.0rc1"
3
+
4
+LC_CURRENT=7
5
+LC_REVISION=11
6
+LC_AGE=1
7
+LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
8
+AC_SUBST([LIBCLAMAV_VERSION])
9
+
10
+AC_DEFINE_UNQUOTED([LIBCLAMAV_FULLVER], "$major.$LC_AGE.$LC_REVISION",
11
+        ["Full library version number"])
12
+
13
+AC_DEFINE_UNQUOTED([LIBCLAMAV_MAJORVER], $major, ["Major library version number"])
14
+
15
+AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
16
+AC_DEFINE_UNQUOTED([VERSION_SUFFIX],"$VERSION_SUFFIX",[Version suffix for package])
... ...
@@ -1,9 +1,9 @@
1
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
6
-# Inc.
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
7 7
 # This Makefile.in is free software; the Free Software Foundation
8 8
 # gives unlimited permission to copy and/or distribute it,
9 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -16,6 +16,23 @@
16 16
 @SET_MAKE@
17 17
 
18 18
 VPATH = @srcdir@
19
+am__make_dryrun = \
20
+  { \
21
+    am__dry=no; \
22
+    case $$MAKEFLAGS in \
23
+      *\\[\ \	]*) \
24
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
25
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26
+      *) \
27
+        for am__flg in $$MAKEFLAGS; do \
28
+          case $$am__flg in \
29
+            *=*|--*) ;; \
30
+            *n*) am__dry=yes; break;; \
31
+          esac; \
32
+        done;; \
33
+    esac; \
34
+    test $$am__dry = yes; \
35
+  }
19 36
 pkgdatadir = $(datadir)/@PACKAGE@
20 37
 pkgincludedir = $(includedir)/@PACKAGE@
21 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -48,7 +65,61 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
48 48
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
49 49
 	$(top_srcdir)/m4/lt~obsolete.m4 \
50 50
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
51
-	$(top_srcdir)/configure.in
51
+	$(top_srcdir)/m4/reorganization/version.m4 \
52
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
53
+	$(top_srcdir)/m4/reorganization/headers.m4 \
54
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
55
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
56
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
57
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
58
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
59
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
60
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
61
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
62
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
63
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
64
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
65
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
66
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
67
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
68
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
69
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
70
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
71
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
72
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
73
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
74
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
75
+	$(top_srcdir)/m4/reorganization/debug.m4 \
76
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
77
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
78
+	$(top_srcdir)/m4/reorganization/dns.m4 \
79
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
80
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
81
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
82
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
83
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
84
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
85
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
86
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
87
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
88
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
89
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
90
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
91
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
92
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
93
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
96
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
97
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
98
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
99
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
100
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
101
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
102
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
103
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
104
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
105
+	$(top_srcdir)/configure.ac
52 106
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
53 107
 	$(ACLOCAL_M4)
54 108
 mkinstalldirs = $(install_sh) -d
... ...
@@ -60,8 +131,8 @@ libshared_la_LIBADD =
60 60
 am_libshared_la_OBJECTS = actions.lo cdiff.lo clamdcom.lo getopt.lo \
61 61
 	misc.lo optparser.lo tar.lo
62 62
 libshared_la_OBJECTS = $(am_libshared_la_OBJECTS)
63
-AM_V_lt = $(am__v_lt_$(V))
64
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
63
+AM_V_lt = $(am__v_lt_@AM_V@)
64
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
65 65
 am__v_lt_0 = --silent
66 66
 libshared_minimal_la_DEPENDENCIES = libshared.la
67 67
 am_libshared_minimal_la_OBJECTS = libshared_minimal_la-output.lo
... ...
@@ -95,21 +166,21 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
95 95
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
96 96
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
97 97
 	$(AM_CFLAGS) $(CFLAGS)
98
-AM_V_CC = $(am__v_CC_$(V))
99
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
98
+AM_V_CC = $(am__v_CC_@AM_V@)
99
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
100 100
 am__v_CC_0 = @echo "  CC    " $@;
101
-AM_V_at = $(am__v_at_$(V))
102
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
101
+AM_V_at = $(am__v_at_@AM_V@)
102
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
103 103
 am__v_at_0 = @
104 104
 CCLD = $(CC)
105 105
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
106 106
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
107 107
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
108
-AM_V_CCLD = $(am__v_CCLD_$(V))
109
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
108
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
109
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
110 110
 am__v_CCLD_0 = @echo "  CCLD  " $@;
111
-AM_V_GEN = $(am__v_GEN_$(V))
112
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
111
+AM_V_GEN = $(am__v_GEN_@AM_V@)
112
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
113 113
 am__v_GEN_0 = @echo "  GEN   " $@;
114 114
 SOURCES = $(libshared_la_SOURCES) $(libshared_minimal_la_SOURCES) \
115 115
 	$(libshared_minimal_threads_la_SOURCES) \
... ...
@@ -119,6 +190,11 @@ DIST_SOURCES = $(libshared_la_SOURCES) $(libshared_minimal_la_SOURCES) \
119 119
 	$(libshared_minimal_threads_la_SOURCES) \
120 120
 	$(libshared_nothreads_la_SOURCES) \
121 121
 	$(libshared_threads_la_SOURCES)
122
+am__can_run_installinfo = \
123
+  case $$AM_UPDATE_INFO_DIR in \
124
+    n|no|NO) false;; \
125
+    *) (install-info --version) >/dev/null 2>&1;; \
126
+  esac
122 127
 ETAGS = etags
123 128
 CTAGS = ctags
124 129
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -140,9 +216,23 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
140 140
 CHECK_LIBS = @CHECK_LIBS@
141 141
 CLAMAVGROUP = @CLAMAVGROUP@
142 142
 CLAMAVUSER = @CLAMAVUSER@
143
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
143 144
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
145
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
146
+CLAMBC_LIBS = @CLAMBC_LIBS@
147
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
148
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
144 149
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
150
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
151
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
152
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
145 153
 CLAMD_LIBS = @CLAMD_LIBS@
154
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
155
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
156
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
157
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
158
+CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
159
+CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
146 160
 CPP = @CPP@
147 161
 CPPFLAGS = @CPPFLAGS@
148 162
 CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
... ...
@@ -160,6 +250,7 @@ ECHO_T = @ECHO_T@
160 160
 EGREP = @EGREP@
161 161
 EXEEXT = @EXEEXT@
162 162
 FGREP = @FGREP@
163
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
163 164
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
164 165
 GCOV = @GCOV@
165 166
 GENHTML = @GENHTML@
... ...
@@ -181,8 +272,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
181 181
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
182 182
 LIBBZ2 = @LIBBZ2@
183 183
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
184
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
184 185
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
185 186
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
187
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
186 188
 LIBLTDL = @LIBLTDL@
187 189
 LIBM = @LIBM@
188 190
 LIBOBJS = @LIBOBJS@
... ...
@@ -220,6 +313,7 @@ RANLIB = @RANLIB@
220 220
 SED = @SED@
221 221
 SET_MAKE = @SET_MAKE@
222 222
 SHELL = @SHELL@
223
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
223 224
 STRIP = @STRIP@
224 225
 THREAD_LIBS = @THREAD_LIBS@
225 226
 TH_SAFE = @TH_SAFE@
... ...
@@ -227,6 +321,8 @@ VERSION = @VERSION@
227 227
 VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@
228 228
 WERR_CFLAGS = @WERR_CFLAGS@
229 229
 WERR_CFLAGS_MILTER = @WERR_CFLAGS_MILTER@
230
+XML_CPPFLAGS = @XML_CPPFLAGS@
231
+XML_LIBS = @XML_LIBS@
230 232
 abs_builddir = @abs_builddir@
231 233
 abs_srcdir = @abs_srcdir@
232 234
 abs_top_builddir = @abs_top_builddir@
... ...
@@ -354,15 +450,15 @@ clean-noinstLTLIBRARIES:
354 354
 	  echo "rm -f \"$${dir}/so_locations\""; \
355 355
 	  rm -f "$${dir}/so_locations"; \
356 356
 	done
357
-libshared.la: $(libshared_la_OBJECTS) $(libshared_la_DEPENDENCIES) 
357
+libshared.la: $(libshared_la_OBJECTS) $(libshared_la_DEPENDENCIES) $(EXTRA_libshared_la_DEPENDENCIES) 
358 358
 	$(AM_V_CCLD)$(LINK)  $(libshared_la_OBJECTS) $(libshared_la_LIBADD) $(LIBS)
359
-libshared_minimal.la: $(libshared_minimal_la_OBJECTS) $(libshared_minimal_la_DEPENDENCIES) 
359
+libshared_minimal.la: $(libshared_minimal_la_OBJECTS) $(libshared_minimal_la_DEPENDENCIES) $(EXTRA_libshared_minimal_la_DEPENDENCIES) 
360 360
 	$(AM_V_CCLD)$(libshared_minimal_la_LINK)  $(libshared_minimal_la_OBJECTS) $(libshared_minimal_la_LIBADD) $(LIBS)
361
-libshared_minimal_threads.la: $(libshared_minimal_threads_la_OBJECTS) $(libshared_minimal_threads_la_DEPENDENCIES) 
361
+libshared_minimal_threads.la: $(libshared_minimal_threads_la_OBJECTS) $(libshared_minimal_threads_la_DEPENDENCIES) $(EXTRA_libshared_minimal_threads_la_DEPENDENCIES) 
362 362
 	$(AM_V_CCLD)$(LINK)  $(libshared_minimal_threads_la_OBJECTS) $(libshared_minimal_threads_la_LIBADD) $(LIBS)
363
-libshared_nothreads.la: $(libshared_nothreads_la_OBJECTS) $(libshared_nothreads_la_DEPENDENCIES) 
363
+libshared_nothreads.la: $(libshared_nothreads_la_OBJECTS) $(libshared_nothreads_la_DEPENDENCIES) $(EXTRA_libshared_nothreads_la_DEPENDENCIES) 
364 364
 	$(AM_V_CCLD)$(libshared_nothreads_la_LINK)  $(libshared_nothreads_la_OBJECTS) $(libshared_nothreads_la_LIBADD) $(LIBS)
365
-libshared_threads.la: $(libshared_threads_la_OBJECTS) $(libshared_threads_la_DEPENDENCIES) 
365
+libshared_threads.la: $(libshared_threads_la_OBJECTS) $(libshared_threads_la_DEPENDENCIES) $(EXTRA_libshared_threads_la_DEPENDENCIES) 
366 366
 	$(AM_V_CCLD)$(LINK)  $(libshared_threads_la_OBJECTS) $(libshared_threads_la_LIBADD) $(LIBS)
367 367
 
368 368
 mostlyclean-compile:
... ...
@@ -385,55 +481,46 @@ distclean-compile:
385 385
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tar.Plo@am__quote@
386 386
 
387 387
 .c.o:
388
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
389
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
390
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
391
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
392
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
388
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
389
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
390
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
393 391
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
394
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
392
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
395 393
 
396 394
 .c.obj:
397
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
398
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
399
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
400
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
401
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
395
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
396
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
397
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
402 398
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
403
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
399
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
404 400
 
405 401
 .c.lo:
406
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
407
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
408
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
409
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
410
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
402
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
403
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
404
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
411 405
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
412
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
406
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
413 407
 
414 408
 libshared_minimal_la-output.lo: output.c
415 409
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshared_minimal_la_CFLAGS) $(CFLAGS) -MT libshared_minimal_la-output.lo -MD -MP -MF $(DEPDIR)/libshared_minimal_la-output.Tpo -c -o libshared_minimal_la-output.lo `test -f 'output.c' || echo '$(srcdir)/'`output.c
416 410
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libshared_minimal_la-output.Tpo $(DEPDIR)/libshared_minimal_la-output.Plo
417
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
418
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='output.c' object='libshared_minimal_la-output.lo' libtool=yes @AMDEPBACKSLASH@
411
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='output.c' object='libshared_minimal_la-output.lo' libtool=yes @AMDEPBACKSLASH@
419 412
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
420
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshared_minimal_la_CFLAGS) $(CFLAGS) -c -o libshared_minimal_la-output.lo `test -f 'output.c' || echo '$(srcdir)/'`output.c
413
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshared_minimal_la_CFLAGS) $(CFLAGS) -c -o libshared_minimal_la-output.lo `test -f 'output.c' || echo '$(srcdir)/'`output.c
421 414
 
422 415
 libshared_nothreads_la-output.lo: output.c
423 416
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshared_nothreads_la_CFLAGS) $(CFLAGS) -MT libshared_nothreads_la-output.lo -MD -MP -MF $(DEPDIR)/libshared_nothreads_la-output.Tpo -c -o libshared_nothreads_la-output.lo `test -f 'output.c' || echo '$(srcdir)/'`output.c
424 417
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libshared_nothreads_la-output.Tpo $(DEPDIR)/libshared_nothreads_la-output.Plo
425
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
426
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='output.c' object='libshared_nothreads_la-output.lo' libtool=yes @AMDEPBACKSLASH@
418
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='output.c' object='libshared_nothreads_la-output.lo' libtool=yes @AMDEPBACKSLASH@
427 419
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
428
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshared_nothreads_la_CFLAGS) $(CFLAGS) -c -o libshared_nothreads_la-output.lo `test -f 'output.c' || echo '$(srcdir)/'`output.c
420
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshared_nothreads_la_CFLAGS) $(CFLAGS) -c -o libshared_nothreads_la-output.lo `test -f 'output.c' || echo '$(srcdir)/'`output.c
429 421
 
430 422
 libshared_nothreads_la-misc_libclamav.lo: misc_libclamav.c
431 423
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshared_nothreads_la_CFLAGS) $(CFLAGS) -MT libshared_nothreads_la-misc_libclamav.lo -MD -MP -MF $(DEPDIR)/libshared_nothreads_la-misc_libclamav.Tpo -c -o libshared_nothreads_la-misc_libclamav.lo `test -f 'misc_libclamav.c' || echo '$(srcdir)/'`misc_libclamav.c
432 424
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libshared_nothreads_la-misc_libclamav.Tpo $(DEPDIR)/libshared_nothreads_la-misc_libclamav.Plo
433
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
434
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc_libclamav.c' object='libshared_nothreads_la-misc_libclamav.lo' libtool=yes @AMDEPBACKSLASH@
425
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='misc_libclamav.c' object='libshared_nothreads_la-misc_libclamav.lo' libtool=yes @AMDEPBACKSLASH@
435 426
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
436
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshared_nothreads_la_CFLAGS) $(CFLAGS) -c -o libshared_nothreads_la-misc_libclamav.lo `test -f 'misc_libclamav.c' || echo '$(srcdir)/'`misc_libclamav.c
427
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshared_nothreads_la_CFLAGS) $(CFLAGS) -c -o libshared_nothreads_la-misc_libclamav.lo `test -f 'misc_libclamav.c' || echo '$(srcdir)/'`misc_libclamav.c
437 428
 
438 429
 mostlyclean-libtool:
439 430
 	-rm -f *.lo
... ...
@@ -537,10 +624,15 @@ install-am: all-am
537 537
 
538 538
 installcheck: installcheck-am
539 539
 install-strip:
540
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
541
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
542
-	  `test -z '$(STRIP)' || \
543
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
540
+	if test -z '$(STRIP)'; then \
541
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
542
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
543
+	      install; \
544
+	else \
545
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
546
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
547
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
548
+	fi
544 549
 mostlyclean-generic:
545 550
 
546 551
 clean-generic:
... ...
@@ -84,6 +84,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
84 84
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
85 85
 	$(top_srcdir)/m4/lt~obsolete.m4 \
86 86
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
87
+	$(top_srcdir)/m4/reorganization/version.m4 \
88
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
89
+	$(top_srcdir)/m4/reorganization/headers.m4 \
90
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
91
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
92
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
93
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
94
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
95
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
96
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
97
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
98
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
99
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
104
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
108
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
109
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
110
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
111
+	$(top_srcdir)/m4/reorganization/debug.m4 \
112
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
113
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
114
+	$(top_srcdir)/m4/reorganization/dns.m4 \
115
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
116
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
117
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
118
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
119
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
120
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
121
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
122
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
123
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
124
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
125
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
126
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
127
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
128
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
129
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
130
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
131
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
132
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
133
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
134
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
135
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
136
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
137
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
138
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
139
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
140
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
87 141
 	$(top_srcdir)/configure.ac
88 142
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
89 143
 	$(ACLOCAL_M4)
... ...
@@ -155,9 +209,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
155 155
 CHECK_LIBS = @CHECK_LIBS@
156 156
 CLAMAVGROUP = @CLAMAVGROUP@
157 157
 CLAMAVUSER = @CLAMAVUSER@
158
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
158 159
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
160
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
161
+CLAMBC_LIBS = @CLAMBC_LIBS@
162
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
163
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
159 164
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
165
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
166
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
167
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
160 168
 CLAMD_LIBS = @CLAMD_LIBS@
169
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
170
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
171
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
172
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
161 173
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
162 174
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
163 175
 CPP = @CPP@
... ...
@@ -177,6 +243,7 @@ ECHO_T = @ECHO_T@
177 177
 EGREP = @EGREP@
178 178
 EXEEXT = @EXEEXT@
179 179
 FGREP = @FGREP@
180
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
180 181
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
181 182
 GCOV = @GCOV@
182 183
 GENHTML = @GENHTML@
... ...
@@ -198,8 +265,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
198 198
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
199 199
 LIBBZ2 = @LIBBZ2@
200 200
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
201
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
201 202
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
202 203
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
204
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
203 205
 LIBLTDL = @LIBLTDL@
204 206
 LIBM = @LIBM@
205 207
 LIBOBJS = @LIBOBJS@
... ...
@@ -237,6 +306,7 @@ RANLIB = @RANLIB@
237 237
 SED = @SED@
238 238
 SET_MAKE = @SET_MAKE@
239 239
 SHELL = @SHELL@
240
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
240 241
 STRIP = @STRIP@
241 242
 THREAD_LIBS = @THREAD_LIBS@
242 243
 TH_SAFE = @TH_SAFE@
... ...
@@ -24,8 +24,6 @@
24 24
 #include "clamav-config.h"
25 25
 #endif
26 26
 
27
-#define _GNU_SOURCE
28
-
29 27
 #include <stdio.h>
30 28
 #include <stdlib.h>
31 29
 #include <string.h>
... ...
@@ -65,6 +65,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
65 65
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
66 66
 	$(top_srcdir)/m4/lt~obsolete.m4 \
67 67
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
68
+	$(top_srcdir)/m4/reorganization/version.m4 \
69
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
70
+	$(top_srcdir)/m4/reorganization/headers.m4 \
71
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
72
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
73
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
74
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
75
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
76
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
77
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
78
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
79
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
80
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
81
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
82
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
83
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
84
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
85
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
86
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
87
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
88
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
89
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
90
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
91
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
92
+	$(top_srcdir)/m4/reorganization/debug.m4 \
93
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
94
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
95
+	$(top_srcdir)/m4/reorganization/dns.m4 \
96
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
97
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
98
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
99
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
100
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
101
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
102
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
103
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
104
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
107
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
108
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
109
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
110
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
111
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
112
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
113
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
114
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
115
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
116
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
117
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
118
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
119
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
120
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
121
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
68 122
 	$(top_srcdir)/configure.ac
69 123
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
70 124
 	$(ACLOCAL_M4)
... ...
@@ -104,9 +158,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
104 104
 CHECK_LIBS = @CHECK_LIBS@
105 105
 CLAMAVGROUP = @CLAMAVGROUP@
106 106
 CLAMAVUSER = @CLAMAVUSER@
107
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
107 108
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
109
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
110
+CLAMBC_LIBS = @CLAMBC_LIBS@
111
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
112
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
108 113
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
114
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
115
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
116
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
109 117
 CLAMD_LIBS = @CLAMD_LIBS@
118
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
119
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
120
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
121
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
110 122
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
111 123
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
112 124
 CPP = @CPP@
... ...
@@ -126,6 +192,7 @@ ECHO_T = @ECHO_T@
126 126
 EGREP = @EGREP@
127 127
 EXEEXT = @EXEEXT@
128 128
 FGREP = @FGREP@
129
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
129 130
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
130 131
 GCOV = @GCOV@
131 132
 GENHTML = @GENHTML@
... ...
@@ -147,8 +214,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
147 147
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
148 148
 LIBBZ2 = @LIBBZ2@
149 149
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
150
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
150 151
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
151 152
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
153
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
152 154
 LIBLTDL = @LIBLTDL@
153 155
 LIBM = @LIBM@
154 156
 LIBOBJS = @LIBOBJS@
... ...
@@ -186,6 +255,7 @@ RANLIB = @RANLIB@
186 186
 SED = @SED@
187 187
 SET_MAKE = @SET_MAKE@
188 188
 SHELL = @SHELL@
189
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
189 190
 STRIP = @STRIP@
190 191
 THREAD_LIBS = @THREAD_LIBS@
191 192
 TH_SAFE = @TH_SAFE@
... ...
@@ -67,6 +67,60 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
67 67
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
68 68
 	$(top_srcdir)/m4/lt~obsolete.m4 \
69 69
 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \
70
+	$(top_srcdir)/m4/reorganization/version.m4 \
71
+	$(top_srcdir)/m4/reorganization/build_tools.m4 \
72
+	$(top_srcdir)/m4/reorganization/headers.m4 \
73
+	$(top_srcdir)/m4/reorganization/c_options.m4 \
74
+	$(top_srcdir)/m4/reorganization/compiler_checks.m4 \
75
+	$(top_srcdir)/m4/reorganization/linker_checks.m4 \
76
+	$(top_srcdir)/m4/reorganization/code_checks/functions.m4 \
77
+	$(top_srcdir)/m4/reorganization/code_checks/mpool.m4 \
78
+	$(top_srcdir)/m4/reorganization/code_checks/unit_tests.m4 \
79
+	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
80
+	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
81
+	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
82
+	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
83
+	$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \
84
+	$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \
85
+	$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \
86
+	$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \
87
+	$(top_srcdir)/m4/reorganization/milter/enable.m4 \
88
+	$(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \
89
+	$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \
90
+	$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \
91
+	$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \
92
+	$(top_srcdir)/m4/reorganization/utility_checks/yp.m4 \
93
+	$(top_srcdir)/m4/reorganization/usergroup.m4 \
94
+	$(top_srcdir)/m4/reorganization/debug.m4 \
95
+	$(top_srcdir)/m4/reorganization/customversion.m4 \
96
+	$(top_srcdir)/m4/reorganization/nocache.m4 \
97
+	$(top_srcdir)/m4/reorganization/dns.m4 \
98
+	$(top_srcdir)/m4/reorganization/bigstack.m4 \
99
+	$(top_srcdir)/m4/reorganization/dbdir.m4 \
100
+	$(top_srcdir)/m4/reorganization/cfgdir.m4 \
101
+	$(top_srcdir)/m4/reorganization/code_checks/in_port_t.m4 \
102
+	$(top_srcdir)/m4/reorganization/code_checks/in_addr_t.m4 \
103
+	$(top_srcdir)/m4/reorganization/os_checks.m4 \
104
+	$(top_srcdir)/m4/reorganization/milter/check.m4 \
105
+	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \
106
+	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \
107
+	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \
108
+	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \
109
+	$(top_srcdir)/m4/reorganization/clamav_user.m4 \
110
+	$(top_srcdir)/m4/reorganization/code_checks/compiler_attribs.m4 \
111
+	$(top_srcdir)/m4/reorganization/code_checks/select.m4 \
112
+	$(top_srcdir)/m4/reorganization/code_checks/stat64.m4 \
113
+	$(top_srcdir)/m4/reorganization/code_checks/shift.m4 \
114
+	$(top_srcdir)/m4/reorganization/code_checks/features.m4 \
115
+	$(top_srcdir)/m4/reorganization/clamdtop.m4 \
116
+	$(top_srcdir)/m4/reorganization/distcheck.m4 \
117
+	$(top_srcdir)/m4/reorganization/llvm.m4 \
118
+	$(top_srcdir)/m4/reorganization/sha_collect.m4 \
119
+	$(top_srcdir)/m4/reorganization/bsd.m4 \
120
+	$(top_srcdir)/m4/reorganization/libs/curl.m4 \
121
+	$(top_srcdir)/m4/reorganization/libs/libconfig.m4 \
122
+	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
123
+	$(top_srcdir)/m4/reorganization/substitutions.m4 \
70 124
 	$(top_srcdir)/configure.ac
71 125
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
72 126
 	$(ACLOCAL_M4)
... ...
@@ -295,9 +349,21 @@ CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
295 295
 CHECK_LIBS = @CHECK_LIBS@
296 296
 CLAMAVGROUP = @CLAMAVGROUP@
297 297
 CLAMAVUSER = @CLAMAVUSER@
298
+CLAMAV_MILTER_CPPFLAGS = @CLAMAV_MILTER_CPPFLAGS@
298 299
 CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
300
+CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
301
+CLAMBC_LIBS = @CLAMBC_LIBS@
302
+CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
303
+CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
299 304
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
305
+CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
306
+CLAMDTOP_LIBS = @CLAMDTOP_LIBS@
307
+CLAMD_CPPFLAGS = @CLAMD_CPPFLAGS@
300 308
 CLAMD_LIBS = @CLAMD_LIBS@
309
+CLAMMEM_CPPFLAGS = @CLAMMEM_CPPFLAGS@
310
+CLAMMEM_LIBS = @CLAMMEM_LIBS@
311
+CLAMSCAN_CPPFLAGS = @CLAMSCAN_CPPFLAGS@
312
+CLAMSCAN_LIBS = @CLAMSCAN_LIBS@
301 313
 CLAMSUBMIT_CFLAGS = @CLAMSUBMIT_CFLAGS@
302 314
 CLAMSUBMIT_LIBS = @CLAMSUBMIT_LIBS@
303 315
 CPP = @CPP@
... ...
@@ -317,6 +383,7 @@ ECHO_T = @ECHO_T@
317 317
 EGREP = @EGREP@
318 318
 EXEEXT = @EXEEXT@
319 319
 FGREP = @FGREP@
320
+FRESHCLAM_CPPFLAGS = @FRESHCLAM_CPPFLAGS@
320 321
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
321 322
 GCOV = @GCOV@
322 323
 GENHTML = @GENHTML@
... ...
@@ -338,8 +405,10 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
338 338
 LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
339 339
 LIBBZ2 = @LIBBZ2@
340 340
 LIBBZ2_PREFIX = @LIBBZ2_PREFIX@
341
+LIBCLAMAV_CPPFLAGS = @LIBCLAMAV_CPPFLAGS@
341 342
 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
342 343
 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
344
+LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
343 345
 LIBLTDL = @LIBLTDL@
344 346
 LIBM = @LIBM@
345 347
 LIBOBJS = @LIBOBJS@
... ...
@@ -377,6 +446,7 @@ RANLIB = @RANLIB@
377 377
 SED = @SED@
378 378
 SET_MAKE = @SET_MAKE@
379 379
 SHELL = @SHELL@
380
+SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
380 381
 STRIP = @STRIP@
381 382
 THREAD_LIBS = @THREAD_LIBS@
382 383
 TH_SAFE = @TH_SAFE@