[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-303-gd86c30a
Michael Tautschnig
mt at debian.org
Sun Mar 8 21:23:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a0627c284e2876be409ed40d56f77b3f443cfee7
Merge: 9e03da9eed86c829ed74a95db5ecc58faca9683d 7c96fd5ca0bcf803ef6f774f0b5f3df65276c817
Author: Michael Tautschnig <mt at debian.org>
Date: Sun Mar 8 21:19:04 2009 +0100
Merge commit 'clamav-svn/tags/clamav-0.95rc1' into debian/unstable
Conflicts:
ChangeLog
Makefile.am
Makefile.in
clamav-milter/clamav-milter.c
clamd/clamd.c
configure
configure.in
docs/clamdoc.pdf
docs/clamdoc.tex
docs/html/clamdoc.html
docs/html/index.html
docs/html/node1.html
docs/html/node10.html
docs/html/node11.html
docs/html/node12.html
docs/html/node13.html
docs/html/node14.html
docs/html/node15.html
docs/html/node16.html
docs/html/node17.html
docs/html/node18.html
docs/html/node19.html
docs/html/node2.html
docs/html/node20.html
docs/html/node21.html
docs/html/node22.html
docs/html/node23.html
docs/html/node24.html
docs/html/node25.html
docs/html/node26.html
docs/html/node27.html
docs/html/node28.html
docs/html/node29.html
docs/html/node3.html
docs/html/node30.html
docs/html/node31.html
docs/html/node32.html
docs/html/node33.html
docs/html/node34.html
docs/html/node35.html
docs/html/node36.html
docs/html/node37.html
docs/html/node38.html
docs/html/node39.html
docs/html/node4.html
docs/html/node40.html
docs/html/node41.html
docs/html/node42.html
docs/html/node43.html
docs/html/node44.html
docs/html/node45.html
docs/html/node46.html
docs/html/node47.html
docs/html/node48.html
docs/html/node49.html
docs/html/node5.html
docs/html/node50.html
docs/html/node51.html
docs/html/node52.html
docs/html/node53.html
docs/html/node54.html
docs/html/node55.html
docs/html/node56.html
docs/html/node6.html
docs/html/node7.html
docs/html/node8.html
docs/html/node9.html
docs/man/clamav-milter.8.in
docs/man/clamd.8.in
freshclam/manager.c
libclamav/nsis/infblock.c
libclamav/nsis/nsis_zlib.h
libclamav/others.c
libclamav/special.c
libclamav/special.h
libclamunrar/unrar.c
libclamunrar/unrarvm.c
shared/output.c
unit_tests/valgrind.supp
Signed-off-by: Michael Tautschnig <mt at debian.org>
diff --combined ChangeLog
index a2d2280,0b4f6b5..1b21e37
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,801 +1,801 @@@
- Wed Nov 26 13:32:53 CET 2008 (tk)
+ Wed Feb 25 22:29:41 CET 2009 (tk)
---------------------------------
- * V 0.94.2
+ * V 0.95rc1
- Wed Nov 26 13:15:56 CET 2008 (tk)
+ Wed Feb 25 23:14:33 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/duma_tests.sh: disable duma tests by default, they time
+ out even on fast machines.
+
+ Wed Feb 25 22:01:53 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/check_clamd.c: fix build with old versions of check
+
+ Wed Feb 25 18:17:03 CET 2009 (acab)
+ -----------------------------------
+ * clamd, clamav-milter: unify default max stream sizes
+
+ Wed Feb 25 14:08:14 CET 2009 (acab)
+ -----------------------------------
+ * docs/man/clamav-milter.8.in: update documentation
+
+ Wed Feb 25 00:00:25 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/duma_tests.sh: fix duma timeouts (thanks Nigel!).
+
+ Tue Feb 24 22:50:21 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/others.c: force alignment of ancillary data buffer (bb
+ #1425).
+
+ Tue Feb 24 22:48:48 EET 2009 (edwin)
+ ------------------------------------
+ * configure, m4/acinclude.m4: add missing AC_RESULT.
+
+ Tue Feb 24 15:57:43 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/others_common.c: only when there are at least 2 chars in
+ pathname.
+
+ Tue Feb 24 15:54:17 EET 2009 (edwin)
+ ------------------------------------
+ * clamdscan/client.c, clamdscan/proto.c, clamdscan/proto.h,
+ libclamav/others.h, libclamav/others_common.c: trim extra leading
+ and trailing slashes (bb #1423).
+
+ Tue Feb 24 12:32:03 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/efence_tests.sh: fix electric-fence return code
+ checking (bb #1385).
+
+ Mon Feb 23 20:32:43 CET 2009 (tk)
+ ---------------------------------
+ * docs/clamdoc.(tex|pdf): update documentation
+
+ Mon Feb 23 19:58:08 CET 2009 (acab)
+ -----------------------------------
+ * clamdscan/proto.c: handle warning_skipped_link in switch
+
+ Mon Feb 23 14:53:39 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/regex_list.c, libclamav/regex_list.h,
+ unit_tests/check_regex.c, unit_tests/input/daily.wdb: fix match with
+ root regex (bb #1421).
+
+ Mon Feb 23 14:10:01 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/session.c: stop scanning when client disconnects in
+ multiscan mode (bb #1417).
+
+ Sat Feb 21 21:48:43 EET 2009 (edwin)
+ ------------------------------------
+ * Makefile.in, clamav-config.h.in, clamav-milter/, clamconf/,
+ clamd/, clamdscan/, clamdtop/, clamscan/, configure, configure.in,
+ contrib/, database/, docs/, etc/, freshclam/, libclamav/, libltdl/,
+ m4/, shared/, sigtool/, test/, unit_tests/: clamdtop moved to
+ toplevel
+
+ Sat Feb 21 11:22:15 CET 2009 (acab)
+ -----------------------------------
+ * libclamav/nsis: fix race introduced in r4379
+
+ Sat Feb 21 10:55:30 CET 2009 (acab)
+ -----------------------------------
+ * build system: Allow to link to system libtommath.
+ Based on an idea from Steve Gran.
+
+ Fri Feb 20 15:57:11 CET 2009 (tk)
+ ---------------------------------
+ * examples/ex1.c: use new API
+
+ Fri Feb 20 15:53:18 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/check_clamd.c, unit_tests/check_clamd.sh: Fix
+ timeout/run-out-of-fd bug in unit-tests (bb #1412)
+
+ Fri Feb 20 13:54:53 EET 2009 (edwin)
+ ------------------------------------
+ * docs/man/clamd.8.in: more documentation on IDSESSION/INSTREEAM (bb
+ #1401).
+
+ Thu Feb 19 13:28:04 CET 2009 (tk)
+ ---------------------------------
+ * shared/cdiff.c: scripts can now control size of input buffer (bb#1395)
+
+ Thu Feb 19 11:20:58 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/, etc/, libclamav/, unit_tests/: fix distcheck.
+
+ Wed Feb 18 23:12:36 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/textdet.c: improve UTF-16 detection (bb#1209)
+
+ Thu Feb 19 00:05:28 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/server-th.c: move the command parsing, and stream handling
+ code into their own functions. No functionality change.
+
+ Thu Feb 19 00:05:03 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/regex_suffix.c: n->type has to be first field (revert
+ bug introduced in field reorder commit).
+
+ Wed Feb 18 23:25:15 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/server-th.c: fix NetBSD build
+
+ Wed Feb 18 22:58:14 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/phishcheck.c, unit_tests/check_regex.c: improve URL
+ handling
+
+ Wed Feb 18 22:24:22 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/: reorder fields (bb #1144)
+
+ Wed Feb 18 21:57:22 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/session.c: real fix for BB #1403.
+
+ Wed Feb 18 21:08:50 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/server-th.c, unit_tests/check_clamd.c,
+ unit_tests/test-clamd.conf: In single INSTREAM mode, remove FD from
+ polled set (BB #1410) Fix testcase, INSTREAM should say UNKNOWN
+ COMMAND in old mode and close conn, sending anything after it will
+ likely result in a broken pipe.(BB #1407)
+
+ Wed Feb 18 20:35:16 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/bignum.h: disable __mode__(TI) code (bb #1409)
+
+ Wed Feb 18 19:10:38 CET 2009 (acab)
+ -----------------------------------
+ * Build system: work around mpool check for openbsd
+
+ Wed Feb 18 17:20:26 CET 2009 (acab)
+ -----------------------------------
+ * Build system: check BZ2_ prefix instead of checking for non BZ2
+ prefix (bb#1389)
+
+ Wed Feb 18 17:24:48 EET 2009 (edwin)
+ ------------------------------------
+ * freshclam/, libclamav/, shared/, sigtool/, unit_tests/: use sha256
+ instead of md5 in phishcheck. move sha256 to libclamav. add more
+ tests.
+
+ Wed Feb 18 12:41:17 CET 2009 (tk)
+ ---------------------------------
+ * etc/clamav-milter.conf: fix PidFile example (bb#1408)
+
+ Wed Feb 18 03:12:12 CET 2009 (acab)
+ -----------------------------------
+ * clamav-milter: die on TERM (bb#1400)
+ install conf file on make install
+
+ Tue Feb 17 23:12:19 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/check_clamd.c: disable test on BSD
+
+ Tue Feb 17 22:35:53 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/server-th.c, unit_tests/check_clamd.sh: signals may not wake
+ a poll(), so make sure thread wakes up (BB #1400).
+
+ Tue Feb 17 22:10:48 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/check_clamd.c: add missing header
+
+ Tue Feb 17 22:10:10 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/Makefile.am, libclamav/Makefile.in,
+ unit_tests/check_clamd.c: git-* commands are gone, use 'git svn'.
+ correct include position for fdpassing.h
+
+ Tue Feb 17 21:09:23 CET 2009 (acab)
+ -----------------------------------
+ * clamav-milter/clamav-milter.c: compile cleanly with 4+ year old
+ libmilter still being shipped (bb#1402)
+
+ Tue Feb 17 20:35:21 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/server-th.c, clamd/session.c, clamd/session.h,
+ unit_tests/check_clamd.c: Reject new commands sent as new-style
+ commands to avoid confusion. This means that IDSESSION/INSTREAM
+ must be sent as nIDSESSION\n or zIDSESSION\0, ditto for INSTREAM.
+ Adjust testcases accordingly. Old commands are still accepted when
+ sent without delimiter.
+
+ Tue Feb 17 20:06:02 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/others.c, libclamunrar_iface/unrar_iface.h, shared/misc.c,
+ unit_tests/check_clamd.c, unit_tests/check_clamd.sh: fix use of
+ uninitialized value. add test for STREAM. fix missing closing
+ pragmas.
+
+ Tue Feb 17 18:38:30 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/check_clamd.c: another warning
+
+ Tue Feb 17 18:36:22 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/others.c: fix compiler warning
+
+ Tue Feb 17 18:32:59 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/others.c: add missing parameter
+
+ Tue Feb 17 18:29:27 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/, shared/, unit_tests/: Introduce '$' in logg, it is active
+ when logg_verbose=2, i.e. when Debug yes. Fix leak reported by
+ valgrind.
+
+ Tue Feb 17 17:33:06 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/server-th.c, unit_tests/check_clamd.c: make sending
+ ancillary data at wrong time a protocol error. change testcase
+ accordingly.
+
+ Tue Feb 17 17:11:17 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/clamd.c, shared/optparser.c, shared/output.h: sendtimeout
+
+ Tue Feb 17 17:08:18 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/others.c, clamd/others.h, clamd/scanner.c,
+ clamd/server-th.c, shared/optparser.c, unit_tests/check_clamd.c,
+ unit_tests/test-clamd.conf: ReadTimeout handling, and introduce
+ CommandReadTimeout.
+
+ Tue Feb 17 12:07:37 CET 2009 (tk)
+ ---------------------------------
+ * sigtool/sigtool.c: better error messages (bb#1396)
+
+ Tue Feb 17 01:36:36 CET 2009 (acab)
+ -----------------------------------
+ * clamd: add --stream option to force streaming even to the localhost
+ via unix socket
+
+ Mon Feb 16 23:56:34 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/clamd.c, clamd/server-th.c, unit_tests/check_clamd.c,
+ unit_tests/check_clamd.sh: fix typo. add another stress test.
+ Don't leak file descriptors. Fix IDSESSION delimiter handling.
+
+ Mon Feb 16 20:53:45 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/thrmgr.c: fix valgrind warning about locking order
+
+ Mon Feb 16 20:36:01 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/, libclamav/, shared/, unit_tests/: introduce timeouts for
+ send(), this is needed for IDSESSION to work reliably, since a buggy
+ client implementation may get stuck in send(), and then clamd gets
+ stuck in send() -> deadlock. To avoid this we need nonblocking
+ sockets, and (low) timeouts on send. Add more tests for clamd protocol,
+ including a stress test for IDSESSION.
+
+ Mon Feb 16 16:15:21 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/check_clamd.c: test for FILDES
+
+ Mon Feb 16 14:08:50 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/server-th.c, clamd/session.c, unit_tests/check_clamd.c: add
+ more unit tests. Make handling of old-style commands compatible
+ with old clamd: if they have a \n that will delimit the command.
+
+ Mon Feb 16 17:59:57 CET 2009 (tk)
+ ---------------------------------
+ * libclamav, sigtool: fix handling of long signatures (bb#1395)
+
+ Mon Feb 16 13:16:53 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/clamd: fix double-slash when scanning the root dir (bb#1394)
+
+ Sun Feb 15 19:14:00 CET 2009 (acab)
+ -----------------------------------
+ * clamav-milter/clamav-milter.c: don't umask()
+
+ Sun Feb 15 19:10:59 CET 2009 (acab)
+ -----------------------------------
+ * clamav-milter/clamav-milter.c: create threads after forking
+
+ Sun Feb 15 18:20:40 CET 2009 (acab)
+ -----------------------------------
+ * clamav-milter:clamav-milter/netcode.c: fix leaks
+
+ Sun Feb 15 16:24:07 CET 2009 (acab)
+ -----------------------------------
+ * clamav-milter: handle aborts
+
+ Sat Feb 14 18:43:10 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/session.c, contrib/clamdtop/Makefile,
+ contrib/clamdtop/clamdtop.c: make clamdtop use IDSESSION, and enable
+ VERSION/STATS inside IDSESSION.
+
+ Sat Feb 14 18:04:55 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/scanners.c: fix type 7 signature matching (bb #1368).
+
+ Sat Feb 14 11:43:10 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/others.c, clamd/others.h, clamd/server-th.c: Initialize
+ mutex. Fix poll_fd to properly lock/unlock mutex.
+
+ Sat Feb 14 10:17:37 CET 2009 (acab)
+ -----------------------------------
+ * clamav-milter/clamfi.c: Revert previous and add a better fix
+
+ Sat Feb 14 09:34:18 CET 2009 (acab)
+ -----------------------------------
+ * clamav-milter/clamfi.c: Correctly scan in FILDES mode
+
+ Fri Feb 13 19:21:24 EET 2009 (edwin)
+ ------------------------------------
+ * shared/output.c, unit_tests/check_clamd.c: mdprintf was also
+ taking %f and %l, and they have different size than int. Make the
+ ARGLEN get the correct vaarg types, otherwise it was popping off the
+ stack an item of the wrong size!
+
+ Fri Feb 13 16:48:01 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/server-th.c: fix nFILDES command
+
+ Fri Feb 13 15:54:44 EET 2009 (edwin)
+ ------------------------------------
+ * shared/fdpassing.h: add copyright header
+
+ Fri Feb 13 14:12:30 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/matcher.c: cli_scanbuff: add support for external acdata
+
+ Fri Feb 13 14:21:54 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/preload_run.sh, unit_tests/valgrind_tests.sh: increase
+ timeout when run under valgrind/efence/duma
+
+ Fri Feb 13 14:05:21 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/valgrind.supp: more suppressions
+
+ Fri Feb 13 13:49:55 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/valgrind.supp: add suppression for progexit set in
+ signal handler
+
+ Fri Feb 13 13:48:54 EET 2009 (edwin)
+ ------------------------------------
+ * clamav-milter/netcode.c: Solaris build fix
+
+ Fri Feb 13 13:34:21 EET 2009 (edwin)
+ ------------------------------------
+ * clamav-milter/, clamd/, clamdscan/, shared/: fix Solaris build
+
+ Fri Feb 13 11:11:03 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/others.c, clamd/session.c: fdpassing is now in others.c
+ instead of session.c, move the defines.
+
+ Fri Feb 13 10:30:16 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/session.c: add missing include
+
+ Thu Feb 12 23:58:14 EET 2009 (edwin)
+ ------------------------------------
+ * shared/misc.h: add missing include
+
+ Thu Feb 12 23:56:36 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/tcpserver.c: fix distcheck
+
+ Thu Feb 12 23:43:32 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/libclamav.map: remove nonexistent symbol to make Solaris
+ linker happy.
+
+ Thu Feb 12 23:07:51 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/clamd.c, clamd/tcpserver.c, clamdscan/client.c,
+ shared/misc.c, shared/misc.h: move TCP socket creation to shared/
+
+ Thu Feb 12 22:33:30 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/clamd.c, clamd/server-th.c: Unify error paths. Remove unix
+ socket we created if startup fails due to invalid config.
+
+ Thu Feb 12 21:47:27 EET 2009 (edwin)
+ ------------------------------------
+ * shared/getopt.c: fix
+
+ Thu Feb 12 21:35:15 EET 2009 (edwin)
+ ------------------------------------
+ * shared/getopt.c, shared/getopt.h: make prototype compatible with
+ that declared in system headers. (bb #1383)
+
+ Thu Feb 12 21:34:54 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/scanners.c: fix valgrind warning (bb #1371)
+
+ Thu Feb 12 20:54:09 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/check_clamd.c: fix distcheck errors
+
+ Thu Feb 12 20:51:04 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/check_clamd.c: add another missing file
+
+ Thu Feb 12 19:22:23 CET 2009 (acab)
+ -----------------------------------
+ * shared/actions.c: fix message
+
+ Thu Feb 12 20:16:25 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/others.c: add check for msg.controllen, apparently Mac OS X
+ sets it to 0, but CMSG_FIRSTHDR is not NULL!
+
+ Thu Feb 12 20:09:17 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/checks_common.h: add missing file
+
+ Thu Feb 12 20:00:01 EET 2009 (edwin)
+ ------------------------------------
+ * clamdscan/client.c: fix merge mistake
+
+ Thu Feb 12 19:55:31 EET 2009 (edwin)
+ ------------------------------------
+ * Makefile.in: revert accidental makefile change
+
+ Thu Feb 12 19:49:06 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/Makefile.am, unit_tests/Makefile.in,
+ unit_tests/check_clamd.sh, unit_tests/checks.h: add some unit tests
+ for the new clamd protocol
+
+ Thu Feb 12 18:30:29 CET 2009 (acab)
+ -----------------------------------
+ * shared, clamdscan, clamscan, doc, build system:
+ merge "new clamd protocol"
+ merge "unify action handlers"
+ merge "doc updates"
+ from branches/clamd-proto
+
+ Thu Feb 12 19:19:42 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/, shared/: merge from clamd-proto branch: handle multiple %v parameters introduce poll_fds that also does the read into a buffer introduce thrmgr_group* commands for keeping track of groups of
+ commands (multiscan, IDSESSION) introduce 2 queues in thrmgr, multiscan queues get lower
+ priority. Commands are processed from both queues in a 4:1 ratio
+ to avoid starvation. unify reply code: conn_reply* unify scanner code into scan_callback that is called from
+ cli_ftw multiscan doesn't need stat() now if readdir() provides
+ dt_type redesign clamd main loop: there is now an accept thread, and
+ a recv()/dispatch thread, +MaxThreads worker (scanner) threads. introduce limiting on commands when worker threads are
+ contended. introduce IDSESSION, a replacement for the old
+ SESSION command, that allows asyncronous (scan) commands and scan
+ replies introduce INSTREAM that allows sending the data to scan on
+ same connection (vs STREAM that requires another port) introduce zCOMMANDS
+
+ Thu Feb 12 19:19:42 EET 2009 (edwin)
+ ------------------------------------
+ * clamd/, shared/: merge from clamd-proto branch: handle multiple %v parameters introduce poll_fds that also does the read into a buffer introduce thrmgr_group* commands for keeping track of groups of
+ commands (multiscan, IDSESSION) introduce 2 queues in thrmgr, multiscan queues get lower
+ priority. Commands are processed from both queues in a 4:1 ratio
+ to avoid starvation. unify reply code: conn_reply* unify scanner code into scan_callback that is called from
+ cli_ftw multiscan doesn't need stat() now if readdir() provides
+ dt_type redesign clamd main loop: there is now an accept thread, and
+ a recv()/dispatch thread, +MaxThreads worker (scanner) threads. introduce limiting on commands when worker threads are
+ contended. introduce IDSESSION, a replacement for the old
+ SESSION command, that allows asyncronous (scan) commands and scan
+ replies introduce INSTREAM that allows sending the data to scan on
+ same connection (vs STREAM that requires another port) introduce zCOMMANDS
+
+ Thu Feb 12 19:08:28 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/libclamav.map, libclamav/others.h,
+ libclamav/others_common.c: merge from clamd-proto branch: introduce
+ cli_ftw
+
+ Thu Feb 12 12:20:05 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/valgrind.supp: add some more suppressions
+
+ Thu Feb 12 15:22:17 CET 2009 (tk)
+ ---------------------------------
+ * libclamav: return codes cleanup (bb#1159)
+
+ Wed Feb 11 11:08:55 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/cvd.c: fix warning when cvd timestamp is in the future (bb#1381)
+
+ Wed Feb 11 09:38:19 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/filetypes_int.h: sync with daily.ftm
+
+ Fri Feb 6 16:10:27 CET 2009 (tk)
+ ---------------------------------
+ * shared/optparser.c, clamconf: handle clamav-milter.conf in --generate-config
+
+ Fri Feb 6 15:38:21 CET 2009 (tk)
+ ---------------------------------
+ * etc/clamav-milter.conf: fix typos
+
+ Tue Feb 3 20:11:07 CET 2009 (tk)
+ ---------------------------------
+ * libclamav, shared: minor cleanups; fix handling of long file names (bb#1349)
+
+ Fri Jan 30 09:13:15 CET 2009 (tk)
+ ---------------------------------
+ * shared/optparser.c: improve handling of short switches (bb#1374)
+
+ Thu Jan 29 20:27:45 CET 2009 (tk)
+ ---------------------------------
+ * shared/optparser.c, clamconf/clamconf.c: add --generate-config
+
+ Thu Jan 29 18:36:51 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/scanners.c: raise scanscript limit
+
+ Tue Jan 27 14:55:46 EET 2009 (edwin)
+ ------------------------------------
+ * unit_tests/check_clamav.c: add missing include
+
+ Tue Jan 27 13:12:50 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/libclamav.map, unit_tests/check_clamav.c: add dsig unit
+ test
+
+ Tue Jan 27 11:46:17 CET 2009 (tk)
+ ---------------------------------
+ * clamscan/manager.c: fix use of uninitialized value in exclude-pua (bb#1373)
+
+ Mon Jan 26 21:06:36 CET 2009 (tk)
+ ---------------------------------
+ * libclamav: use LibTomMath by Tom St Denis instead of libgmp for multiple
+ precision integer arithmetic (bb#1366); the library is bundled
+ with ClamAV what means that the digital signature support is
+ now available out-of-box
+
+ Fri Jan 23 13:33:18 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/clamav.h, libclamav/others.c, libclamav/others.h: fix
+ CL_ENGINE_DB_TIME, time_t may well be 64-bits, so writing only
+ 32-bits will leave upper 32-bits undefined and lead to funny
+ results, such as VERSION command working first time, but 2nd time
+ not showing the DB timestamp.
+
+ Thu Jan 22 15:59:43 CET 2009 (tk)
+ ---------------------------------
+ * clamconf: handle --version/-V
+
+ Thu Jan 22 15:52:14 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/dlp.c: disable the test for ssn_max_group (bb#1355)
+
+ Thu Jan 22 15:39:06 CET 2009 (tk)
+ ---------------------------------
+ * shared/optparser.c, clamconf: new clamconf (bb#1215, bb#1316)
+
+ Mon Jan 19 21:01:33 CET 2009 (tk)
+ ---------------------------------
+ * shared/optparser.c: improve cmdline args handling
+
+ Mon Jan 19 15:38:39 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/dlp.c: fix CC detection and chksumming (bb#1264)
+
+ Fri Jan 16 15:26:50 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/dlp.c: fix detection of single stripped SSNs (bb#1354)
+
+ Mon Jan 5 20:33:04 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/str.c: return token count in cli_strtokenize()
+ * libclamav/readdb.c: use tokens_count (bb#1331); make the parser more
+ strict
+
+ Mon Jan 5 19:54:13 CET 2009 (tk)
+ ---------------------------------
+ * libclamav/mpool.c: fix old free() call in cli_mp_hex2ui()
+
+ Mon Jan 5 12:56:59 EET 2009 (edwin)
+ ------------------------------------
+ * libclamav/regex_list.c: fix malformed .pdb handling (bb #1338)
+
+ Fri Jan 2 23:00:52 CET 2009 (tk)
---------------------------------
- * libclamav, configure: bump f-level and revision
+ * shared/misc.c: re-enable freshdbdir()
- Wed Nov 26 13:03:37 CET 2008 (tk)
+ Fri Jan 2 18:16:45 CET 2009 (tk)
---------------------------------
- * docs: update
+ * shared, clamconf: drop old stuff; replace getopt.[ch] with my_getopt
- Wed Nov 26 12:22:55 CET 2008 (tk)
+ Fri Jan 2 13:08:09 CET 2009 (tk)
+ ---------------------------------
+ * shared/optparser.c, clamav-milter: use the new option parser (bb#1215)
+
+ Fri Jan 2 13:08:09 CET 2009 (tk)
+ ---------------------------------
+ * shared/optparser.c, sigtool: use the new option parser (bb#1215)
+
+ Thu Jan 1 22:56:40 EET 2009 (edwin)
+ ------------------------------------
+ * Makefile.am, Makefile.in: add -Wformat-security to 'make
+ distcheck'
+
+ Thu Jan 1 21:17:47 CET 2009 (acab)
+ -----------------------------------
+ * libclamav/disasm.c: table fixup
+
+ Wed Dec 31 15:42:21 CET 2008 (tk)
+ ---------------------------------
+ * shared/optparser.c: fix typo (bb#1336)
+
+ Wed Dec 31 13:40:30 CET 2008 (tk)
+ ---------------------------------
+ * shared/optparser.c: cosmetics; add FLAG_REQUIRED
+
+ Tue Dec 30 22:29:50 CET 2008 (tk)
+ ---------------------------------
+ * shared/optparser.c, clamdscan: use the new option parser (bb#1215)
+
+ Tue Dec 30 11:43:10 CET 2008 (tk)
+ ---------------------------------
+ * shared/optparser.c, clamscan: use the new option parser; changes in switches:
+ --no-mail -> --scan-mail, --no-phishing-sigs -> --phishing-sigs,
+ --no-phishing-scan-urls -> --phishing-scan-urls,
+ --no-algorithmic -> --algorithmic-detection, --no-pe -> --scan-pe,
+ --no-elf -> --scan-elf, --no-ole2 -> --scan-ole2, --no-pdf -> --scan-pdf,
+ --no-html -> --scan-html, --no-archive -> --scan-archive
+ See clamscan(1) for more information
+
+ Mon Dec 29 19:08:25 CET 2008 (tk)
+ ---------------------------------
+ * libclamav: add default.h
+
+ Tue Dec 23 13:03:42 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/pe.c, libclamav/special.c: reset resource type,
+ otherwise we parse all resources after a string resource as string
+ (including images), which is wrong, because it feeds wrong
+ statistics to cli_detect_swizz.
+
+ Mon Dec 22 22:32:59 CET 2008 (tk)
+ ---------------------------------
+ * shared/optparser.c: extend MATCH_BOOL regex (bb#1324)
+
+ Mon Dec 22 22:16:40 CET 2008 (tk)
+ ---------------------------------
+ * shared/optparser.c: handle --user/-u in freshclam (bb#1323)
+
+ Mon Dec 22 16:12:27 CET 2008 (tk)
+ ---------------------------------
+ * shared/optparser.c: fix small memleak
+
+ Thu Dec 18 20:52:00 CET 2008 (tk)
+ ---------------------------------
+ * shared/optparser.c, freshclam: use the new option parser (bb#1215)
+
+ Wed Dec 17 22:43:54 CET 2008 (tk)
+ ---------------------------------
+ * shared/optparser.[ch]: initial version of the unified option parser (bb#1215)
+ * clamd: use the new option parser
+ * more to come
+
+ Tue Dec 16 15:18:28 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/special.c: fix Swizzor detection: if no individual
+ string is suspicious, the result must be clean.
+
+ Mon Dec 15 20:25:48 EET 2008 (edwin)
+ ------------------------------------
+ * Makefile.am: remove -Wpacked
+
+ Mon Dec 15 16:16:40 EET 2008 (edwin)
+ ------------------------------------
+ * clamav-milter/Makefile.am, clamav-milter/Makefile.in: filter
+ -Wwrite-strings in milter
+
+ Fri Dec 12 17:04:33 EET 2008 (edwin)
+ ------------------------------------
+ * unit_tests/valgrind_tests.sh: disable valgrind tests by default
+ due to false positives from system libraries. They can be activated
+ by using make check VG=1. (bb #1307, bb #1308, bb #1311).
+
+ Fri Dec 12 10:49:37 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/Makefile.am, libclamav/Makefile.in: fix last commit
+
+ Fri Dec 12 10:28:04 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/Makefile.am, libclamav/Makefile.in, libclamav/others.c,
+ libclamav/others_common.c: make regex available in
+ libclamav_internal_utils.la, split others.c instead of using #ifdef
+ CLI_MEMFUNS_ONLY.
+
+ Thu Dec 11 19:09:36 CET 2008 (acab)
+ -----------------------------------
+ * freshclam/dns.c: small fix to previous commit (bb#1303)
+
+ Thu Dec 11 13:08:20 CET 2008 (acab)
+ -----------------------------------
+ * freshclam/dns.c: add support for TXT aliases
+
+ Wed Dec 10 20:09:00 CET 2008 (tk)
+ ---------------------------------
+ * libclamav: add CL_FLEVEL_DCONF (bb#1313)
+
+ Tue Dec 9 03:32:08 CET 2008 (acab)
+ -----------------------------------
+ * clamconf: skip milter's directives
+
+ Sun Dec 7 16:17:33 CET 2008 (acab)
+ -----------------------------------
+ * configure, m4/resolv.m4: remove stale checks
+
+ Sun Dec 7 15:28:42 CET 2008 (acab)
+ -----------------------------------
+ * clamav-milter: enable building on OpenBSD...
+
+ Sun Dec 7 14:53:17 CET 2008 (acab)
+ -----------------------------------
+ * clamav-milter: enable building on FreeBSD
+
+ Sun Dec 7 13:46:07 CET 2008 (acab)
+ -----------------------------------
+ * clamav-milter: work around stupid milter protoes
+
+ Sun Dec 7 13:38:49 CET 2008 (acab)
+ -----------------------------------
+ * clamav-milter: get rid of some warnings
+
+ Sun Dec 7 12:01:10 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/special.c: add missing type
+
+ Sat Dec 6 16:54:43 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/pe.c, libclamav/special.c, libclamav/special.h: Improve
+ Trojan.Swizzor.Gen detection: do per file statistics in addition to
+ per string. It is amazing how a much simpler rule can do the same
+ job better.
+
+ Thu Dec 4 17:43:01 CET 2008 (acab)
+ -----------------------------------
+ * clamav-milter: r4519:r4536 merge new clamav milter
+ TODO:
+ - present the news on the user ML
+ - update manpage and documentation
+
+ Wed Dec 3 10:27:17 CET 2008 (tk)
+ ---------------------------------
+ * docs/man/freshclam.1.in: document EXIT_n
+
+ Wed Dec 3 00:21:43 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/special.c: use a more precise J48 tree (built from more
+ input data), and lower threshold for detection. This detects ~14%
+ more samples.
+
+ Tue Dec 2 22:00:10 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/dconf.c, libclamav/dconf.h, libclamav/pe.c,
+ libclamav/special.c, libclamav/special.h: Heuristic detection of
+ Trojan.Swizzor.Gen (bb #1310)
+
+ Mon Dec 1 19:51:52 CET 2008 (tk)
+ ---------------------------------
+ * libclamav/matcher-ac.c: fix parsing of lsig modifiers
+
+ Fri Nov 28 18:13:40 CET 2008 (acab)
+ -----------------------------------
+ * shared/cfgparser.c: reenable -Werror builds
+
+ Fri Nov 28 17:42:20 CET 2008 (acab)
+ -----------------------------------
+ * cfgparser: backport modifications from branches/milter-v2.0
+
+ Wed Nov 26 14:04:33 CET 2008 (tk)
---------------------------------
* libclamav/special.c: respect recursion limits in cli_check_jpeg_exploit()
(bb#1266)
@@@ -24,79 -809,221 +809,221 @@@ Tue Nov 25 21:06:55 CET 2008 (tk
---------------------------------
* clamd: LogFileUnlock was not working correctly (bb#1304)
- Fri Nov 21 23:40:19 CET 2008 (tk)
- ---------------------------------
- * freshclam/manager.c: add support for http proxy in SubmitDetectionStats
- (bb#1284)
+ Mon Nov 24 15:17:03 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/Makefile.am, libclamav/Makefile.in, libclamav/others.c:
+ fix disable-unrar build: don't refer to libclamunrar_iface.la with
+ enable-unrar builds (default) warn if can't dlopen. if unrar is
+ disabled, don't warn, just show a debug message.
Thu Nov 20 21:53:39 EET 2008 (edwin)
------------------------------------
* configure, m4/lib-link.m4: more multiarch dir fixes (bb #1277)
+ Thu Nov 20 18:50:12 CET 2008 (tk)
+ ---------------------------------
+ * freshclam/manager.c: add support for http proxy in SubmitDetectionStats
+ (bb#1284)
+
Thu Nov 20 15:55:12 EET 2008 (edwin)
------------------------------------
* configure, m4/lib-link.m4: search in non-multiarch dir (bb #1277)
- Wed Nov 19 20:50:13 EET 2008 (edwin)
- ------------------------------------
- * libclamav/htmlnorm.c: r4396 got merged from trunk w/o the compiler
- warnings fixes, and this resulted in using an uninitialized variable
- (which was not the case on trunk, where the variable was initialized
- already)
+ Wed Nov 19 17:31:50 CET 2008 (acab)
+ -----------------------------------
+ * clamav-milter: typo
Tue Nov 18 23:39:09 EET 2008 (edwin)
------------------------------------
* unit_tests/check_clamd.sh: run reload test twice
- Mon Nov 17 15:45:39 EET 2008 (edwin)
+ Tue Nov 18 20:20:14 CET 2008 (tk)
+ ---------------------------------
+ * libclamav/readdb.c: fix handling of malformed ldb sigs (bb#1292)
+
+ Tue Nov 18 19:33:07 CET 2008 (acab)
+ -----------------------------------
+ * libclamav/mpool.c: a(void*) arithmetic
+
+ Tue Nov 18 18:40:32 CET 2008 (acab)
+ -----------------------------------
+ * configure: enable mempool by default (where available)
+
+ Tue Nov 18 14:06:04 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/libclamav.map, libclamav/mpool.c: remove nonexistent
+ symbols from .map file, add dummy functions.
+
+ Tue Nov 18 13:54:09 EET 2008 (edwin)
------------------------------------
* unit_tests/valgrind.supp: add more valgrind suppressions (bb
- #1283, #1286, #1294)
+ #1283)
Mon Nov 17 16:24:29 EET 2008 (edwin)
------------------------------------
* unit_tests/efence_tests.sh: search in /usr/local/lib for efence
- Wed Nov 19 17:31:50 CET 2008 (acab)
+ Mon Nov 17 15:45:39 EET 2008 (edwin)
+ ------------------------------------
+ * unit_tests/valgrind.supp: add more valgrind suppressions (bb
+ #1283, #1286, #1294)
+
+ Mon Nov 17 13:54:24 CET 2008 (acab)
-----------------------------------
- * clamav-milter: typo
+ * etc/clamd.conf: update description of local vs network mode
- Tue Nov 18 20:20:14 CET 2008 (tk)
+ Sun Nov 16 20:43:15 EET 2008 (edwin)
+ ------------------------------------
+ * unit_tests/efence_tests.sh: use dlsearch instead of search, should
+ improve search for electric-fence
+
+ Sun Nov 16 17:44:39 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/clamdtop.c: Instead of showing all threads show
+ multiscan threads, it is less confusing.
+
+ Sun Nov 16 17:35:23 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/Makefile, contrib/clamdtop/clamdtop.c: fix queue
+ length parsing
+
+ Fri Nov 14 22:24:44 CET 2008 (tk)
---------------------------------
- * libclamav/readdb.c: fix handling of malformed ldb sigs (bb#1292)
+ * libclamav: drop cl_settempdir(); use cl_engine_set() with CL_ENGINE_TMPDIR
+ and CL_ENGINE_KEEPTMP instead
- Fri Nov 7 13:20:08 CET 2008 (tk)
+ Fri Nov 14 18:40:50 EET 2008 (edwin)
+ ------------------------------------
+ * libclamunrar/unrar.c: avoid rar_malloc warnings on damaged files
+ (bb #1290)
+
+ Fri Nov 14 10:21:22 EET 2008 (edwin)
+ ------------------------------------
+ * Makefile.am, contrib/clamdtop/TODO, libclamav/Makefile.am,
+ libclamav/Makefile.in: fix distcheck
+
+ Thu Nov 13 23:00:39 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/clamdtop.c: fix reconnect logic
+
+ Thu Nov 13 19:06:47 CET 2008 (tk)
---------------------------------
- * freshclam/manager.c: improve reporting of server failures (bb#777)
+ * libclamav, clamd, clamscan: use cl_engine_set() to control AC settings
+
+ Thu Nov 13 16:54:24 CET 2008 (acab)
+ -----------------------------------
+ * clamav-milter: prevent races
+
+ Thu Nov 13 17:12:40 EET 2008 (edwin)
+ ------------------------------------
+ * clamd/clamd.c: fix leak. It was a valgrind false-positive because
+ it couldn't see the pointer.
+
+ Thu Nov 13 16:59:47 EET 2008 (edwin)
+ ------------------------------------
+ * unit_tests/Makefile.am, unit_tests/Makefile.in: fix paths
+
+ Thu Nov 13 16:46:46 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/others.c: move cli_rarload. TODO: MEMFUNSONLY should be
+ a separate file!
- Mon Nov 17 22:23:51 CET 2008 (tk)
+ Thu Nov 13 16:27:57 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/Makefile, contrib/clamdtop/clamdtop.c: select a
+ clamd
+
+ Thu Nov 13 15:55:20 CET 2008 (tk)
---------------------------------
- * docs/clamdoc.tex, docs/man/clamd.8.in: document nCOMMANDS (bb#1278)
+ * libclamav: drop options parameter in cl_engine_new(); replace cl_engine_dup()
+ with cl_engine_addref()
- Mon Nov 17 22:20:07 CET 2008 (tk)
+ Thu Nov 13 14:59:39 CET 2008 (tk)
---------------------------------
- * clamscan/manager.c: fix double-slash when scanning the root dir (bb#1263)
+ * libclamav/readdb.c: phishing_done() no longer needs to be called outside
+ cl_engine_free()
- Mon Nov 17 13:54:24 CET 2008 (acab)
+ Thu Nov 13 11:05:20 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/htmlnorm.c: fix memory leak (bb #1291)
+
+ Thu Nov 13 02:11:41 CET 2008 (acab)
-----------------------------------
- * etc/clamd.conf: update description of local vs network mode
+ * libclamav: dlinit in cl_init
- Fri Nov 14 18:59:11 CET 2008 (acab)
+ Thu Nov 13 01:23:39 CET 2008 (acab)
-----------------------------------
- * libclamav/nsis: improve lateny (bb#1180)
+ * clamav-milter/clamav-milter.c: upgrade to new API
+
+ Wed Nov 12 21:33:50 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/TODO, contrib/clamdtop/clamdtop.c: some docs
+
+ Wed Nov 12 20:12:09 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/clamdtop.c: fix some leaks and crashes
+
+ Wed Nov 12 19:32:17 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/readdb.c, libltdl/Makefile.am, libltdl/Makefile.in: Fix
+ -Werror build: there is no libltdl directory when building with
+ VPATH, $(srcdir)/libltdl is enough. Filter -Werror in libltdl.
- Fri Nov 14 18:57:53 CET 2008 (acab)
+ Wed Nov 12 19:03:36 EET 2008 (edwin)
+ ------------------------------------
+ * clamd/thrmgr.c, unit_tests/check_clamav.c,
+ unit_tests/check_regex.c: update unit tests to new API.
+ Initialization order changed, make sure stats_tls_key is
+ initialized.
+
+ Wed Nov 12 17:52:12 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/TODO, contrib/clamdtop/clamdtop.c: refactor, minor fixes
+
+ Wed Nov 12 16:31:34 CET 2008 (tk)
+ ---------------------------------
+ * libclamav: introduce new API calls for engine management (THIS REVISION IS
+ NOT BACKWARD COMPATIBLE): cl_init(), cl_engine_new(),
+ cl_engine_set/get(), cl_engine_compile(), cl_engine_dup(),
+ cl_engine_free(); make minor modifications to other calls;
+ move cl_engine to others.h; integrate limits into cl_engine
+ * clamd, clamscan: use new API; drop hardcoded default limits and depend on
+ those set by libclamav
+ * clamav-milter, unit_tests: TODO, **don't compile in this rev**
+
+ Wed Nov 12 13:06:33 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/Makefile, contrib/clamdtop/TODO,
+ contrib/clamdtop/clamdtop.c: refactor, multiple clamd support.
+ documentation, and detailview to come later.
+
+ Wed Nov 12 11:21:45 CET 2008 (acab)
-----------------------------------
* docs/man/clamav-milter.8.in: avoid hyphen-used-as-minus-sign warnings
- Fri Nov 14 18:40:50 EET 2008 (edwin)
- ------------------------------------
- * libclamunrar/unrar.c: avoid rar_malloc warnings on damaged files
- (bb #1290)
+ Wed Nov 12 00:34:20 CET 2008 (acab)
+ -----------------------------------
+ * build system: build-all into /libclamav to workaround inconsistent
+ local search paths - many thanks Willy and Sherpya for the OSX
+ testing and debugging.
- Thu Nov 13 11:05:20 EET 2008 (edwin)
+ Tue Nov 11 20:42:28 CET 2008 (acab)
+ -----------------------------------
+ * libclamav/nsis: improve lateny (bb#1180)
+
+ Mon Nov 10 20:12:47 EET 2008 (edwin)
------------------------------------
- * libclamav/htmlnorm.c: fix memory leak (bb #1291)
+ * configure, libltdl/: regenerate libltdl/ to get rid of bunch of
+ leftover files.
+
+ Mon Nov 10 18:58:08 CET 2008 (acab)
+ -----------------------------------
+ * m4: fix typo in anonmap detection
+
+ Mon Nov 10 17:45:09 CET 2008 (acab)
+ -----------------------------------
+ * libclamav, libclamunrar, libclamunrar_iface:
+ interface via libltdl (dlopen) - bb#1153
Mon Nov 10 15:09:19 EET 2008 (edwin)
------------------------------------
@@@ -104,6 -1031,178 +1031,178 @@@
some odd reason `echo target.h` was producing 'x', so don't use `echo
ifelse(...`, since ifelse is expanded by aclocal anyway
+ Mon Nov 10 11:46:14 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/matcher-ac.c, libclamav/matcher-ac.h: reduce memory
+ usage of AC nodes
+
+ Sun Nov 9 22:37:29 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/Makefile, contrib/clamdtop/clamdtop.c: clamdtop:
+ Apply mingw32 patches from Gianluigi Tiesi <sherpya*netfarm.it>
+
+ Sat Nov 8 17:24:59 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/blob.h, libclamav/cab.h, libclamav/jsparse/js-norm.c:
+ reorder some struct fields to avoid holes
+
+ Sat Nov 8 05:27:43 CET 2008 (acab)
+ -----------------------------------
+ * libclamav/mpool.c: slightly optimized (we're now faster and more compact
+ than malloc() - it's just because we cheat more :)
+
+ Fri Nov 7 19:37:38 EET 2008 (edwin)
+ ------------------------------------
+ * clamd/, libclamav/, libclamunrar/, unit_tests/: fix more compiler
+ warnings (bb #273)
+
+ Fri Nov 7 13:28:49 CET 2008 (tk)
+ ---------------------------------
+ * freshclam/manager.c: remove unused parameter (bb#1280)
+
+ Fri Nov 7 13:20:08 CET 2008 (tk)
+ ---------------------------------
+ * freshclam/manager.c: improve reporting of server failures (bb#777)
+
+ Fri Nov 7 13:28:03 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/clamdtop.c: fix wrong free (thanks Nigel!)
+
+ Thu Nov 6 23:46:07 EET 2008 (edwin)
+ ------------------------------------
+ * clamav-milter/clamav-milter.c, clamd/thrmgr.c, freshclam/dns.c,
+ libclamav/mspack.c, libclamav/pe.c: fix more compiler warnings (bb
+ #273).
+
+ Thu Nov 6 21:46:47 CET 2008 (tk)
+ ---------------------------------
+ * docs/clamdoc.tex, docs/man/clamd.8.in: document nCOMMANDS (bb#1278)
+
+ Thu Nov 6 15:24:34 EET 2008 (edwin)
+ ------------------------------------
+ * Makefile.am, clamd/, libclamav/, libclamunrar/,
+ libclamunrar_iface/: fix compiler warnings, more to come (bb #273)
+
+ Thu Nov 6 12:29:26 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/clamdtop.c: reconnect if connection is broken use
+ recv/send instead of fdopen on socket
+
+ Thu Nov 6 11:37:08 EET 2008 (edwin)
+ ------------------------------------
+ * clamd/, contrib/, libclamav/: mempool statistics support
+
+ Wed Nov 5 21:49:49 EET 2008 (edwin)
+ ------------------------------------
+ * aclocal.m4, clamav-config.h.in, clamav-milter/, configure,
+ configure.in, libclamav/: have configure define NDEBUG unless we use
+ --enable-debug, instead of having to #ifndef CL_DEBUG #define NDEBUG
+ #endif in each .c file that uses assert. If you want assertions
+ enabled you'll need to use --enable-debug to configure, as until
+ now, no change there.
+
+ Wed Nov 5 21:20:56 CET 2008 (tk)
+ ---------------------------------
+ * clamscan/manager.c: fix double-slash when scanning the root dir (bb#1263)
+
+ Wed Nov 5 19:54:42 CET 2008 (tk)
+ ---------------------------------
+ * unit_tests/virusaction-test.sh: ignore pathnames (bb#1274)
+
+ Wed Nov 5 13:17:51 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/mpool.c, libclamav/mpool.h, libclamav/readdb.c: use
+ ANONYMOUS_MAP from clamav-config.h instead of MAP_ANONYMOUS, fix
+ mp_flush call mp_flush from readdb
+
+ Wed Nov 5 10:56:28 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/mpool.c (mp_destroy): need to use sizeof(*mp) because mp is a pointer here!!
+
+ Tue Nov 4 23:15:43 CET 2008 (acab)
+ -----------------------------------
+ * libclamav: mempool de-uglify last ugly bit
+ please build with ./configure --enable-mempool and report memory usage
+
+ Tue Nov 4 23:02:27 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/TODO: add more TODO notes, thanks nitrox for the
+ feedback!
+
+ Tue Nov 4 22:44:20 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/TODO: add TODO note about reconnecting
+
+ Tue Nov 4 20:50:45 CET 2008 (tk)
+ ---------------------------------
+ * libclamav/matcher-ac.c: micro-optimization (bb#843), thanks to Edwin
+
+ Tue Nov 4 20:47:14 CET 2008 (acab)
+ -----------------------------------
+ * libclamav: mempool de-uglify
+
+ Tue Nov 4 20:15:55 CET 2008 (tk)
+ ---------------------------------
+ * libclamav, clamd: always return correct db version in VERSION (bb#1168)
+
+ Tue Nov 4 13:11:24 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/clamdtop/TODO, contrib/clamdtop/clamdtop.c: fix bar
+ calculation: releasable is part of free mention mempool in TODO
+
+ Tue Nov 4 12:56:46 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/matcher-ac.c (cli_ac_addsig): need to use mpool allocated memory for ->str
+ * libclamav/mpool.c (mp_malloc, cli_mp_hex2str, check_all): introduce hex2str wrapper
+ * libclamav/mpool.h (mp_t, cli_mp_hex2str): introduce hex2str wrapper
+ * libclamav/regex_list.c (add_hash): need to use mpool allocated memory for arg to bm_addpatt
+
+ Tue Nov 4 12:36:29 EET 2008 (edwin)
+ ------------------------------------
+ * libclamav/mpool.c, unit_tests/check_clamav.c,
+ unit_tests/check_matchers.c, unit_tests/check_regex.c: mpool
+ debugging s/USE_MEMPOOL/USE_MPOOL/
+
+ Tue Nov 4 11:36:38 EET 2008 (edwin)
+ ------------------------------------
+ * clamd/thrmgr.c (thrmgr_printstats, IDLE_TASK): add comments
+ * contrib/clamdtop/TODO: more TODO items
+
+ Tue Nov 4 11:32:16 EET 2008 (edwin)
+ ------------------------------------
+ * clamd/thrmgr.c: fix whitespace
+
+ Tue Nov 4 11:29:23 EET 2008 (edwin)
+ ------------------------------------
+ * clamd/session.c: fix mixed statements (bb #1269)
+
+ Tue Nov 4 11:28:09 EET 2008 (edwin)
+ ------------------------------------
+ * clamd/thrmgr.c: use mdprintf instead of fdopen on socket (bb
+ #1270) (thanks to Gianluigi Tiesi <sherpya*netfarm.it>)
+
+ Mon Nov 3 21:05:54 EET 2008 (edwin)
+ ------------------------------------
+ * contrib/, libclamav/, unit_tests/: fix unit tests when mpool is
+ activated
+
+ Sat Nov 1 03:51:58 CET 2008 (acab)
+ -----------------------------------
+ * mempool: New configure option --enable-mempool (requires mmap)
+ To overcome the memory fragmentation issue (bb#1063, bb#1028)
+ in clamd this option allows the databases to be loaded in
+ different memory "pools".
+ As soon as a database is no longer needed its pool is destroyed
+ and the memory is *really* returned to the system.
+ The performace is comparable to that of the glibc allocator,
+ when not better, however there is a small overhead (a few MB)
+ in the initial memory usage (but at least it no longer grows).
+ Thanks a lot sgran for the idea and nitrox for the extensive
+ testing. Please test and report any problem (expecially on
+ non-x86 and non-Linux setups).
+ Make check doesn't currently work with --enable-mempool; this
+ will be fixed soon.
+
Thu Oct 30 17:18:28 CET 2008 (tk)
---------------------------------
* V 0.94.1
@@@ -115,7 -1214,7 +1214,7 @@@ Thu Oct 30 16:47:17 CET 2008 (tk
Thu Oct 30 13:52:42 CET 2008 (acab)
-----------------------------------
* libclamav/vba_extract.c: get_unicode_name off-by-one - bb#1239
- reported by Moritz Jodeit <moritz*jodeit.org>
+ reported by Moritz Jodeit <moritz*jodeit.org>
Thu Oct 30 13:07:53 EET 2008 (edwin)
------------------------------------
@@@ -771,7 -1870,7 +1870,7 @@@ Tue Jul 29 02:44:53 CEST 2008 (acab
Tue Jul 29 02:18:11 CEST 2008 (acab)
------------------------------------
* libclamav/autoit.c: rely on generic text normalization for
- unicode scripts
+ unicode scripts
* test: add clam.ea05.exe, clam.ea06.exe
Mon Jul 28 21:04:53 CEST 2008 (acab)
diff --combined README
index b1ff405,ecc75b3..75c8180
--- a/README
+++ b/README
@@@ -2,16 -2,67 +2,76 @@@ Note: This README/NEWS file refers to t
here may not be available in binary packages.
--
+0.94.2
+------
+
+This is a bugfix release, please refer to the ChangeLog for a complete
+list of changes.
+
+--
+The ClamAV team (http://www.clamav.net/team)
+
+ 0.95rc1
+ -------
+
+ ClamAV 0.95rc1 introduces many bugfixes, improvements and additions. To make
+ the transition easier, we put various tips and upgrade notes on this page:
+ https://wiki.clamav.net/Main/UpgradeNotes095
+
+ The following are the key features of this release:
+
+ - New clamav-milter: The program has been redesigned and rewritten from
+ scratch. The most notable difference is that the internal mode has been
+ dropped which means that now a working clamd companion is required.
+ The milter now also has its own configuration file.
+
+ - Clamd extensions: The protocol has been extended to lighten the load
+ that clamd puts on the system, solve limitations of the old protocol,
+ and reduce latency when signature updates are received. Fore more
+ information about the new extensions please see the official
+ documentation and the upgrade notes.
+
+ - Improved API: The API used to program ClamAV's engine (libclamav) has
+ been redesigned to use modern object-oriented techniques and solves
+ various API/ABI compatibility issues between old and new releases.
+ You can find more information in Section 6 of clamdoc.pdf and in
+ the upgrade notes.
+
+ - ClamdTOP: This is a new program that allows system administrators to
+ monitor clamd. It provides information about the items in the clamd's
+ queue, clamd's memory usage, and the version of the signature database,
+ all in real-time and in nice curses-based interface.
+
+ - Memory Pool Allocator: Libclamav now includes its own memory pool
+ allocator based on memory mapping. This new solution replaces the
+ traditional malloc/free system for the copy of the signatures that
+ is kept in memory. As a result, clamd requires much less memory,
+ particularly when signature updates are received and the database is
+ loaded into memory.
+
+ - Unified Option Parser: Prior to version 0.95 each program in ClamAV's
+ suite of programs had its own set of runtime options. The new general
+ parser brings consistency of use and validation to these options across
+ the suite. Some command line switches of clamscan have been renamed
+ (the old ones will still be accepted but will have no effect and will
+ result in warnings), please see clamscan(1) and clamscan --help for
+ the details.
+
+ --
+ The ClamAV team (http://www.clamav.net/team)
+
+
+ 0.94.2
+ ------
+
+ This is a bugfix release, please refer to the ChangeLog for a complete
+ list of changes.
+
+ --
+ The ClamAV team (http://www.clamav.net/team)
+
+
0.94.1
------
diff --combined configure
index 5c32986,002b25e..70b6043
--- a/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for clamav devel.
+# Generated by GNU Autoconf 2.61 for clamav 0.94.2.
#
# Report bugs to <http://bugs.clamav.net/>.
#
@@@ -551,6 -551,8 +551,8 @@@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_c
+ lt_ltdl_dir='libltdl'
+
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@@ -723,8 -725,8 +725,8 @@@ SHELL=${CONFIG_SHELL-/bin/sh
# Identity of this package.
PACKAGE_NAME='clamav'
PACKAGE_TARNAME='clamav'
-PACKAGE_VERSION='devel'
-PACKAGE_STRING='clamav devel'
+PACKAGE_VERSION='0.94.2'
+PACKAGE_STRING='clamav 0.94.2'
PACKAGE_BUGREPORT='http://bugs.clamav.net/'
ac_unique_file="clamscan/clamscan.c"
@@@ -872,6 -874,24 +874,24 @@@ LIP
OTOOL
OTOOL64
CPP
+ LIBLTDL
+ LTDLDEPS
+ LTDLINCL
+ INCLTDL
+ LT_DLLOADERS
+ LIBADD_DLOPEN
+ LIBADD_SHL_LOAD
+ LIBADD_DLD_LINK
+ LT_DLPREOPEN
+ LIBADD_DL
+ sys_symbol_underscore
+ ARGZ_H
+ INSTALL_LTDL_TRUE
+ INSTALL_LTDL_FALSE
+ CONVENIENCE_LTDL_TRUE
+ CONVENIENCE_LTDL_FALSE
+ LT_CONFIG_H
+ LTDLOPEN
DISTCHECK_ENABLE_FLAGS_TRUE
DISTCHECK_ENABLE_FLAGS_FALSE
VERSIONSCRIPTFLAG
@@@ -893,10 -913,10 +913,10 @@@ MAIN
LIBBZ2
LTLIBBZ2
LIBBZ2_PREFIX
- HAVE_LIBGMP
- LIBGMP
- LTLIBGMP
- LIBGMP_PREFIX
+ ENABLE_UNRAR_TRUE
+ ENABLE_UNRAR_FALSE
+ LINK_TOMMATH_TRUE
+ LINK_TOMMATH_FALSE
DBDIR
CFGDIR
LIBCLAMAV_LIBS
@@@ -905,19 -925,21 +925,21 @@@ CLAMAV_MILTER_LIB
FRESHCLAM_LIBS
TH_SAFE
THREAD_LIBS
- sendmailprog
BUILD_CLAMD_TRUE
BUILD_CLAMD_FALSE
HAVE_MILTER_TRUE
HAVE_MILTER_FALSE
GETENT
CLAMAVUSER
CLAMAVGROUP
+ CURSES_CPPFLAGS
+ CURSES_LIBS
+ HAVE_CURSES_TRUE
+ HAVE_CURSES_FALSE
LIBOBJS
- LTLIBOBJS'
+ LTLIBOBJS
+ ltdl_LIBOBJS
+ ltdl_LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
host_alias
@@@ -1430,7 -1452,7 +1452,7 @@@ if test "$ac_init_help" = "long"; the
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures clamav devel to adapt to many kinds of systems.
+\`configure' configures clamav 0.94.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@@ -1501,7 -1523,7 +1523,7 @@@ f
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of clamav devel:";;
+ short | recursive ) echo "Configuration of clamav 0.94.2:";;
esac
cat <<\_ACEOF
@@@ -1515,8 -1537,10 +1537,10 @@@ Optional Features
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-ltdl-install install libltdl
--disable-gcc-vcheck do not check for buggy gcc version
--enable-experimental enable experimental code
+ --disable-mempool disable memory pools
--enable-check Enable 'check' unit tests (default=auto)
--disable-rpath do not hardcode runtime library paths
--enable-coverage turn on test coverage [default=no]
@@@ -1531,7 -1555,6 +1555,6 @@@
DNS
--disable-clamuko disable clamuko support (Linux, DragonFly and FreeBSD only)
--enable-milter build clamav-milter
- --disable-dsig disable support for digital signatures
--disable-pthreads disable POSIX threads support
--disable-cr don't link with C reentrant library (BSD)
--enable-id-check use id utility instead of /etc/passwd parsing
@@@ -1544,6 -1567,7 +1567,7 @@@
--disable-gethostbyname_r disable support for gethostbyname_r
--enable-readdir_r enable support for readdir_r
--disable-fdpassing don't build file descriptor passing support
+ --enable-clamdtop Enable 'clamdtop' tool [default=auto]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@@ -1551,6 -1575,9 +1575,9 @@@
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-included-ltdl use the GNU ltdl sources included here
+ --with-ltdl-include=DIR use the ltdl headers installed in DIR
+ --with-ltdl-lib=DIR use the libltdl.la installed in DIR
--with-fpu-words-bigendian=(yes/no/auto) specify FPU endianess (default=auto)
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libcheck-prefix[=DIR] search for libcheck in DIR/include and DIR/lib
@@@ -1559,15 -1586,15 +1586,15 @@@
/usr/local or /usr if not found in /usr/local)
--with-libbz2-prefix[=DIR] search for libbz2 in DIR/include and DIR/lib
--without-libbz2-prefix don't search for libbz2 in includedir and libdir
- --with-libgmp-prefix[=DIR] search for libgmp in DIR/include and DIR/lib
- --without-libgmp-prefix don't search for libgmp in includedir and libdir
+ --with-system-tommath link against system libtommath (default = no, use bundled)
--with-iconv supports iconv() (default=auto)
--with-user=uid name of the clamav user (default=clamav)
--with-group=gid name of the clamav group (default=clamav)
--with-dbdir=path path to virus database directory
- --with-sendmail=PATH specify location of Sendmail binary (default=auto find)
- --with-sendmail-version=VERSION specify version of Sendmail (default=auto find)
- --with-tcpwrappers support hosts.allow / hosts.deny (default=auto)
+ --with-libncurses-prefix[=DIR] search for libncurses in DIR/include and DIR/lib
+ --without-libncurses-prefix don't search for libncurses in includedir and libdir
+ --with-libpdcurses-prefix[=DIR] search for libpdcurses in DIR/include and DIR/lib
+ --without-libpdcurses-prefix don't search for libpdcurses in includedir and libdir
Some influential environment variables:
CC C compiler command
@@@ -1643,7 -1670,7 +1670,7 @@@ f
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-clamav configure devel
+clamav configure 0.94.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@@ -1657,7 -1684,7 +1684,7 @@@ cat >config.log <<_ACEO
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by clamav $as_me devel, which was
+It was created by clamav $as_me 0.94.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@@ -2667,7 -2694,7 +2694,7 @@@ f
# Define the identity of the package.
PACKAGE='clamav'
- VERSION='devel'
+ VERSION='0.94.2'
# Some tools Automake needs.
@@@ -2811,15 -2838,15 +2838,15 @@@ cat >>confdefs.h <<\_ACEO
_ACEOF
-VERSION="devel-`date +%Y%m%d`"
+VERSION="0.94.2"
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
_ACEOF
- LC_CURRENT=5
- LC_REVISION=4
+ LC_CURRENT=6
+ LC_REVISION=0
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
@@@ -2988,6 -3015,14 +3015,14 @@@ echo "${ECHO_T}no" >&6;
fi
+
+
+
+
+
+
+
+
case `pwd` in
*\ * | *\ *)
{ echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@@ -4755,13 -4790,13 +4790,13 @@@ if test "${lt_cv_nm_interface+set}" = s
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4758: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4793: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4761: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4796: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4764: output\"" >&5)
+ (eval echo "\"\$as_me:4799: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@@ -5972,7 -6007,7 +6007,7 @@@ ia64-*-hpux*
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5975 "configure"' > conftest.$ac_ext
+ echo '#line 6010 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@@ -7324,11 -7359,10 +7359,10 @@@ don
# Set options
+ enable_dlopen=yes
- enable_dlopen=no
-
enable_win32_dll=no
@@@ -7823,11 -7857,11 +7857,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7826: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7860: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7830: \$? = $ac_status" >&5
+ echo "$as_me:7864: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@@ -8162,11 -8196,11 +8196,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8165: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8199: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8169: \$? = $ac_status" >&5
+ echo "$as_me:8203: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@@ -8267,11 -8301,11 +8301,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8270: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8304: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8274: \$? = $ac_status" >&5
+ echo "$as_me:8308: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@@ -8322,11 -8356,11 +8356,11 @@@ els
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8325: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8359: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8329: \$? = $ac_status" >&5
+ echo "$as_me:8363: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@@ -11078,7 -11112,7 +11112,7 @@@ els
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
- #line 11081 "configure"
+ #line 11115 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@@ -11174,7 -11208,7 +11208,7 @@@ els
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
- #line 11177 "configure"
+ #line 11211 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@@ -11401,6 -11435,2037 +11435,2037 @@@ CC="$lt_save_CC
# Only expand once:
+ { echo "$as_me:$LINENO: checking which extension is used for runtime loadable modules" >&5
+ echo $ECHO_N "checking which extension is used for runtime loadable modules... $ECHO_C" >&6; }
+ if test "${libltdl_cv_shlibext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ module=yes
+ eval libltdl_cv_shlibext=$shrext_cmds
+
+ fi
+ { echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
+ echo "${ECHO_T}$libltdl_cv_shlibext" >&6; }
+ if test -n "$libltdl_cv_shlibext"; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define LT_MODULE_EXT "$libltdl_cv_shlibext"
+ _ACEOF
+
+ fi
+
+ { echo "$as_me:$LINENO: checking which variable specifies run-time module search path" >&5
+ echo $ECHO_N "checking which variable specifies run-time module search path... $ECHO_C" >&6; }
+ if test "${lt_cv_module_path_var+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_module_path_var="$shlibpath_var"
+ fi
+ { echo "$as_me:$LINENO: result: $lt_cv_module_path_var" >&5
+ echo "${ECHO_T}$lt_cv_module_path_var" >&6; }
+ if test -n "$lt_cv_module_path_var"; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define LT_MODULE_PATH_VAR "$lt_cv_module_path_var"
+ _ACEOF
+
+ fi
+
+ { echo "$as_me:$LINENO: checking for the default library search path" >&5
+ echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_dlsearch_path+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"
+ fi
+ { echo "$as_me:$LINENO: result: $lt_cv_sys_dlsearch_path" >&5
+ echo "${ECHO_T}$lt_cv_sys_dlsearch_path" >&6; }
+ if test -n "$lt_cv_sys_dlsearch_path"; then
+ sys_dlsearch_path=
+ for dir in $lt_cv_sys_dlsearch_path; do
+ if test -z "$sys_dlsearch_path"; then
+ sys_dlsearch_path="$dir"
+ else
+ sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir"
+ fi
+ done
+
+ cat >>confdefs.h <<_ACEOF
+ #define LT_DLSEARCH_PATH "$sys_dlsearch_path"
+ _ACEOF
+
+ fi
+
+
+ LT_DLLOADERS=
+
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ LIBADD_DLOPEN=
+ { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
+ echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_search_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char dlopen ();
+ int
+ main ()
+ {
+ return dlopen ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ for ac_lib in '' dl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_search_dlopen=$ac_res
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search_dlopen+set}" = set; then
+ break
+ fi
+ done
+ if test "${ac_cv_search_dlopen+set}" = set; then
+ :
+ else
+ ac_cv_search_dlopen=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
+ echo "${ECHO_T}$ac_cv_search_dlopen" >&6; }
+ ac_res=$ac_cv_search_dlopen
+ if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBDL 1
+ _ACEOF
+
+ if test "$ac_cv_search_dlopen" != "none required" ; then
+ LIBADD_DLOPEN="-ldl"
+ fi
+ libltdl_cv_lib_dl_dlopen="yes"
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #if HAVE_DLFCN_H
+ # include <dlfcn.h>
+ #endif
+
+ int
+ main ()
+ {
+ dlopen(0, 0);
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBDL 1
+ _ACEOF
+
+ libltdl_cv_func_dlopen="yes"
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+ echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsvld $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char dlopen ();
+ int
+ main ()
+ {
+ return dlopen ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_svld_dlopen=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_svld_dlopen=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+ echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+ if test $ac_cv_lib_svld_dlopen = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBDL 1
+ _ACEOF
+
+ LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes"
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
+ fi
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+
+ if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
+ then
+ lt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBADD_DLOPEN"
+
+ for ac_func in dlerror
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+ #define $ac_func innocuous_$ac_func
+
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
+
+ #undef $ac_func
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+ #if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+ #endif
+
+ int
+ main ()
+ {
+ return $ac_func ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+ done
+
+ LIBS="$lt_save_LIBS"
+ fi
+
+
+ LIBADD_SHL_LOAD=
+ { echo "$as_me:$LINENO: checking for shl_load" >&5
+ echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+ #define shl_load innocuous_shl_load
+
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shl_load (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
+
+ #undef shl_load
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char shl_load ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+ #if defined __stub_shl_load || defined __stub___shl_load
+ choke me
+ #endif
+
+ int
+ main ()
+ {
+ return shl_load ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_shl_load=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_shl_load=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+ echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+ if test $ac_cv_func_shl_load = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SHL_LOAD 1
+ _ACEOF
+
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
+ else
+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+ echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char shl_load ();
+ int
+ main ()
+ {
+ return shl_load ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_shl_load=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dld_shl_load=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SHL_LOAD 1
+ _ACEOF
+
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
+ LIBADD_SHL_LOAD="-ldld"
+ fi
+
+ fi
+
+
+
+ case $host_os in
+ darwin[1567].*)
+ # We only want this for pre-Mac OS X 10.4.
+ { echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5
+ echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6; }
+ if test "${ac_cv_func__dyld_func_lookup+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Define _dyld_func_lookup to an innocuous variant, in case <limits.h> declares _dyld_func_lookup.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+ #define _dyld_func_lookup innocuous__dyld_func_lookup
+
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char _dyld_func_lookup (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
+
+ #undef _dyld_func_lookup
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char _dyld_func_lookup ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+ #if defined __stub__dyld_func_lookup || defined __stub____dyld_func_lookup
+ choke me
+ #endif
+
+ int
+ main ()
+ {
+ return _dyld_func_lookup ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func__dyld_func_lookup=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func__dyld_func_lookup=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5
+ echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6; }
+ if test $ac_cv_func__dyld_func_lookup = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_DYLD 1
+ _ACEOF
+
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"
+ fi
+
+ ;;
+ beos*)
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
+ ;;
+ cygwin* | mingw* | os2* | pw32*)
+ { echo "$as_me:$LINENO: checking whether cygwin_conv_path is declared" >&5
+ echo $ECHO_N "checking whether cygwin_conv_path is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_cygwin_conv_path+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <sys/cygwin.h>
+
+ int
+ main ()
+ {
+ #ifndef cygwin_conv_path
+ (void) cygwin_conv_path;
+ #endif
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_cygwin_conv_path=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_cygwin_conv_path=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_have_decl_cygwin_conv_path" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_cygwin_conv_path" >&6; }
+ if test $ac_cv_have_decl_cygwin_conv_path = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_CYGWIN_CONV_PATH 1
+ _ACEOF
+
+
+ else
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_CYGWIN_CONV_PATH 0
+ _ACEOF
+
+
+ fi
+
+
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
+ ;;
+ esac
+
+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+ echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char dld_link ();
+ int
+ main ()
+ {
+ return dld_link ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_dld_link=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dld_dld_link=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_DLD 1
+ _ACEOF
+
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"
+ fi
+
+
+
+
+ LT_DLPREOPEN=
+ if test -n "$LT_DLLOADERS"
+ then
+ for lt_loader in $LT_DLLOADERS; do
+ LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader "
+ done
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBDLLOADER 1
+ _ACEOF
+
+ fi
+
+
+ LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
+
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ { echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
+ echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_symbol_underscore+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ lt_cv_sys_symbol_underscore=no
+ cat > conftest.$ac_ext <<_LT_EOF
+ void nm_test_func(){}
+ int main(){nm_test_func;return 0;}
+ _LT_EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Now try to grab the symbols.
+ ac_nlist=conftest.nm
+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5
+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s "$ac_nlist"; then
+ # See whether the symbols have a leading underscore.
+ if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
+ lt_cv_sys_symbol_underscore=yes
+ else
+ if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
+ :
+ else
+ echo "configure: cannot find nm_test_func in $ac_nlist" >&5
+ fi
+ fi
+ else
+ echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&5
+ fi
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.c >&5
+ fi
+ rm -rf conftest*
+
+ fi
+ { echo "$as_me:$LINENO: result: $lt_cv_sys_symbol_underscore" >&5
+ echo "${ECHO_T}$lt_cv_sys_symbol_underscore" >&6; }
+ sys_symbol_underscore=$lt_cv_sys_symbol_underscore
+
+
+ if test x"$lt_cv_sys_symbol_underscore" = xyes; then
+ if test x"$libltdl_cv_func_dlopen" = xyes ||
+ test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
+ { echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
+ echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6; }
+ if test "${libltdl_cv_need_uscore+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ libltdl_cv_need_uscore=unknown
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBADD_DLOPEN"
+ if test "$cross_compiling" = yes; then :
+ libltdl_cv_need_uscore=cross
+ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+ #line 12326 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+ #include <dlfcn.h>
+ #endif
+
+ #include <stdio.h>
+
+ #ifdef RTLD_GLOBAL
+ # define LT_DLGLOBAL RTLD_GLOBAL
+ #else
+ # ifdef DL_GLOBAL
+ # define LT_DLGLOBAL DL_GLOBAL
+ # else
+ # define LT_DLGLOBAL 0
+ # endif
+ #endif
+
+ /* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+ #ifndef LT_DLLAZY_OR_NOW
+ # ifdef RTLD_LAZY
+ # define LT_DLLAZY_OR_NOW RTLD_LAZY
+ # else
+ # ifdef DL_LAZY
+ # define LT_DLLAZY_OR_NOW DL_LAZY
+ # else
+ # ifdef RTLD_NOW
+ # define LT_DLLAZY_OR_NOW RTLD_NOW
+ # else
+ # ifdef DL_NOW
+ # define LT_DLLAZY_OR_NOW DL_NOW
+ # else
+ # define LT_DLLAZY_OR_NOW 0
+ # endif
+ # endif
+ # endif
+ # endif
+ #endif
+
+ void fnord() { int i=42;}
+ int main ()
+ {
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
+
+ return status;
+ }
+ _LT_EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) libltdl_cv_need_uscore=no ;;
+ x$lt_dlneed_uscore) libltdl_cv_need_uscore=yes ;;
+ x$lt_dlunknown|x*) ;;
+ esac
+ else :
+ # compilation failed
+
+ fi
+ fi
+ rm -fr conftest*
+
+ LIBS="$save_LIBS"
+
+ fi
+ { echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
+ echo "${ECHO_T}$libltdl_cv_need_uscore" >&6; }
+ fi
+ fi
+
+ if test x"$libltdl_cv_need_uscore" = xyes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define NEED_USCORE 1
+ _ACEOF
+
+ fi
+
+ { echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
+ echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_dlopen_deplibs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ # PORTME does your system automatically load deplibs for dlopen?
+ # or its logical equivalent (e.g. shl_load for HP-UX < 11)
+ # For now, we just catch OSes we know something about -- in the
+ # future, we'll try test this programmatically.
+ lt_cv_sys_dlopen_deplibs=unknown
+ case $host_os in
+ aix3*|aix4.1.*|aix4.2.*)
+ # Unknown whether this is true for these versions of AIX, but
+ # we want this `case' here to explicitly catch those versions.
+ lt_cv_sys_dlopen_deplibs=unknown
+ ;;
+ aix[4-9]*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ lt_cv_sys_dlopen_deplibs=no
+ ;;
+ esac
+ ;;
+ darwin*)
+ # Assuming the user has installed a libdl from somewhere, this is true
+ # If you are looking for one http://www.opendarwin.org/projects/dlcompat
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ freebsd* | dragonfly*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ gnu* | linux* | k*bsd*-gnu)
+ # GNU and its variants, using gnu ld.so (Glibc)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ hpux10*|hpux11*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ interix*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ irix[12345]*|irix6.[01]*)
+ # Catch all versions of IRIX before 6.2, and indicate that we don't
+ # know how it worked for any of those versions.
+ lt_cv_sys_dlopen_deplibs=unknown
+ ;;
+ irix*)
+ # The case above catches anything before 6.2, and it's known that
+ # at 6.2 and later dlopen does load deplibs.
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ netbsd*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ openbsd*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ osf[1234]*)
+ # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
+ # it did *not* use an RPATH in a shared library to find objects the
+ # library depends on, so we explicitly say `no'.
+ lt_cv_sys_dlopen_deplibs=no
+ ;;
+ osf5.0|osf5.0a|osf5.1)
+ # dlopen *does* load deplibs and with the right loader patch applied
+ # it even uses RPATH in a shared library to search for shared objects
+ # that the library depends on, but there's no easy way to know if that
+ # patch is installed. Since this is the case, all we can really
+ # say is unknown -- it depends on the patch being installed. If
+ # it is, this changes to `yes'. Without it, it would be `no'.
+ lt_cv_sys_dlopen_deplibs=unknown
+ ;;
+ osf*)
+ # the two cases above should catch all versions of osf <= 5.1. Read
+ # the comments above for what we know about them.
+ # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
+ # is used to find them so we can finally say `yes'.
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ qnx*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ solaris*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ libltdl_cv_sys_dlopen_deplibs=yes
+ ;;
+ esac
+
+ fi
+ { echo "$as_me:$LINENO: result: $lt_cv_sys_dlopen_deplibs" >&5
+ echo "${ECHO_T}$lt_cv_sys_dlopen_deplibs" >&6; }
+ if test "$lt_cv_sys_dlopen_deplibs" != yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define LTDL_DLOPEN_DEPLIBS 1
+ _ACEOF
+
+ fi
+
+ :
+
+
+ for ac_header in argz.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
+ done
+
+
+ { echo "$as_me:$LINENO: checking for error_t" >&5
+ echo $ECHO_N "checking for error_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_error_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #if defined(HAVE_ARGZ_H)
+ # include <argz.h>
+ #endif
+
+ typedef error_t ac__type_new_;
+ int
+ main ()
+ {
+ if ((ac__type_new_ *) 0)
+ return 0;
+ if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_error_t=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_error_t=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5
+ echo "${ECHO_T}$ac_cv_type_error_t" >&6; }
+ if test $ac_cv_type_error_t = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_ERROR_T 1
+ _ACEOF
+
+
+ else
+
+ cat >>confdefs.h <<\_ACEOF
+ #define error_t int
+ _ACEOF
+
+
+ cat >>confdefs.h <<\_ACEOF
+ #define __error_t_defined 1
+ _ACEOF
+
+ fi
+
+
+ ARGZ_H=
+
+
+
+
+
+
+
+ for ac_func in argz_add argz_append argz_count argz_create_sep argz_insert \
+ argz_next argz_stringify
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+ #define $ac_func innocuous_$ac_func
+
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
+
+ #undef $ac_func
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+ #if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+ #endif
+
+ int
+ main ()
+ {
+ return $ac_func ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ else
+ ARGZ_H=argz.h;
+
+ _LT_LIBOBJS="$_LT_LIBOBJS argz.$ac_objext"
+
+ fi
+ done
+
+
+ if test -z "$ARGZ_H"; then
+ { echo "$as_me:$LINENO: checking if argz actually works" >&5
+ echo $ECHO_N "checking if argz actually works... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_argz_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $host_os in #(
+ *cygwin*)
+ lt_cv_sys_argz_works=no
+ if test "$cross_compiling" != no; then
+ lt_cv_sys_argz_works="guessing no"
+ else
+ lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
+ save_IFS=$IFS
+ IFS=-.
+ set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
+ IFS=$save_IFS
+ lt_os_major=${2-0}
+ lt_os_minor=${3-0}
+ lt_os_micro=${4-0}
+ if test "$lt_os_major" -gt 1 \
+ || { test "$lt_os_major" -eq 1 \
+ && { test "$lt_os_minor" -gt 5 \
+ || { test "$lt_os_minor" -eq 5 \
+ && test "$lt_os_micro" -gt 24; }; }; }; then
+ lt_cv_sys_argz_works=yes
+ fi
+ fi
+ ;; #(
+ *) lt_cv_sys_argz_works=yes ;;
+ esac
+ fi
+ { echo "$as_me:$LINENO: result: $lt_cv_sys_argz_works" >&5
+ echo "${ECHO_T}$lt_cv_sys_argz_works" >&6; }
+ if test $lt_cv_sys_argz_works = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_WORKING_ARGZ 1
+ _ACEOF
+
+ else
+ ARGZ_H=argz.h
+
+
+ _LT_LIBOBJS="$_LT_LIBOBJS argz.$ac_objext"
+
+ fi
+
+ fi
+
+
+
+
+ { echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
+ echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6; }
+ if test "${libltdl_cv_preloaded_symbols+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$lt_cv_sys_global_symbol_pipe"; then
+ libltdl_cv_preloaded_symbols=yes
+ else
+ libltdl_cv_preloaded_symbols=no
+ fi
+
+ fi
+ { echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
+ echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6; }
+ if test x"$libltdl_cv_preloaded_symbols" = xyes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PRELOADED_SYMBOLS 1
+ _ACEOF
+
+ fi
+
+ # Set options
+
+
+
+
+
+
+
+
+
+
+
+ # Check whether --with-included_ltdl was given.
+ if test "${with_included_ltdl+set}" = set; then
+ withval=$with_included_ltdl;
+ fi
+
+
+ if test "x$with_included_ltdl" != xyes; then
+ # We are not being forced to use the included libltdl sources, so
+ # decide whether there is a useful installed version we can use.
+ { echo "$as_me:$LINENO: checking for ltdl.h" >&5
+ echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ltdl_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+
+
+ #include <ltdl.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_ltdl_h=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_ltdl_h=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
+ echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6; }
+ if test $ac_cv_header_ltdl_h = yes; then
+ { echo "$as_me:$LINENO: checking whether lt_dlinterface_register is declared" >&5
+ echo $ECHO_N "checking whether lt_dlinterface_register is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_lt_dlinterface_register+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+ #include <ltdl.h>
+
+ int
+ main ()
+ {
+ #ifndef lt_dlinterface_register
+ (void) lt_dlinterface_register;
+ #endif
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_lt_dlinterface_register=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_lt_dlinterface_register=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_have_decl_lt_dlinterface_register" >&5
+ echo "${ECHO_T}$ac_cv_have_decl_lt_dlinterface_register" >&6; }
+ if test $ac_cv_have_decl_lt_dlinterface_register = yes; then
+ { echo "$as_me:$LINENO: checking for lt_dladvise_preload in -lltdl" >&5
+ echo $ECHO_N "checking for lt_dladvise_preload in -lltdl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ltdl_lt_dladvise_preload+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lltdl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char lt_dladvise_preload ();
+ int
+ main ()
+ {
+ return lt_dladvise_preload ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_ltdl_lt_dladvise_preload=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ltdl_lt_dladvise_preload=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dladvise_preload" >&5
+ echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dladvise_preload" >&6; }
+ if test $ac_cv_lib_ltdl_lt_dladvise_preload = yes; then
+ with_included_ltdl=no
+ else
+ with_included_ltdl=yes
+ fi
+
+ else
+ with_included_ltdl=yes
+ fi
+
+ else
+ with_included_ltdl=yes
+ fi
+
+
+ fi
+
+
+
+
+ # Check whether --with-ltdl_include was given.
+ if test "${with_ltdl_include+set}" = set; then
+ withval=$with_ltdl_include;
+ fi
+
+
+ if test -n "$with_ltdl_include"; then
+ if test -f "$with_ltdl_include/ltdl.h"; then :
+ else
+ { { echo "$as_me:$LINENO: error: invalid ltdl include directory: \`$with_ltdl_include'" >&5
+ echo "$as_me: error: invalid ltdl include directory: \`$with_ltdl_include'" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ else
+ with_ltdl_include=no
+ fi
+
+
+ # Check whether --with-ltdl_lib was given.
+ if test "${with_ltdl_lib+set}" = set; then
+ withval=$with_ltdl_lib;
+ fi
+
+
+ if test -n "$with_ltdl_lib"; then
+ if test -f "$with_ltdl_lib/libltdl.la"; then :
+ else
+ { { echo "$as_me:$LINENO: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&5
+ echo "$as_me: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ else
+ with_ltdl_lib=no
+ fi
+
+ case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
+ ,yes,no,no,)
+ case $enable_ltdl_convenience in
+ no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
+ echo "$as_me: error: this package needs a convenience libltdl" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ "") enable_ltdl_convenience=yes
+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+ esac
+ LIBLTDL='${top_builddir}/'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
+ LTDLDEPS=$LIBLTDL
+ LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
+
+
+
+
+
+ # For backwards non-gettext consistent compatibility...
+ INCLTDL="$LTDLINCL"
+
+
+ ;;
+ ,no,no,no,)
+ # If the included ltdl is not to be used, then use the
+ # preinstalled libltdl we found.
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LTDL 1
+ _ACEOF
+
+ LIBLTDL=-lltdl
+ LTDLDEPS=
+ LTDLINCL=
+ ;;
+ ,no*,no,*)
+ { { echo "$as_me:$LINENO: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&5
+ echo "$as_me: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ *) with_included_ltdl=no
+ LIBLTDL="-L$with_ltdl_lib -lltdl"
+ LTDLDEPS=
+ LTDLINCL="-I$with_ltdl_include"
+ ;;
+ esac
+ INCLTDL="$LTDLINCL"
+
+ # Report our decision...
+ { echo "$as_me:$LINENO: checking where to find libltdl headers" >&5
+ echo $ECHO_N "checking where to find libltdl headers... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $LTDLINCL" >&5
+ echo "${ECHO_T}$LTDLINCL" >&6; }
+ { echo "$as_me:$LINENO: checking where to find libltdl library" >&5
+ echo $ECHO_N "checking where to find libltdl library... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $LIBLTDL" >&5
+ echo "${ECHO_T}$LIBLTDL" >&6; }
+
+
+
+ # Check whether --enable-ltdl-install was given.
+ if test "${enable_ltdl_install+set}" = set; then
+ enableval=$enable_ltdl_install;
+ fi
+
+
+ case ,${enable_ltdl_install},${enable_ltdl_convenience} in
+ *yes*) ;;
+ *) enable_ltdl_convenience=yes ;;
+ esac
+
+ if test x"${enable_ltdl_install-no}" != xno; then
+ INSTALL_LTDL_TRUE=
+ INSTALL_LTDL_FALSE='#'
+ else
+ INSTALL_LTDL_TRUE='#'
+ INSTALL_LTDL_FALSE=
+ fi
+
+ if test x"${enable_ltdl_convenience-no}" != xno; then
+ CONVENIENCE_LTDL_TRUE=
+ CONVENIENCE_LTDL_FALSE='#'
+ else
+ CONVENIENCE_LTDL_TRUE='#'
+ CONVENIENCE_LTDL_FALSE=
+ fi
+
+
+
+
+
+
+ # In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS
+ # the user used. This is so that ltdl.h can pick up the parent projects
+ # config.h file, The first file in AC_CONFIG_HEADERS must contain the
+ # definitions required by ltdl.c.
+ # FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
+
+
+
+
+
+
+
+
+
+ for ac_header in unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
+ done
+
+
+
+
+
+ for ac_func in closedir opendir readdir
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+ #define $ac_func innocuous_$ac_func
+
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
+
+ #undef $ac_func
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+ #if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+ #endif
+
+ int
+ main ()
+ {
+ return $ac_func ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ else
+
+
+ _LT_LIBOBJS="$_LT_LIBOBJS lt__dirent.$ac_objext"
+
+ fi
+ done
+
+
+
+ for ac_func in strlcat strlcpy
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+ #define $ac_func innocuous_$ac_func
+
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
+
+ #undef $ac_func
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+ #if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+ #endif
+
+ int
+ main ()
+ {
+ return $ac_func ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ else
+
+
+ _LT_LIBOBJS="$_LT_LIBOBJS lt__strl.$ac_objext"
+
+ fi
+ done
+
+
+
+ cat >>confdefs.h <<_ACEOF
+ #define LT_LIBEXT "$libext"
+ _ACEOF
+
+
+ name=ltdl
+ LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
+
+
+
+
+
+
+
+
+ # Only expand once:
+
+
+ ac_config_files="$ac_config_files libltdl/Makefile"
+
cat >>confdefs.h <<\_ACEOF
@@@ -13422,6 -15487,74 +15487,74 @@@ cat >>confdefs.h <<_ACEO
_ACEOF
+ { echo "$as_me:$LINENO: checking size of void *" >&5
+ echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_void_p+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include "confdefs.h"
+ #include <sys/types.h>
+
+
+ int
+ main ()
+ {
+ switch (0) case 0: case (sizeof (void *) == $ac_size):;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_sizeof_void_p=$ac_size
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test x$ac_cv_sizeof_void_p != x ; then break; fi
+ done
+
+ fi
+
+ if test x$ac_cv_sizeof_void_p = x ; then
+ { { echo "$as_me:$LINENO: error: cannot determine a size for void *" >&5
+ echo "$as_me: error: cannot determine a size for void *" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
+
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+ _ACEOF
+
+
# Check whether --enable-experimental was given.
if test "${enable_experimental+set}" = set; then
@@@ -13942,6 -16075,232 +16075,232 @@@ _ACEO
fi
+ # Check whether --enable-mempool was given.
+ if test "${enable_mempool+set}" = set; then
+ enableval=$enable_mempool; enable_mempool=$enableval
+ else
+ enable_mempool="yes"
+ fi
+
+ if test "$enable_mempool" = "yes"; then
+ if test "$ac_cv_c_mmap_private" != "yes"; then
+ { echo "$as_me:$LINENO: ****** mempool support disabled (mmap not available or not usable)" >&5
+ echo "$as_me: ****** mempool support disabled (mmap not available or not usable)" >&6;}
+ else
+ { echo "$as_me:$LINENO: checking for getpagesize" >&5
+ echo $ECHO_N "checking for getpagesize... $ECHO_C" >&6; }
+ if test "${ac_cv_func_getpagesize+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Define getpagesize to an innocuous variant, in case <limits.h> declares getpagesize.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+ #define getpagesize innocuous_getpagesize
+
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getpagesize (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
+
+ #undef getpagesize
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char getpagesize ();
+ /* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+ #if defined __stub_getpagesize || defined __stub___getpagesize
+ choke me
+ #endif
+
+ int
+ main ()
+ {
+ return getpagesize ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_getpagesize=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_getpagesize=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_getpagesize" >&5
+ echo "${ECHO_T}$ac_cv_func_getpagesize" >&6; }
+ if test $ac_cv_func_getpagesize = yes; then
+
+
+ { echo "$as_me:$LINENO: checking for MAP_ANON(YMOUS)" >&5
+ echo $ECHO_N "checking for MAP_ANON(YMOUS)... $ECHO_C" >&6; }
+ if test "${ac_cv_c_mmap_anonymous+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ ac_cv_c_mmap_anonymous='no'
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <sys/mman.h>
+ int
+ main ()
+ {
+ mmap((void *)0, 0, PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_c_mmap_anonymous='MAP_ANONYMOUS'
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* OPENBSD WORKAROUND - DND*/
+ #include <sys/types.h>
+ /* OPENBSD WORKAROUND - END*/
+ #include <sys/mman.h>
+
+ int
+ main ()
+ {
+ mmap((void *)0, 0, PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_c_mmap_anonymous='MAP_ANON'
+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_c_mmap_anonymous" >&5
+ echo "${ECHO_T}$ac_cv_c_mmap_anonymous" >&6; }
+ if test "$ac_cv_c_mmap_anonymous" != "no"; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define ANONYMOUS_MAP $ac_cv_c_mmap_anonymous
+ _ACEOF
+
+ fi
+
+ if test "$ac_cv_c_mmap_anonymous" = "no"; then
+ { echo "$as_me:$LINENO: ****** mempool support disabled (anonymous mmap not available)" >&5
+ echo "$as_me: ****** mempool support disabled (anonymous mmap not available)" >&6;}
+ else
+
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_MPOOL 1
+ _ACEOF
+
+ fi
+
+ else
+ { echo "$as_me:$LINENO: ****** mempool support disabled (getpagesize not available)" >&5
+ echo "$as_me: ****** mempool support disabled (getpagesize not available)" >&6;}
+ fi
+
+ fi
+ fi
+
enable_check_ut=auto
enable_ut_install=no
# Check whether --enable-check was given.
@@@ -14126,12 -16485,6 +16485,6 @@@ f
- { echo "$as_me:$LINENO: checking how to compile and link with check" >&5
- echo $ECHO_N "checking how to compile and link with check... $ECHO_C" >&6; }
- if test "${ac_cv_findlib_CHECK_libs+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
@@@ -14408,6 -16761,6 +16761,11 @@@ f
LIBCHECK_PREFIX="$basedir"
additional_includedir="$basedir/include"
;;
++ */lib | */lib/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`
++ LIBGMP_PREFIX="$basedir"
++ additional_includedir="$basedir/include"
++ ;;
esac
if test "X$additional_includedir" != "X"; then
if test "X$additional_includedir" != "X/usr/include"; then
@@@ -14765,6 -17118,8 +17123,8 @@@ eval "echo \"\$as_me:$LINENO: $ac_try_e
ac_cv_findlib_CHECK_libs="$LIBCHECK"
ac_cv_findlib_CHECK_ltlibs="$LTLIBCHECK"
ac_cv_findlib_CHECK_inc="$INCCHECK"
+ { echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6; }
else
echo "$as_me: failed program was:" >&5
@@@ -14780,10 -17135,6 +17140,6 @@@ f
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
-
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_findlib_CHECK_libs" >&5
- echo "${ECHO_T}$ac_cv_findlib_CHECK_libs" >&6; }
if test "X$ac_cv_findlib_CHECK_libs" = "X"; then
{ echo "$as_me:$LINENO: unable to compile/link with check" >&5
@@@ -16035,9 -18386,11 +18391,11 @@@ echo "${ECHO_T}$ac_cv_libbz2_libs" >&6
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/$acl_libdirstem";
- { echo "$as_me:$LINENO: checking for bzReadOpen in -lbz2" >&5
- echo $ECHO_N "checking for bzReadOpen in -lbz2... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bz2_bzReadOpen+set}" = set; then
+
+ have_bzprefix="no"
+ { echo "$as_me:$LINENO: checking for BZ2_bzReadOpen in -lbz2" >&5
+ echo $ECHO_N "checking for BZ2_bzReadOpen in -lbz2... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bz2_BZ2_bzReadOpen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@@ -16055,11 -18408,11 +18413,11 @@@ cat >>conftest.$ac_ext <<_ACEO
#ifdef __cplusplus
extern "C"
#endif
- char bzReadOpen ();
+ char BZ2_bzReadOpen ();
int
main ()
{
- return bzReadOpen ();
+ return BZ2_bzReadOpen ();
;
return 0;
}
@@@ -16082,29 -18435,31 +18440,31 @@@ eval "echo \"\$as_me:$LINENO: $ac_try_e
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_bz2_bzReadOpen=yes
+ ac_cv_lib_bz2_BZ2_bzReadOpen=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_bz2_bzReadOpen=no
+ ac_cv_lib_bz2_BZ2_bzReadOpen=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_bzReadOpen" >&5
- echo "${ECHO_T}$ac_cv_lib_bz2_bzReadOpen" >&6; }
- if test $ac_cv_lib_bz2_bzReadOpen = yes; then
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzReadOpen" >&5
+ echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzReadOpen" >&6; }
+ if test $ac_cv_lib_bz2_BZ2_bzReadOpen = yes; then
+ have_bzprefix="yes"
+ fi
+
+ if test "x$have_bzprefix" = "xno"; then
cat >>confdefs.h <<\_ACEOF
#define NOBZ2PREFIX 1
_ACEOF
-
- fi
-
+ fi
LDFLAGS="$save_LDFLAGS"
if test "$HAVE_LIBBZ2" = "yes"; then
if test "${ac_cv_header_bzlib_h+set}" = set; then
@@@ -16409,6 -18764,14 +18769,14 @@@ els
want_unrar="yes"
fi
+ if test "$want_unrar" = "yes"; then
+ ENABLE_UNRAR_TRUE=
+ ENABLE_UNRAR_FALSE='#'
+ else
+ ENABLE_UNRAR_TRUE='#'
+ ENABLE_UNRAR_FALSE=
+ fi
+
# Check whether --enable-getaddrinfo was given.
if test "${enable_getaddrinfo+set}" = set; then
@@@ -16772,72 -19135,11 +19140,11 @@@ f
if test "x$ac_cv_have_lresolv" != "xno"; then
FRESHCLAM_LIBS="$FRESHCLAM_LIBS$ac_cv_have_lresolv"
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS$ac_cv_have_lresolv"
- bklibs=$LIBS
- LIBS=$ac_cv_have_lresolv
cat >>confdefs.h <<\_ACEOF
#define HAVE_RESOLV_H 1
_ACEOF
- { echo "$as_me:$LINENO: checking for res_nquery in -lresolv" >&5
- echo $ECHO_N "checking for res_nquery in -lresolv... $ECHO_C" >&6; }
- if test "${ac_cv_have_lresolv_r+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
- ac_cv_have_lresolv_r='no'
- cat >conftest.$ac_ext <<_ACEOF
-
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
- #include <resolv.h>
- int main() { return (long)res_nquery; }
-
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
- ac_cv_have_lresolv_r='yes'
-
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext,
-
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_have_lresolv_r" >&5
- echo "${ECHO_T}$ac_cv_have_lresolv_r" >&6; }
- LIBS=$bklibs
- if test "x$ac_cv_have_lresolv_r" = "xyes"; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LRESOLV_R 1
- _ACEOF
-
- fi
else
{ echo "$as_me:$LINENO: WARNING: ****** DNS support disabled" >&5
echo "$as_me: WARNING: ****** DNS support disabled" >&2;}
@@@ -17000,516 -19302,38 +19307,38 @@@ els
fi
- # Check whether --enable-dsig was given.
- if test "${enable_dsig+set}" = set; then
- enableval=$enable_dsig; want_dsig=$enableval
- else
- want_dsig="yes"
- fi
-
-
- if test "$want_dsig" = "yes"
- then
-
-
-
-
+ have_system_tommath=no
-
-
-
-
-
- use_additional=yes
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
-
- # Check whether --with-libgmp-prefix was given.
- if test "${with_libgmp_prefix+set}" = set; then
- withval=$with_libgmp_prefix;
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- additional_compat_libdir=
- if test "X$withval" = "X"; then
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- if test "X$acl_libdirstem" != "Xlib"; then
- additional_compat_libdir="-L$withval/lib"
- fi
- fi
- fi
-
- fi
-
- LIBGMP=
- LTLIBGMP=
- INCGMP=
- LIBGMP_PREFIX=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='gmp '
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIBGMP="${LIBGMP}${LIBGMP:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIBGMP="${LTLIBGMP}${LTLIBGMP:+ }$value"
- else
- :
- fi
- else
- found_dir=
- found_la=
- found_so=
- found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
- if test $use_additional = yes; then
- dir="$additional_libdir"
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- compat_libdir=
- if test "X$acl_libdirstem" != "Xlib"; then
- compat_libdir=-L'${exec_prefix}'/lib
- fi
- for x in $LDFLAGS $LTLIBGMP $compat_libdir $additional_compat_libdir; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- LTLIBGMP="${LTLIBGMP}${LTLIBGMP:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- LIBGMP="${LIBGMP}${LIBGMP:+ }$found_so"
- else
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- if test "$acl_hardcode_direct" = yes; then
- LIBGMP="${LIBGMP}${LIBGMP:+ }$found_so"
- else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBGMP="${LIBGMP}${LIBGMP:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- haveit=
- for x in $LDFLAGS $LIBGMP; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBGMP="${LIBGMP}${LIBGMP:+ }-L$found_dir"
- fi
- if test "$acl_hardcode_minus_L" != no; then
- LIBGMP="${LIBGMP}${LIBGMP:+ }$found_so"
- else
- LIBGMP="${LIBGMP}${LIBGMP:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- LIBGMP="${LIBGMP}${LIBGMP:+ }$found_a"
- else
- LIBGMP="${LIBGMP}${LIBGMP:+ }-L$found_dir -l$name"
- fi
- fi
- additional_includedir=
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- LIBGMP_PREFIX="$basedir"
- additional_includedir="$basedir/include"
- ;;
- */lib | */lib/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`
- LIBGMP_PREFIX="$basedir"
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INCGMP; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- INCGMP="${INCGMP}${INCGMP:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- if test -n "$found_la"; then
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIBGMP; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LIBGMP="${LIBGMP}${LIBGMP:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIBGMP; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LTLIBGMP="${LTLIBGMP}${LTLIBGMP:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- LIBGMP="${LIBGMP}${LIBGMP:+ }$dep"
- LTLIBGMP="${LTLIBGMP}${LTLIBGMP:+ }$dep"
- ;;
- esac
- done
- fi
- else
- LIBGMP="${LIBGMP}${LIBGMP:+ }-l$name"
- LTLIBGMP="${LTLIBGMP}${LTLIBGMP:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBGMP="${LIBGMP}${LIBGMP:+ }$flag"
- else
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBGMP="${LIBGMP}${LIBGMP:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
- LTLIBGMP="${LTLIBGMP}${LTLIBGMP:+ }-R$found_dir"
- done
- fi
-
-
- ac_save_CPPFLAGS="$CPPFLAGS"
-
- for element in $INCGMP; do
- haveit=
- for x in $CPPFLAGS; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
- fi
- done
-
-
- { echo "$as_me:$LINENO: checking for libgmp" >&5
- echo $ECHO_N "checking for libgmp... $ECHO_C" >&6; }
- if test "${ac_cv_libgmp+set}" = set; then
+ # Check whether --with-system-tommath was given.
+ if test "${with_system_tommath+set}" = set; then
+ withval=$with_system_tommath;
+ case "$withval" in
+ yes)
+ { echo "$as_me:$LINENO: checking for mp_mul_2d in -ltommath" >&5
+ echo $ECHO_N "checking for mp_mul_2d in -ltommath... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_tommath_mp_mul_2d+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBGMP"
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltommath $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <gmp.h>
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char mp_mul_2d ();
int
main ()
{
- mpz_init(0);
+ return mp_mul_2d ();
;
return 0;
}
@@@ -17532,54 -19356,54 +19361,54 @@@ eval "echo \"\$as_me:$LINENO: $ac_try_e
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_libgmp=yes
+ ac_cv_lib_tommath_mp_mul_2d=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_libgmp=no
+ ac_cv_lib_tommath_mp_mul_2d=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
+ LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_libgmp" >&5
- echo "${ECHO_T}$ac_cv_libgmp" >&6; }
- if test "$ac_cv_libgmp" = yes; then
- HAVE_LIBGMP=yes
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_tommath_mp_mul_2d" >&5
+ echo "${ECHO_T}$ac_cv_lib_tommath_mp_mul_2d" >&6; }
+ if test $ac_cv_lib_tommath_mp_mul_2d = yes; then
+
cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBGMP 1
+ #define HAVE_SYSTEM_TOMMATH 1
_ACEOF
- { echo "$as_me:$LINENO: checking how to link with libgmp" >&5
- echo $ECHO_N "checking how to link with libgmp... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: $LIBGMP" >&5
- echo "${ECHO_T}$LIBGMP" >&6; }
- else
- HAVE_LIBGMP=no
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIBGMP=
- LTLIBGMP=
- LIBGMP_PREFIX=
- fi
+ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -ltommath"
+ have_system_tommath=yes
+ else
+ { echo "$as_me:$LINENO: WARNING: ****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead" >&5
+ echo "$as_me: WARNING: ****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead" >&2;}
+ fi
+ ;;
+ no) ;;
+ *) { { echo "$as_me:$LINENO: error: --with-system-tommath does not take an argument" >&5
+ echo "$as_me: error: --with-system-tommath does not take an argument" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ esac
+ fi
+ if test "x$have_system_tommath" = "xyes"; then
+ LINK_TOMMATH_TRUE=
+ LINK_TOMMATH_FALSE='#'
+ else
+ LINK_TOMMATH_TRUE='#'
+ LINK_TOMMATH_FALSE=
+ fi
- if test "$HAVE_LIBGMP" = "yes"; then
- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBGMP";
- else
- { echo "$as_me:$LINENO: WARNING: ****** GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !" >&5
- echo "$as_me: WARNING: ****** GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !" >&2;};
- want_dsig="no";
- fi
- fi
# Check whether --with-iconv was given.
@@@ -17810,6 -19634,12 +19639,12 @@@ cat >>confdefs.h <<\_ACEO
#define CL_DEBUG 1
_ACEOF
+ else
+
+ cat >>confdefs.h <<\_ACEOF
+ #define NDEBUG 1
+ _ACEOF
+
fi
# Check whether --enable-no-cache was given.
@@@ -18875,203 -20705,6 +20710,6 @@@ don
fi
- if test "$have_milter" = "yes"; then
- sendmailprog=no
-
- # Check whether --with-sendmail was given.
- if test "${with_sendmail+set}" = set; then
- withval=$with_sendmail; sendmailprog=$with_sendmail
- else
- sendmailprog=no
- fi
-
-
- if test "$sendmailprog" = "no" ; then
- # Extract the first word of "sendmail", so it can be a program name with args.
- set dummy sendmail; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_sendmailprog+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $sendmailprog in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_sendmailprog="$sendmailprog" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- as_dummy="$PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec"
- for as_dir in $as_dummy
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_sendmailprog="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
- IFS=$as_save_IFS
-
- test -z "$ac_cv_path_sendmailprog" && ac_cv_path_sendmailprog="no"
- ;;
- esac
- fi
- sendmailprog=$ac_cv_path_sendmailprog
- if test -n "$sendmailprog"; then
- { echo "$as_me:$LINENO: result: $sendmailprog" >&5
- echo "${ECHO_T}$sendmailprog" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-
-
- fi
-
-
- cat >>confdefs.h <<_ACEOF
- #define SENDMAIL_BIN "$sendmailprog"
- _ACEOF
-
-
-
- # Check whether --with-sendmail-version was given.
- if test "${with_sendmail_version+set}" = set; then
- withval=$with_sendmail_version; sendmailvers=$with_sendmail_version
- else
- sendmailvers=no
- fi
-
-
- if test "$sendmailvers" = "no" ; then
- sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`
- fi
-
- if test -z "$sendmailver"; then
- # example: postfix
- LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"
- { echo "$as_me:$LINENO: checking for smfi_opensocket in -lmilter" >&5
- echo $ECHO_N "checking for smfi_opensocket in -lmilter... $ECHO_C" >&6; }
- if test "${ac_cv_lib_milter_smfi_opensocket+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmilter $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
- char smfi_opensocket ();
- int
- main ()
- {
- return smfi_opensocket ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_milter_smfi_opensocket=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_milter_smfi_opensocket=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_milter_smfi_opensocket" >&5
- echo "${ECHO_T}$ac_cv_lib_milter_smfi_opensocket" >&6; }
- if test $ac_cv_lib_milter_smfi_opensocket = yes; then
- sendmailver="8.13.0"
- else
- { echo "$as_me:$LINENO: WARNING: cannot determine sendmail version" >&5
- echo "$as_me: WARNING: cannot determine sendmail version" >&2;}
- fi
-
- LDFLAGS="$save_LDFLAGS"
- fi
- if test -n "$sendmailver"; then
- sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`
- sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
- sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
-
- case "$sendmailver_a" in
- [[:digit:]]*) ;;
- *) sendmailver_a= ;;
- esac
-
- case "$sendmailver_b" in
- [[:digit:]]*) ;;
- *) sendmailver_b= ;;
- esac
-
- case "$sendmailver_c" in
- [[:digit:]]*) ;;
- *) sendmailver_c= ;;
- esac
-
- if test -n "$sendmailver_a"; then
-
- cat >>confdefs.h <<_ACEOF
- #define SENDMAIL_VERSION_A $sendmailver_a
- _ACEOF
-
- fi
- if test -n "$sendmailver_b"; then
-
- cat >>confdefs.h <<_ACEOF
- #define SENDMAIL_VERSION_B $sendmailver_b
- _ACEOF
-
-
- fi
- if test -n "$sendmailver_c"; then
-
- cat >>confdefs.h <<_ACEOF
- #define SENDMAIL_VERSION_C $sendmailver_c
- _ACEOF
-
- fi
- fi
- if test "x$ac_cv_have_lresolv_r" != "xyes"; then
- { echo "$as_me:$LINENO: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&5
- echo "$as_me: WARNING: ****** Your libresolv is not thread safe, SPF queries in clamav-milter will block" >&2;}
- fi
- fi
-
if test "$have_pthreads" = "yes"; then
BUILD_CLAMD_TRUE=
BUILD_CLAMD_FALSE='#'
@@@ -19088,14 -20721,6 +20726,6 @@@ els
HAVE_MILTER_FALSE=
fi
- if test "$want_unrar" = "yes"; then
- ENABLE_UNRAR_TRUE=
- ENABLE_UNRAR_FALSE='#'
- else
- ENABLE_UNRAR_TRUE='#'
- ENABLE_UNRAR_FALSE=
- fi
-
if test "$have_pthreads" = "yes"
then
@@@ -19204,323 -20829,6 +20834,6 @@@ _ACEO
fi
- if test "$want_unrar" = "yes"
- then
-
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_UNRAR 1
- _ACEOF
-
- CLAMAV_UNRAR_LIBS='$(top_builddir)/libclamunrar_iface/libclamunrar_iface.la'
- else
- CLAMAV_UNRAR_LIBS=''
- fi
-
-
-
-
- # Check whether --with-tcpwrappers was given.
- if test "${with_tcpwrappers+set}" = set; then
- withval=$with_tcpwrappers; case "$withval" in
- yes|no) tcpw="$withval" ;;
- *) { { echo "$as_me:$LINENO: error: --with-tcpwrappers does not take an argument" >&5
- echo "$as_me: error: --with-tcpwrappers does not take an argument" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
- tcpw=auto
- fi
-
-
- if test "$tcpw" != "no" && test "$have_milter" = "yes" ; then
-
- for ac_header in tcpd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
- { echo "$as_me:$LINENO: checking $ac_header usability" >&5
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
- echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
- { echo "$as_me:$LINENO: checking $ac_header presence" >&5
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
- fi
-
- rm -f conftest.err conftest.$ac_ext
- { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
- echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
- echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
- echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
- ## -------------------------------------- ##
- ## Report this to http://bugs.clamav.net/ ##
- ## -------------------------------------- ##
- _ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
- ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-
- { echo "$as_me:$LINENO: checking for TCP wrappers library" >&5
- echo $ECHO_N "checking for TCP wrappers library... $ECHO_C" >&6; }
- save_LIBS="$LIBS"
- LIBS="$LIBS -lwrap $FRESHCLAM_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #include <tcpd.h>
- int allow_severity = 0;
- int deny_severity = 0;
-
- struct request_info *req;
-
- int
- main ()
- {
-
- hosts_access(req)
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- { echo "$as_me:$LINENO: result: -lwrap" >&5
- echo "${ECHO_T}-lwrap" >&6; }
- have_wrappers=yes
- LIBS="$save_LIBS"
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- LIBS="$LIBS -lnsl $FRESHCLAM_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #include <tcpd.h>
- int allow_severity = 0;
- int deny_severity = 0;
-
- struct request_info *req;
-
- int
- main ()
- {
-
- hosts_access(req)
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- { echo "$as_me:$LINENO: result: -lwrap -lnsl" >&5
- echo "${ECHO_T}-lwrap -lnsl" >&6; }
- have_wrappers=yes
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- have_wrappers=no
- LIBS=$save_LIBS
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- else
- have_wrappers=no
- fi
-
- done
-
-
- if test $have_wrappers = yes ; then
-
- cat >>confdefs.h <<\_ACEOF
- #define WITH_TCPWRAP 1
- _ACEOF
-
- elif test $tcpw = yes ; then
- { { echo "$as_me:$LINENO: error: could not find TCP wrappers" >&5
- echo "$as_me: error: could not find TCP wrappers" >&2;}
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me:$LINENO: WARNING: could not find TCP wrappers, support disabled" >&5
- echo "$as_me: WARNING: could not find TCP wrappers, support disabled" >&2;}
- fi
- fi
-
{ echo "$as_me:$LINENO: checking for gethostbyname_r" >&5
echo $ECHO_N "checking for gethostbyname_r... $ECHO_C" >&6; }
if test -z "$ac_cv_gethostbyname_args"; then
@@@ -21242,7 -22550,2103 +22555,2103 @@@ cat >>confdefs.h <<_ACEO
_ACEOF
- ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile libclamav/lzma/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 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"
+ # Check whether --enable-clamdtop was given.
+ if test "${enable_clamdtop+set}" = set; then
+ enableval=$enable_clamdtop; enable_clamdtop=$enableval
+ else
+ enable_clamdtop="auto"
+ fi
+
+
+ if test "$enable_clamdtop" != "no"; then
+
+
+
+
+
+
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+ # Check whether --with-libncurses-prefix was given.
+ if test "${with_libncurses_prefix+set}" = set; then
+ withval=$with_libncurses_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ additional_compat_libdir=
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ if test "X$acl_libdirstem" != "Xlib"; then
+ additional_compat_libdir="-L$withval/lib"
+ fi
+ fi
+ fi
+
+ fi
+
+ LIBNCURSES=
+ LTLIBNCURSES=
+ INCNCURSES=
+ LIBNCURSES_PREFIX=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='ncurses '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ compat_libdir=
+ if test "X$acl_libdirstem" != "Xlib"; then
+ compat_libdir=-L'${exec_prefix}'/lib
+ fi
+ for x in $LDFLAGS $LTLIBNCURSES $compat_libdir $additional_compat_libdir; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBNCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_so"
+ else
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_a"
+ else
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ LIBNCURSES_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`
+ LIBNCURSES_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCNCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCNCURSES="${INCNCURSES}${INCNCURSES:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBNCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBNCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$dep"
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-l$name"
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }-R$found_dir"
+ done
+ fi
+
+ CPPFLAGS="$CPPFLAGS $INCNCURSES"
+ if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5
+ echo $ECHO_N "checking for ncurses/ncurses.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_ncurses_ncurses_h" >&6; }
+ else
+ # Is the header compilable?
+ { echo "$as_me:$LINENO: checking ncurses/ncurses.h usability" >&5
+ echo $ECHO_N "checking ncurses/ncurses.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+ #include <ncurses/ncurses.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+ { echo "$as_me:$LINENO: checking ncurses/ncurses.h presence" >&5
+ echo $ECHO_N "checking ncurses/ncurses.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ncurses/ncurses.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: ncurses/ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&5
+ echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: ncurses/ncurses.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: ncurses/ncurses.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&5
+ echo "$as_me: WARNING: ncurses/ncurses.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: section \"Present But Cannot Be Compiled\"" >&5
+ echo "$as_me: WARNING: ncurses/ncurses.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: ncurses/ncurses.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: ncurses/ncurses.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## -------------------------------------- ##
+ ## Report this to http://bugs.clamav.net/ ##
+ ## -------------------------------------- ##
+ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ { echo "$as_me:$LINENO: checking for ncurses/ncurses.h" >&5
+ echo $ECHO_N "checking for ncurses/ncurses.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ncurses_ncurses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_ncurses_ncurses_h=$ac_header_preproc
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_ncurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_ncurses_ncurses_h" >&6; }
+
+ fi
+ if test $ac_cv_header_ncurses_ncurses_h = yes; then
+ have_header=yes
+ else
+ have_header=no
+ fi
+
+
+ ac_cv_findlib_NCURSES_libs=
+ ac_cv_findlib_NCURSES_ltlibs=
+ ac_cv_findlib_NCURSES_inc=
+ if test "$have_header" = "yes"; then
+
+ LIBS="$LIBS $LIBNCURSES"
+ { echo "$as_me:$LINENO: checking linking with ncurses" >&5
+ echo $ECHO_N "checking linking with ncurses... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ncurses/ncurses.h>
+ int
+ main ()
+ {
+ initscr(); KEY_RESIZE;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+ ac_cv_findlib_NCURSES_libs="$LIBNCURSES"
+ ac_cv_findlib_NCURSES_ltlibs="$LTLIBNCURSES"
+ ac_cv_findlib_NCURSES_inc="$INCNCURSES"
+ { echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6; }
+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+ LIBS="$save_LIBS"
+ if test "X$ac_cv_findlib_NCURSES_libs" = "X"; then
+
+ { echo "$as_me:$LINENO: unable to compile/link with ncurses" >&5
+ echo "$as_me: unable to compile/link with ncurses" >&6;}
+ HAVE_LIBNCURSES=no
+
+
+ else
+
+ { echo "$as_me:$LINENO: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&5
+ echo "$as_me: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&6;}
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBNCURSES 1
+ _ACEOF
+
+ HAVE_LIBNCURSES=yes
+ LIBNCURSES="$ac_cv_findlib_NCURSES_libs"
+ LTLIBNCURSES="$ac_cv_findlib_NCURSES_ltlibs"
+ INCNCURSES="$ac_cv_findlib_NCURSES_inc"
+ CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
+ CURSES_INCLUDE="<ncurses/ncurses.h>"
+
+ fi
+
+
+
+
+ if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+ HAVE_LIBNCURSES=
+
+
+
+
+
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+ # Check whether --with-libncurses-prefix was given.
+ if test "${with_libncurses_prefix+set}" = set; then
+ withval=$with_libncurses_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ additional_compat_libdir=
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ if test "X$acl_libdirstem" != "Xlib"; then
+ additional_compat_libdir="-L$withval/lib"
+ fi
+ fi
+ fi
+
+ fi
+
+ LIBNCURSES=
+ LTLIBNCURSES=
+ INCNCURSES=
+ LIBNCURSES_PREFIX=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='ncurses '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ compat_libdir=
+ if test "X$acl_libdirstem" != "Xlib"; then
+ compat_libdir=-L'${exec_prefix}'/lib
+ fi
+ for x in $LDFLAGS $LTLIBNCURSES $compat_libdir $additional_compat_libdir; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBNCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_so"
+ else
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$found_a"
+ else
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ LIBNCURSES_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`
+ LIBNCURSES_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCNCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCNCURSES="${INCNCURSES}${INCNCURSES:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBNCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBNCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$dep"
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }-l$name"
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBNCURSES="${LIBNCURSES}${LIBNCURSES:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBNCURSES="${LTLIBNCURSES}${LTLIBNCURSES:+ }-R$found_dir"
+ done
+ fi
+
+ CPPFLAGS="$CPPFLAGS $INCNCURSES"
+ if test "${ac_cv_header_ncurses_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for ncurses.h" >&5
+ echo $ECHO_N "checking for ncurses.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ncurses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_ncurses_h" >&6; }
+ else
+ # Is the header compilable?
+ { echo "$as_me:$LINENO: checking ncurses.h usability" >&5
+ echo $ECHO_N "checking ncurses.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+ #include <ncurses.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+ { echo "$as_me:$LINENO: checking ncurses.h presence" >&5
+ echo $ECHO_N "checking ncurses.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ncurses.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: ncurses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the compiler's result" >&5
+ echo "$as_me: WARNING: ncurses.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: ncurses.h: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: ncurses.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses.h: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: ncurses.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses.h: see the Autoconf documentation" >&5
+ echo "$as_me: WARNING: ncurses.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses.h: section \"Present But Cannot Be Compiled\"" >&5
+ echo "$as_me: WARNING: ncurses.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses.h: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: ncurses.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncurses.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: ncurses.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## -------------------------------------- ##
+ ## Report this to http://bugs.clamav.net/ ##
+ ## -------------------------------------- ##
+ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ { echo "$as_me:$LINENO: checking for ncurses.h" >&5
+ echo $ECHO_N "checking for ncurses.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ncurses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_ncurses_h=$ac_header_preproc
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_ncurses_h" >&6; }
+
+ fi
+ if test $ac_cv_header_ncurses_h = yes; then
+ have_header=yes
+ else
+ have_header=no
+ fi
+
+
+ ac_cv_findlib_NCURSES_libs=
+ ac_cv_findlib_NCURSES_ltlibs=
+ ac_cv_findlib_NCURSES_inc=
+ if test "$have_header" = "yes"; then
+
+ LIBS="$LIBS $LIBNCURSES"
+ { echo "$as_me:$LINENO: checking linking with ncurses" >&5
+ echo $ECHO_N "checking linking with ncurses... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ncurses.h>
+ int
+ main ()
+ {
+ initscr(); KEY_RESIZE;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+ ac_cv_findlib_NCURSES_libs="$LIBNCURSES"
+ ac_cv_findlib_NCURSES_ltlibs="$LTLIBNCURSES"
+ ac_cv_findlib_NCURSES_inc="$INCNCURSES"
+ { echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6; }
+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+ LIBS="$save_LIBS"
+ if test "X$ac_cv_findlib_NCURSES_libs" = "X"; then
+
+ { echo "$as_me:$LINENO: unable to compile/link with ncurses" >&5
+ echo "$as_me: unable to compile/link with ncurses" >&6;}
+ HAVE_LIBNCURSES=no
+
+
+ else
+
+ { echo "$as_me:$LINENO: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&5
+ echo "$as_me: Compiling and linking with ncurses by using $ac_cv_findlib_NCURSES_inc $ac_cv_findlib_NCURSES_libs" >&6;}
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBNCURSES 1
+ _ACEOF
+
+ HAVE_LIBNCURSES=yes
+ LIBNCURSES="$ac_cv_findlib_NCURSES_libs"
+ LTLIBNCURSES="$ac_cv_findlib_NCURSES_ltlibs"
+ INCNCURSES="$ac_cv_findlib_NCURSES_inc"
+ CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
+ CURSES_INCLUDE="<ncurses.h>"
+
+ fi
+
+
+
+ fi
+
+ if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+
+
+
+
+
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+ # Check whether --with-libpdcurses-prefix was given.
+ if test "${with_libpdcurses_prefix+set}" = set; then
+ withval=$with_libpdcurses_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ additional_compat_libdir=
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ if test "X$acl_libdirstem" != "Xlib"; then
+ additional_compat_libdir="-L$withval/lib"
+ fi
+ fi
+ fi
+
+ fi
+
+ LIBPDCURSES=
+ LTLIBPDCURSES=
+ INCPDCURSES=
+ LIBPDCURSES_PREFIX=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='pdcurses '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBPDCURSES="${LTLIBPDCURSES}${LTLIBPDCURSES:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ compat_libdir=
+ if test "X$acl_libdirstem" != "Xlib"; then
+ compat_libdir=-L'${exec_prefix}'/lib
+ fi
+ for x in $LDFLAGS $LTLIBPDCURSES $compat_libdir $additional_compat_libdir; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBPDCURSES="${LTLIBPDCURSES}${LTLIBPDCURSES:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBPDCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }$found_so"
+ else
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }$found_a"
+ else
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ LIBPDCURSES_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'`
+ LIBPDCURSES_PREFIX="$basedir"
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCPDCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCPDCURSES="${INCPDCURSES}${INCPDCURSES:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBPDCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBPDCURSES; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBPDCURSES="${LTLIBPDCURSES}${LTLIBPDCURSES:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }$dep"
+ LTLIBPDCURSES="${LTLIBPDCURSES}${LTLIBPDCURSES:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }-l$name"
+ LTLIBPDCURSES="${LTLIBPDCURSES}${LTLIBPDCURSES:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBPDCURSES="${LIBPDCURSES}${LIBPDCURSES:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBPDCURSES="${LTLIBPDCURSES}${LTLIBPDCURSES:+ }-R$found_dir"
+ done
+ fi
+
+ CPPFLAGS="$CPPFLAGS $INCPDCURSES"
+ if test "${ac_cv_header_curses_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for curses.h" >&5
+ echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_curses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_curses_h" >&6; }
+ else
+ # Is the header compilable?
+ { echo "$as_me:$LINENO: checking curses.h usability" >&5
+ echo $ECHO_N "checking curses.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+ #include <curses.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+ # Is the header present?
+ { echo "$as_me:$LINENO: checking curses.h presence" >&5
+ echo $ECHO_N "checking curses.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <curses.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+
+ rm -f conftest.err conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5
+ echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: curses.h: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: curses.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5
+ echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&5
+ echo "$as_me: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+ ## -------------------------------------- ##
+ ## Report this to http://bugs.clamav.net/ ##
+ ## -------------------------------------- ##
+ _ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ { echo "$as_me:$LINENO: checking for curses.h" >&5
+ echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_curses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_header_curses_h=$ac_header_preproc
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
+ echo "${ECHO_T}$ac_cv_header_curses_h" >&6; }
+
+ fi
+ if test $ac_cv_header_curses_h = yes; then
+ have_header=yes
+ else
+ have_header=no
+ fi
+
+
+ ac_cv_findlib_PDCURSES_libs=
+ ac_cv_findlib_PDCURSES_ltlibs=
+ ac_cv_findlib_PDCURSES_inc=
+ if test "$have_header" = "yes"; then
+
+ LIBS="$LIBS $LIBPDCURSES"
+ { echo "$as_me:$LINENO: checking linking with pdcurses" >&5
+ echo $ECHO_N "checking linking with pdcurses... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <curses.h>
+ int
+ main ()
+ {
+ initscr(); KEY_RESIZE;
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+ ac_cv_findlib_PDCURSES_libs="$LIBPDCURSES"
+ ac_cv_findlib_PDCURSES_ltlibs="$LTLIBPDCURSES"
+ ac_cv_findlib_PDCURSES_inc="$INCPDCURSES"
+ { echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6; }
+
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+ LIBS="$save_LIBS"
+ if test "X$ac_cv_findlib_PDCURSES_libs" = "X"; then
+
+ { echo "$as_me:$LINENO: unable to compile/link with pdcurses" >&5
+ echo "$as_me: unable to compile/link with pdcurses" >&6;}
+ HAVE_LIBPDCURSES=no
+ { echo "$as_me:$LINENO: WARNING: ****** not building clamdtop: ncurses not found" >&5
+ echo "$as_me: WARNING: ****** not building clamdtop: ncurses not found" >&2;}
+
+ else
+
+ { echo "$as_me:$LINENO: Compiling and linking with pdcurses by using $ac_cv_findlib_PDCURSES_inc $ac_cv_findlib_PDCURSES_libs" >&5
+ echo "$as_me: Compiling and linking with pdcurses by using $ac_cv_findlib_PDCURSES_inc $ac_cv_findlib_PDCURSES_libs" >&6;}
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBPDCURSES 1
+ _ACEOF
+
+ HAVE_LIBPDCURSES=yes
+ LIBPDCURSES="$ac_cv_findlib_PDCURSES_libs"
+ LTLIBPDCURSES="$ac_cv_findlib_PDCURSES_ltlibs"
+ INCPDCURSES="$ac_cv_findlib_PDCURSES_inc"
+ CURSES_CPPFLAGS="$INCPDCURSES";
+ CURSES_LIBS="$LTLIBPDCURSES";
+ CURSES_INCLUDE="<curses.h>"
+
+ fi
+
+
+
+ fi
+
+ if test "x$CURSES_LIBS" = "x" -a "$enable_clamdtop" = "yes"; then
+ { { echo "$as_me:$LINENO: error:
+
+ ERROR! Clamdtop was configured, but not found. You need to install libncurses5-dev.
+ " >&5
+ echo "$as_me: error:
+
+ ERROR! Clamdtop was configured, but not found. You need to install libncurses5-dev.
+ " >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ fi
+
+
+ cat >>confdefs.h <<_ACEOF
+ #define CURSES_INCLUDE $CURSES_INCLUDE
+ _ACEOF
+
+
+
+ if test "X$HAVE_LIBNCURSES" = "Xyes" || test "X$HAVE_LIBPDCURSES" = "Xyes"; then
+ HAVE_CURSES_TRUE=
+ HAVE_CURSES_FALSE='#'
+ else
+ HAVE_CURSES_TRUE='#'
+ HAVE_CURSES_FALSE=
+ fi
+
+
+ ac_config_files="$ac_config_files libclamav/Makefile libclamav/lzma/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 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"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@@ -21354,6 -24758,37 +24763,37 @@@ echo "$as_me: error: conditional \"am__
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+ if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ LT_CONFIG_H=clamav-config.h
+
+ _ltdl_libobjs=
+ _ltdl_ltlibobjs=
+ if test -n "$_LT_LIBOBJS"; then
+ # Remove the extension.
+ _lt_sed_drop_objext='s/\.o$//;s/\.obj$//'
+ for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do
+ _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext"
+ _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo"
+ done
+ fi
+ ltdl_LIBOBJS=$_ltdl_libobjs
+
+ ltdl_LTLIBOBJS=$_ltdl_ltlibobjs
+
+
if test -z "${DISTCHECK_ENABLE_FLAGS_TRUE}" && test -z "${DISTCHECK_ENABLE_FLAGS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"DISTCHECK_ENABLE_FLAGS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@@ -21389,6 -24824,20 +24829,20 @@@ echo "$as_me: error: conditional \"MAIN
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+ if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_UNRAR\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"ENABLE_UNRAR\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${LINK_TOMMATH_TRUE}" && test -z "${LINK_TOMMATH_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"LINK_TOMMATH\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"LINK_TOMMATH\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_CLAMD\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@@ -21403,10 -24852,10 +24857,10 @@@ echo "$as_me: error: conditional \"HAVE
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
- if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_UNRAR\" was never defined.
+ if test -z "${HAVE_CURSES_TRUE}" && test -z "${HAVE_CURSES_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CURSES\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"ENABLE_UNRAR\" was never defined.
+ echo "$as_me: error: conditional \"HAVE_CURSES\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@@ -21710,7 -25159,7 +25164,7 @@@ exec 6>&
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by clamav $as_me devel, which was
+This file was extended by clamav $as_me 0.94.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@@ -21763,7 -25212,7 +25217,7 @@@ Report bugs to <bug-autoconf at gnu.org>.
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-clamav config.status devel
+clamav config.status 0.94.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@@ -22135,8 -25584,7 +25589,7 @@@ d
"clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;;
- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;;
+ "libltdl/Makefile") CONFIG_FILES="$CONFIG_FILES libltdl/Makefile" ;;
"libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;;
"libclamav/lzma/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/lzma/Makefile" ;;
"clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;;
@@@ -22151,6 -25599,7 +25604,7 @@@
"etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"unit_tests/Makefile") CONFIG_FILES="$CONFIG_FILES unit_tests/Makefile" ;;
+ "clamdtop/Makefile") CONFIG_FILES="$CONFIG_FILES clamdtop/Makefile" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"clamav-config") CONFIG_FILES="$CONFIG_FILES clamav-config" ;;
"libclamav.pc") CONFIG_FILES="$CONFIG_FILES libclamav.pc" ;;
@@@ -22163,6 -25612,7 +25617,7 @@@
"docs/man/freshclam.1") CONFIG_FILES="$CONFIG_FILES docs/man/freshclam.1" ;;
"docs/man/freshclam.conf.5") CONFIG_FILES="$CONFIG_FILES docs/man/freshclam.conf.5" ;;
"docs/man/sigtool.1") CONFIG_FILES="$CONFIG_FILES docs/man/sigtool.1" ;;
+ "docs/man/clamdtop.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamdtop.1" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@@ -22374,6 -25824,24 +25829,24 @@@ LIPO!$LIPO$ac_deli
OTOOL!$OTOOL$ac_delim
OTOOL64!$OTOOL64$ac_delim
CPP!$CPP$ac_delim
+ LIBLTDL!$LIBLTDL$ac_delim
+ LTDLDEPS!$LTDLDEPS$ac_delim
+ LTDLINCL!$LTDLINCL$ac_delim
+ INCLTDL!$INCLTDL$ac_delim
+ LT_DLLOADERS!$LT_DLLOADERS$ac_delim
+ LIBADD_DLOPEN!$LIBADD_DLOPEN$ac_delim
+ LIBADD_SHL_LOAD!$LIBADD_SHL_LOAD$ac_delim
+ LIBADD_DLD_LINK!$LIBADD_DLD_LINK$ac_delim
+ LT_DLPREOPEN!$LT_DLPREOPEN$ac_delim
+ LIBADD_DL!$LIBADD_DL$ac_delim
+ sys_symbol_underscore!$sys_symbol_underscore$ac_delim
+ ARGZ_H!$ARGZ_H$ac_delim
+ INSTALL_LTDL_TRUE!$INSTALL_LTDL_TRUE$ac_delim
+ INSTALL_LTDL_FALSE!$INSTALL_LTDL_FALSE$ac_delim
+ CONVENIENCE_LTDL_TRUE!$CONVENIENCE_LTDL_TRUE$ac_delim
+ CONVENIENCE_LTDL_FALSE!$CONVENIENCE_LTDL_FALSE$ac_delim
+ LT_CONFIG_H!$LT_CONFIG_H$ac_delim
+ LTDLOPEN!$LTDLOPEN$ac_delim
DISTCHECK_ENABLE_FLAGS_TRUE!$DISTCHECK_ENABLE_FLAGS_TRUE$ac_delim
DISTCHECK_ENABLE_FLAGS_FALSE!$DISTCHECK_ENABLE_FLAGS_FALSE$ac_delim
VERSIONSCRIPTFLAG!$VERSIONSCRIPTFLAG$ac_delim
@@@ -22395,10 -25863,10 +25868,10 @@@ MAINT!$MAINT$ac_deli
LIBBZ2!$LIBBZ2$ac_delim
LTLIBBZ2!$LTLIBBZ2$ac_delim
LIBBZ2_PREFIX!$LIBBZ2_PREFIX$ac_delim
- HAVE_LIBGMP!$HAVE_LIBGMP$ac_delim
- LIBGMP!$LIBGMP$ac_delim
- LTLIBGMP!$LTLIBGMP$ac_delim
- LIBGMP_PREFIX!$LIBGMP_PREFIX$ac_delim
+ ENABLE_UNRAR_TRUE!$ENABLE_UNRAR_TRUE$ac_delim
+ ENABLE_UNRAR_FALSE!$ENABLE_UNRAR_FALSE$ac_delim
+ LINK_TOMMATH_TRUE!$LINK_TOMMATH_TRUE$ac_delim
+ LINK_TOMMATH_FALSE!$LINK_TOMMATH_FALSE$ac_delim
DBDIR!$DBDIR$ac_delim
CFGDIR!$CFGDIR$ac_delim
LIBCLAMAV_LIBS!$LIBCLAMAV_LIBS$ac_delim
@@@ -22407,22 -25875,24 +25880,24 @@@ CLAMAV_MILTER_LIBS!$CLAMAV_MILTER_LIBS$
FRESHCLAM_LIBS!$FRESHCLAM_LIBS$ac_delim
TH_SAFE!$TH_SAFE$ac_delim
THREAD_LIBS!$THREAD_LIBS$ac_delim
- sendmailprog!$sendmailprog$ac_delim
BUILD_CLAMD_TRUE!$BUILD_CLAMD_TRUE$ac_delim
BUILD_CLAMD_FALSE!$BUILD_CLAMD_FALSE$ac_delim
HAVE_MILTER_TRUE!$HAVE_MILTER_TRUE$ac_delim
HAVE_MILTER_FALSE!$HAVE_MILTER_FALSE$ac_delim
GETENT!$GETENT$ac_delim
CLAMAVUSER!$CLAMAVUSER$ac_delim
CLAMAVGROUP!$CLAMAVGROUP$ac_delim
+ CURSES_CPPFLAGS!$CURSES_CPPFLAGS$ac_delim
+ CURSES_LIBS!$CURSES_LIBS$ac_delim
+ HAVE_CURSES_TRUE!$HAVE_CURSES_TRUE$ac_delim
+ HAVE_CURSES_FALSE!$HAVE_CURSES_FALSE$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
+ ltdl_LIBOBJS!$ltdl_LIBOBJS$ac_delim
+ ltdl_LTLIBOBJS!$ltdl_LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --combined configure.in
index 4a27763,0d6eef7..99131c3
--- a/configure.in
+++ b/configure.in
@@@ -20,7 -20,7 +20,7 @@@ dnl MA 02110-1301, USA
AC_PREREQ([2.59])
dnl For a release change [devel] to the real version [0.xy]
dnl also change VERSION below
-AC_INIT([clamav], [devel], [http://bugs.clamav.net/])
+AC_INIT([clamav], [0.94.2], [http://bugs.clamav.net/])
dnl put configure auxiliary into config
AC_CONFIG_AUX_DIR([config])
@@@ -39,12 -39,12 +39,12 @@@ dnl the date in the versio
AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
dnl change this on a release
-VERSION="devel-`date +%Y%m%d`"
-dnl VERSION="0.94rc1"
+VERSION="0.94.2"
+dnl VERSION="devel-`date +%Y%m%d`"
AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
- LC_CURRENT=5
- LC_REVISION=4
+ LC_CURRENT=6
+ LC_REVISION=0
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])
@@@ -54,7 -54,10 +54,10 @@@ AC_PROG_INSTAL
AC_PROG_LN_S
AC_PROG_MAKE_SET
- AC_PROG_LIBTOOL
+ LT_CONFIG_LTDL_DIR([libltdl])
+ LT_INIT([dlopen])
+ LTDL_INIT([recursive])
+ AC_CONFIG_FILES([libltdl/Makefile])
AC_DEFINE([SCANBUFF], 131072, [scan buffer size])
AC_DEFINE([FILEBUFF], 8192, [file i/o buffer size])
@@@ -400,6 -403,7 +403,7 @@@ AC_COMPILE_CHECK_SIZEOF([short]
AC_COMPILE_CHECK_SIZEOF([int])
AC_COMPILE_CHECK_SIZEOF([long])
AC_COMPILE_CHECK_SIZEOF([long long])
+ AC_COMPILE_CHECK_SIZEOF([void *])
AC_ARG_ENABLE([experimental],
[ --enable-experimental enable experimental code],
@@@ -417,6 -421,22 +421,22 @@@ AC_CHECK_FUNCS([poll setsid memcpy snpr
AC_C_FUNC_MMAP_PRIVATE
AC_FUNC_FSEEKO
+ AC_ARG_ENABLE([mempool],[ --disable-mempool disable memory pools], enable_mempool=$enableval, enable_mempool="yes")
+ if test "$enable_mempool" = "yes"; then
+ if test "$ac_cv_c_mmap_private" != "yes"; then
+ AC_MSG_NOTICE([****** mempool support disabled (mmap not available or not usable)])
+ else
+ AC_CHECK_FUNC([getpagesize], [
+ AC_C_FUNC_MMAP_ANONYMOUS
+ if test "$ac_cv_c_mmap_anonymous" = "no"; then
+ AC_MSG_NOTICE([****** mempool support disabled (anonymous mmap not available)])
+ else
+ AC_DEFINE([USE_MPOOL],1,[enable memory pools])
+ fi
+ ], [AC_MSG_NOTICE([****** mempool support disabled (getpagesize not available)])])
+ fi
+ fi
+
enable_check_ut=auto
enable_ut_install=no
AC_ARG_ENABLE(check,
@@@ -533,9 -553,12 +553,12 @@@ the
AC_LIB_LINKFLAGS([bz2])
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LIBS -L$LIBBZ2_PREFIX/$acl_libdirstem";
- AC_CHECK_LIB([bz2], [bzReadOpen],
- [AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])]
- )
+
+ have_bzprefix="no"
+ AC_CHECK_LIB([bz2], [BZ2_bzReadOpen], [have_bzprefix="yes"])
+ if test "x$have_bzprefix" = "xno"; then
+ AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])
+ fi
LDFLAGS="$save_LDFLAGS"
if test "$HAVE_LIBBZ2" = "yes"; then
AC_CHECK_HEADER([bzlib.h],
@@@ -573,6 -596,7 +596,7 @@@ f
AC_ARG_ENABLE([unrar],
[ --disable-unrar don't build libclamunrar and libclamunrar_iface ],
want_unrar=$enableval, want_unrar="yes")
+ AM_CONDITIONAL([ENABLE_UNRAR],[test "$want_unrar" = "yes"])
AC_ARG_ENABLE([getaddrinfo],
[ --disable-getaddrinfo disable support for getaddrinfo],
@@@ -679,27 -703,27 +703,27 @@@ AC_ARG_ENABLE([milter]
[ --enable-milter build clamav-milter],
have_milter=$enableval, have_milter="no")
- AC_ARG_ENABLE([dsig],
- [ --disable-dsig disable support for digital signatures],
- want_dsig=$enableval, want_dsig="yes")
+ have_system_tommath=no
+ AC_ARG_WITH([system-tommath],
+ [ --with-system-tommath link against system libtommath (default = no, use bundled)],
+ [
+ case "$withval" in
+ yes)
+ AC_CHECK_LIB([tommath], [mp_mul_2d],
+ [
+ AC_DEFINE([HAVE_SYSTEM_TOMMATH], 1, [link against system-wide libtommath])
+ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -ltommath"
+ have_system_tommath=yes
+ ],
+ [AC_MSG_WARN([****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead])]
+ )
+ ;;
+ no) ;;
+ *) AC_MSG_ERROR([--with-system-tommath does not take an argument]) ;;
+ esac
+ ])
+ AM_CONDITIONAL([LINK_TOMMATH], test "x$have_system_tommath" = "xyes")
- if test "$want_dsig" = "yes"
- then
- dnl defines HAVE_LIBGMP, LIBGMP, and LTLIBGMP
- dnl also adds option --with-libgmp-prefix to configure
- AC_LIB_HAVE_LINKFLAGS([gmp],,
- [#include <gmp.h>
- ],
- [mpz_init(0);])
- dnl we don't need to check for __gmpz_init and mpz_init,
- dnl since we are not checking directly for symbols
- if test "$HAVE_LIBGMP" = "yes"; then
- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBGMP";
- else
- AC_MSG_WARN([****** GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !]);
- want_dsig="no";
- fi
- fi
dnl we need to try to link with iconv, otherwise there could be a
dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.
@@@ -771,6 -795,8 +795,8 @@@ enable_debug=$enableval, enable_debug="
if test "$enable_debug" = "yes"; then
AC_DEFINE([CL_DEBUG],1,[enable debugging])
+ else
+ AC_DEFINE([NDEBUG],1,[disable assertions])
fi
AC_ARG_ENABLE([no-cache],
@@@ -1110,71 -1136,8 +1136,8 @@@ if test "$have_milter" = "yes"; the
])
fi
- if test "$have_milter" = "yes"; then
- sendmailprog=no
- AC_ARG_WITH([sendmail],
- [ --with-sendmail=PATH specify location of Sendmail binary (default=auto find)],
- sendmailprog=$with_sendmail, sendmailprog=no)
-
- if test "$sendmailprog" = "no" ; then
- AC_PATH_PROG([sendmailprog], sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)
- fi
-
- AC_DEFINE_UNQUOTED([SENDMAIL_BIN], "$sendmailprog", [location of Sendmail binary])
-
- AC_ARG_WITH(sendmail-version,
- [ --with-sendmail-version=VERSION specify version of Sendmail (default=auto find)],
- sendmailvers=$with_sendmail_version, sendmailvers=no)
-
- if test "$sendmailvers" = "no" ; then
- sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`
- fi
-
- if test -z "$sendmailver"; then
- # example: postfix
- LDFLAGS="$LDFLAGS $CLAMAV_MILTER_LIBS"
- AC_CHECK_LIB([milter],[smfi_opensocket],[sendmailver="8.13.0"],
- [AC_MSG_WARN([cannot determine sendmail version])])
- LDFLAGS="$save_LDFLAGS"
- fi
- if test -n "$sendmailver"; then
- sendmailver_a=`echo $sendmailver | awk -F. '{printf $1}'`
- sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
- sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
-
- case "$sendmailver_a" in
- [[[:digit:]]]*) ;;
- *) sendmailver_a= ;;
- esac
-
- case "$sendmailver_b" in
- [[[:digit:]]]*) ;;
- *) sendmailver_b= ;;
- esac
-
- case "$sendmailver_c" in
- [[[:digit:]]]*) ;;
- *) sendmailver_c= ;;
- esac
-
- if test -n "$sendmailver_a"; then
- AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail])
- fi
- if test -n "$sendmailver_b"; then
- AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail])
- fi
- if test -n "$sendmailver_c"; then
- AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail])
- fi
- fi
- if test "x$ac_cv_have_lresolv_r" != "xyes"; then
- AC_MSG_WARN([****** Your libresolv is not thread safe, SPF queries in clamav-milter will block])
- fi
- fi
-
AM_CONDITIONAL([BUILD_CLAMD],[test "$have_pthreads" = "yes"])
AM_CONDITIONAL([HAVE_MILTER],[test "$have_milter" = "yes"])
- AM_CONDITIONAL([ENABLE_UNRAR],[test "$want_unrar" = "yes"])
if test "$have_pthreads" = "yes"
then
@@@ -1185,76 -1148,6 +1148,6 @@@
AC_DEFINE([BUILD_CLAMD], 1, "build clamd")
fi
- if test "$want_unrar" = "yes"
- then
- AC_DEFINE([ENABLE_UNRAR], 1, "build unrar code")
- CLAMAV_UNRAR_LIBS='$(top_builddir)/libclamunrar_iface/libclamunrar_iface.la'
- else
- CLAMAV_UNRAR_LIBS=''
- fi
- AC_SUBST([CLAMAV_UNRAR_LIBS])
-
-
- dnl tcpwrappers support
- dnl rules from http://ma.ph-freiburg.de/tng/tng-technical/2002-01/msg00094.html
- AC_ARG_WITH([tcpwrappers],
- [ --with-tcpwrappers support hosts.allow / hosts.deny (default=auto)],
- [ case "$withval" in
- yes|no) tcpw="$withval" ;;
- *) AC_MSG_ERROR([--with-tcpwrappers does not take an argument]) ;;
- esac],
- [ tcpw=auto ])
-
- if test "$tcpw" != "no" && test "$have_milter" = "yes" ; then
- AC_CHECK_HEADERS([tcpd.h],[
- AC_MSG_CHECKING([for TCP wrappers library])
- save_LIBS="$LIBS"
- LIBS="$LIBS -lwrap $FRESHCLAM_LIBS"
- AC_TRY_LINK([
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #include <tcpd.h>
- int allow_severity = 0;
- int deny_severity = 0;
-
- struct request_info *req;
- ],[
- hosts_access(req)
- ],[AC_MSG_RESULT([-lwrap])
- have_wrappers=yes
- LIBS="$save_LIBS"
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"],[
- dnl try with -lnsl
- LIBS="$LIBS -lnsl $FRESHCLAM_LIBS"
- AC_TRY_LINK([
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #include <tcpd.h>
- int allow_severity = 0;
- int deny_severity = 0;
-
- struct request_info *req;
- ],[
- hosts_access(req)
- ],[AC_MSG_RESULT([-lwrap -lnsl])
- have_wrappers=yes
- CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lwrap"],[
- AC_MSG_RESULT(no)
- have_wrappers=no
- LIBS=$save_LIBS])],[
- have_wrappers=no])],[have_wrappers=no])
-
- if test $have_wrappers = yes ; then
- AC_DEFINE([WITH_TCPWRAP],1, [tcpwrappers support])
- elif test $tcpw = yes ; then
- AC_MSG_ERROR([could not find TCP wrappers])
- else
- AC_MSG_WARN([could not find TCP wrappers, support disabled])
- fi
- fi
-
dnl Check for gethostbyname_r and number of its arguments
dnl Code from libwww/configure.in
AC_MSG_CHECKING([for gethostbyname_r])
@@@ -1624,9 -1517,56 +1517,56 @@@ AC_C_FDPASSIN
AC_DEFINE_UNQUOTED([VERSION_SUFFIX],"$VERSION_SUFFIX",[Version suffix for package])
+ AC_ARG_ENABLE(clamdtop,
+ AC_HELP_STRING([--enable-clamdtop],
+ [Enable 'clamdtop' tool @<:@default=auto@:>@]),
+ [enable_clamdtop=$enableval], [enable_clamdtop="auto"])
+
+ if test "$enable_clamdtop" != "no"; then
+
+ AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
+ AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
+ [initscr(); KEY_RESIZE;]),
+ [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
+ CURSES_INCLUDE="<ncurses/ncurses.h>"],
+ [])
+
+ if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+ HAVE_LIBNCURSES=
+ AC_LIB_FIND([ncurses], [ncurses.h],
+ AC_LANG_PROGRAM([#include <ncurses.h>],
+ [initscr(); KEY_RESIZE;]),
+ [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
+ CURSES_INCLUDE="<ncurses.h>"],
+ [])
+ fi
+
+ if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+ AC_LIB_FIND([pdcurses],[curses.h],
+ AC_LANG_PROGRAM([#include <curses.h>],
+ [initscr(); KEY_RESIZE;]),
+ [CURSES_CPPFLAGS="$INCPDCURSES";
+ CURSES_LIBS="$LTLIBPDCURSES";
+ CURSES_INCLUDE="<curses.h>"],
+ [AC_MSG_WARN([****** not building clamdtop: ncurses not found])])
+ fi
+
+ if test "x$CURSES_LIBS" = "x" -a "$enable_clamdtop" = "yes"; then
+ AC_MSG_ERROR([
+
+ ERROR! Clamdtop was configured, but not found. You need to install libncurses5-dev.
+ ])
+ fi
+
+ fi
+
+ AC_DEFINE_UNQUOTED([CURSES_INCLUDE], $CURSES_INCLUDE, [curses header location])
+ AC_SUBST([CURSES_CPPFLAGS])
+ AC_SUBST([CURSES_LIBS])
+ AM_CONDITIONAL([HAVE_CURSES],
+ [test "X$HAVE_LIBNCURSES" = "Xyes" || test "X$HAVE_LIBPDCURSES" = "Xyes"])
+
AC_OUTPUT([
- libclamunrar/Makefile
- libclamunrar_iface/Makefile
libclamav/Makefile
libclamav/lzma/Makefile
clamscan/Makefile
@@@ -1641,6 -1581,7 +1581,7 @@@ clamconf/Makefil
etc/Makefile
test/Makefile
unit_tests/Makefile
+ clamdtop/Makefile
Makefile
clamav-config
libclamav.pc
@@@ -1653,6 -1594,7 +1594,7 @@@ docs/man/clamscan.
docs/man/freshclam.1
docs/man/freshclam.conf.5
docs/man/sigtool.1
+ docs/man/clamdtop.1
])
# Yep, downgrading the compiler avoids the bug too:
diff --combined docs/html/node56.html
index efb84ce,030eb7b..c5ddefa
--- a/docs/html/node56.html
+++ b/docs/html/node56.html
@@@ -7,8 -7,8 +7,8 @@@ original version by: Nikos Drakos, CBL
Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
<HTML>
<HEAD>
- <TITLE>About this document ...</TITLE>
- <META NAME="description" CONTENT="About this document ...">
+ <TITLE>Donors</TITLE>
+ <META NAME="description" CONTENT="Donors">
<META NAME="keywords" CONTENT="clamdoc">
<META NAME="resource-type" CONTENT="document">
<META NAME="distribution" CONTENT="global">
@@@ -18,57 -18,448 +18,449 @@@
<LINK REL="STYLESHEET" HREF="clamdoc.css">
+ <LINK REL="next" HREF="node57.html">
<LINK REL="previous" HREF="node55.html">
- <LINK REL="up" HREF="clamdoc.html">
+ <LINK REL="up" HREF="node32.html">
+ <LINK REL="next" HREF="node57.html">
</HEAD>
<BODY >
<DIV CLASS="navigation"><!--Navigation Panel-->
- <IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next" SRC="next_g.png">
- <A NAME="tex2html910"
- HREF="clamdoc.html">
+ <A NAME="tex2html928"
+ HREF="node57.html">
+ <IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next" SRC="next.png"></A>
+ <A NAME="tex2html924"
+ HREF="node32.html">
<IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up" SRC="up.png"></A>
- <A NAME="tex2html906"
+ <A NAME="tex2html918"
HREF="node55.html">
<IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous" SRC="prev.png"></A>
- <A NAME="tex2html912"
+ <A NAME="tex2html926"
HREF="node1.html">
<IMG WIDTH="65" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="contents" SRC="contents.png"></A>
<BR>
- <B> Up:</B> <A NAME="tex2html911"
- HREF="clamdoc.html">clamdoc</A>
- <B> Previous:</B> <A NAME="tex2html907"
- HREF="node55.html">Core Team</A>
- <B> <A NAME="tex2html913"
+ <B> Next:</B> <A NAME="tex2html929"
+ HREF="node57.html">Graphics</A>
+ <B> Up:</B> <A NAME="tex2html925"
+ HREF="node32.html">LibClamAV</A>
+ <B> Previous:</B> <A NAME="tex2html919"
+ HREF="node55.html">Contributors</A>
+ <B> <A NAME="tex2html927"
HREF="node1.html">Contents</A></B>
<BR>
<BR></DIV>
<!--End of Navigation Panel-->
- <H1><A NAME="SECTION00090000000000000000">
- About this document ...</A>
- </H1>
- <P>
- This document was generated using the
- <A HREF="http://www.latex2html.org/"><STRONG>LaTeX</STRONG>2<tt>HTML</tt></A> translator Version 2002-2-1 (1.71)
+ <H2><A NAME="SECTION00079000000000000000">
+ Donors</A>
+ </H2>
+ We've received financial support from: (in alphabetical order)
+
+ <UL>
+ <LI>ActiveIntra.net Inc. (<TT><A NAME="tex2html25"
+ HREF="http://www.activeintra.net/">http://www.activeintra.net/</A></TT>)
+ </LI>
+ <LI>Advance Healthcare Group (<TT><A NAME="tex2html26"
+ HREF="http://www.ahgl.com.au/">http://www.ahgl.com.au/</A></TT>)
+ </LI>
+ <LI>Allied Quotes (<TT><A NAME="tex2html27"
+ HREF="http://www.AlliedQuotes.com /">http://www.AlliedQuotes.com /</A></TT>)
+ </LI>
+ <LI>American Computer & Electronic Services Corp. (<TT><A NAME="tex2html28"
+ HREF="http://www.acesnw.com/">http://www.acesnw.com/</A></TT>)
+ </LI>
+ <LI>Amnesty International, Swiss Section (<TT><A NAME="tex2html29"
+ HREF="http://www.amnesty.ch/">http://www.amnesty.ch/</A></TT>)
+ </LI>
+ <LI>Steve Anderson
+ </LI>
+ <LI>Anonymous donor from Colorado, US
+ </LI>
+ <LI>Arudius (<TT><A NAME="tex2html30"
+ HREF="http://arudius.sourceforge.net/">http://arudius.sourceforge.net/</A></TT>)
+ </LI>
+ <LI>Peter Ashman
+ </LI>
+ <LI>Atlas College (<TT><A NAME="tex2html31"
+ HREF="http://www.atlascollege.nl/">http://www.atlascollege.nl/</A></TT>)
+ </LI>
+ <LI>Australian Payday Cash Loans (<TT><A NAME="tex2html32"
+ HREF="http://www.cashdoctors.com.au/">http://www.cashdoctors.com.au/</A></TT>)
+ </LI>
+ <LI>AWD Online (<TT><A NAME="tex2html33"
+ HREF="http://www.awdonline.com/">http://www.awdonline.com/</A></TT>)
+ </LI>
+ <LI>BackupAssist Backup Software (<TT><A NAME="tex2html34"
+ HREF="http://www.backupassist.com/">http://www.backupassist.com/</A></TT>)
+ </LI>
+ <LI>Dave Baker
+ </LI>
+ <LI>Bear and Bear Consulting, Inc. (<TT><A NAME="tex2html35"
+ HREF="http://www.bear-consulting.com/">http://www.bear-consulting.com/</A></TT>)
+ </LI>
+ <LI>Aaron Begley
+ </LI>
+ <LI>Craig H. Block
+ </LI>
+ <LI>Norman E. Brake, Jr.
+ </LI>
+ <LI>Josh Burstyn
+ </LI>
+ <LI>By Design (<TT><A NAME="tex2html36"
+ HREF="http://www.by-design.net/">http://www.by-design.net/</A></TT>)
+ </LI>
+ <LI>Canadian Web Hosting (<TT><A NAME="tex2html37"
+ HREF="http://www.canadianwebhosting.com/">http://www.canadianwebhosting.com/</A></TT>)
+ </LI>
+ <LI>cedarcreeksoftware.com (<TT><A NAME="tex2html38"
+ HREF="http://www.cedarcreeksoftware.com/">http://www.cedarcreeksoftware.com/</A></TT>)
+ </LI>
+ <LI>Ricardo Cerqueira
+ </LI>
+ <LI>Thanos Chatziathanassiou
+ </LI>
+ <LI>Cheahch from Singapore
+ </LI>
+ <LI>Conexim Australia - business web hosting (<TT><A NAME="tex2html39"
+ HREF="http://www.conexim.com.au">http://www.conexim.com.au</A></TT>)
+ </LI>
+ <LI>Alan Cook
+ </LI>
+ <LI>Joe Cooper
+ </LI>
+ <LI>CustomLogic LLC (<TT><A NAME="tex2html40"
+ HREF="http://www.customlogic.com/">http://www.customlogic.com/</A></TT>)
+ </LI>
+ <LI>Ron DeFulio
+ </LI>
+ <LI>Digirati (<TT><A NAME="tex2html41"
+ HREF="http://oss.digirati.com.br/">http://oss.digirati.com.br/</A></TT>)
+ </LI>
+ <LI>Steve Donegan (<TT><A NAME="tex2html42"
+ HREF="http://www.donegan.org/">http://www.donegan.org/</A></TT>)
+ </LI>
+ <LI>Dynamic Network Services, Inc (<TT><A NAME="tex2html43"
+ HREF="http://www.dyndns.org/">http://www.dyndns.org/</A></TT>)
+ </LI>
+ <LI>EAS Enterprises LLC
+ </LI>
+ <LI>eCoupons.com (<TT><A NAME="tex2html44"
+ HREF="http://www.ecoupons.com/">http://www.ecoupons.com/</A></TT>)
+ </LI>
+ <LI>Electric Embers (<TT><A NAME="tex2html45"
+ HREF="http://electricembers.net">http://electricembers.net</A></TT>)
+ </LI>
+ <LI>John T. Ellis
+ </LI>
+ <LI>Epublica
+ </LI>
+ <LI>Bernhard Erdmann
+ </LI>
+ <LI>David Eriksson (<TT><A NAME="tex2html46"
+ HREF="http://www.2good.nu/">http://www.2good.nu/</A></TT>)
+ </LI>
+ <LI>Philip Ershler
+ </LI>
+ <LI>Explido Software USA Inc. (<TT><A NAME="tex2html47"
+ HREF="http://www.explido.us/">http://www.explido.us/</A></TT>)
+ </LI>
+ <LI>David Farrick
+ </LI>
+ <LI>Jim Feldman
+ </LI>
+ <LI>Petr Ferschmann (<TT><A NAME="tex2html48"
+ HREF="http://petr.ferschmann.cz/">http://petr.ferschmann.cz/</A></TT>)
+ </LI>
+ <LI>Andries Filmer (<TT><A NAME="tex2html49"
+ HREF="http://www.netexpo.nl/">http://www.netexpo.nl/</A></TT>)
+ </LI>
+ <LI>The Free Shopping Cart people (<TT><A NAME="tex2html50"
+ HREF="http://www.precisionweb.net/">http://www.precisionweb.net/</A></TT>)
+ </LI>
+ <LI>Paul Freeman
+ </LI>
+ <LI>Jack Fung
+ </LI>
+ <LI>Stephen Gageby
+ </LI>
+ <LI>Paolo Galeazzi
+ </LI>
+ <LI>GANDI (<TT><A NAME="tex2html51"
+ HREF="http://www.gandi.net/">http://www.gandi.net/</A></TT>)
+ </LI>
+ <LI>Jeremy Garcia (<TT><A NAME="tex2html52"
+ HREF="http://www.linuxquestions.org/">http://www.linuxquestions.org/</A></TT>)
+ </LI>
+ <LI>GBC Internet Service Center GmbH (<TT><A NAME="tex2html53"
+ HREF="http://www.gbc.net/">http://www.gbc.net/</A></TT>)
+ </LI>
+ <LI>GCS Tech (<TT><A NAME="tex2html54"
+ HREF="http://www.gcstech.net/">http://www.gcstech.net/</A></TT>)
+ </LI>
+ <LI>GHRS (<TT><A NAME="tex2html55"
+ HREF="http://www.ghrshotels.com/">http://www.ghrshotels.com/</A></TT>)
+ </LI>
+ <LI>Lyle Giese
+ </LI>
+ <LI>Todd Goodman
+ </LI>
+ <LI>Bill Gradwohl (<TT><A NAME="tex2html56"
+ HREF="http://www.ycc.com/">http://www.ycc.com/</A></TT>)
+ </LI>
+ <LI>Grain-of-Salt Consulting
+ </LI>
+ <LI>Terje Gravvold
+ </LI>
+ <LI>Hart Computer (<TT><A NAME="tex2html57"
+ HREF="http://www.hart.co.jp/">http://www.hart.co.jp/</A></TT>)
+ </LI>
+ <LI>Pen Helm
+ </LI>
+ <LI>Hosting Metro LLC (<TT><A NAME="tex2html58"
+ HREF="http://www.hostingmetro.com/">http://www.hostingmetro.com/</A></TT>)
+ </LI>
+ <LI>IDEAL Software GmbH (<TT><A NAME="tex2html59"
+ HREF="http://www.IdealSoftware.com/">http://www.IdealSoftware.com/</A></TT>)
+ </LI>
+ <LI>Industry Standard Computers (<TT><A NAME="tex2html60"
+ HREF="http://www.ISCnetwork.com/">http://www.ISCnetwork.com/</A></TT>)
+ </LI>
+ <LI>Interact2Day (<TT><A NAME="tex2html61"
+ HREF="http://www.interact2day.com/">http://www.interact2day.com/</A></TT>)
+ </LI>
+ <LI>Invisik Corporation (<TT><A NAME="tex2html62"
+ HREF="http://www.invisik.com/">http://www.invisik.com/</A></TT>)
+ </LI>
+ <LI>itXcel Internet - Domain Registration (<TT><A NAME="tex2html63"
+ HREF="http://www.itxcel.com">http://www.itxcel.com</A></TT>)
+ </LI>
+ <LI>Craig Jackson
+ </LI>
+ <LI>Stuart Jones
+ </LI>
+ <LI>Jason Judge
+ </LI>
+ <LI>Keith (<TT><A NAME="tex2html64"
+ HREF="http://www.textpad.com/">http://www.textpad.com/</A></TT>)
+ </LI>
+ <LI>Ewald Kicker (<TT><A NAME="tex2html65"
+ HREF="http://www.very-clever.com/">http://www.very-clever.com/</A></TT>)
+ </LI>
+ <LI>Brad Koehn
+ </LI>
+ <LI>Christina Kuratli (<TT><A NAME="tex2html66"
+ HREF="http://www.virusprotect.ch/">http://www.virusprotect.ch/</A></TT>)
+ </LI>
+ <LI>Logic Partners Inc. (<TT><A NAME="tex2html67"
+ HREF="http://www.logicpartners.com/">http://www.logicpartners.com/</A></TT>)
+ </LI>
+ <LI>Mark Lotspaih (<TT><A NAME="tex2html68"
+ HREF="http://www.lotcom.org/">http://www.lotcom.org/</A></TT>)
+ </LI>
+ <LI>Michel Machado (<TT><A NAME="tex2html69"
+ HREF="http://oss.digirati.com.br/">http://oss.digirati.com.br/</A></TT>)
+ </LI>
+ <LI>Olivier Marechal
+ </LI>
+ <LI>Matthew McKenzie
+ </LI>
+ <LI>Durval Menezes (<TT><A NAME="tex2html70"
+ HREF="http://www.durval.com.br/">http://www.durval.com.br/</A></TT>)
+ </LI>
+ <LI>Micro Logic Systems (<TT><A NAME="tex2html71"
+ HREF="http://www.mls.nc/">http://www.mls.nc/</A></TT>)
+ </LI>
+ <LI>Midcoast Internet Solutions
+ </LI>
+ <LI>Mimecast (<TT><A NAME="tex2html72"
+ HREF="http://www.mimecast.com/">http://www.mimecast.com/</A></TT>)
+ </LI>
+ <LI>Kazuhiro Miyaji
+ </LI>
+ <LI>Bozidar Mladenovic
+ </LI>
+ <LI>Paul Morgan
+ </LI>
+ <LI>Tomas Morkus
+ </LI>
+ <LI>The Names Database (<TT><A NAME="tex2html73"
+ HREF="http://static.namesdatabase.com">http://static.namesdatabase.com</A></TT>)
+ </LI>
+ <LI>Names Directory (<TT><A NAME="tex2html74"
+ HREF="http://www.namesdir.com/">http://www.namesdir.com/</A></TT>)
+ </LI>
+ <LI>Michael Nolan (<TT><A NAME="tex2html75"
+ HREF="http://www.michaelnolan.co.uk/">http://www.michaelnolan.co.uk/</A></TT>)
+ </LI>
+ <LI>Jorgen Norgaard
+ </LI>
+ <LI>Numedeon, Inc. creators of Whyville (<TT><A NAME="tex2html76"
+ HREF="http://www.whyville.net/">http://www.whyville.net/</A></TT>)
+ </LI>
+ <LI>Oneworkspace.com (<TT><A NAME="tex2html77"
+ HREF="http://www.oneworkspace.com/">http://www.oneworkspace.com/</A></TT>)
+ </LI>
+ <LI>Online Literature (<TT><A NAME="tex2html78"
+ HREF="http://www.couol.com/">http://www.couol.com/</A></TT>)
+ </LI>
+ <LI>Origin Solutions (<TT><A NAME="tex2html79"
+ HREF="http://www.originsolutions.com.au/">http://www.originsolutions.com.au/</A></TT>)
+ </LI>
+ <LI>outermedia GmbH (<TT><A NAME="tex2html80"
+ HREF="http://www.outermedia.de/">http://www.outermedia.de/</A></TT>)
+ </LI>
+ <LI>Kevin Pang (<TT><A NAME="tex2html81"
+ HREF="http://www.freebsdblog.org/">http://www.freebsdblog.org/</A></TT>)
+ </LI>
+ <LI>Alexander Panzhin
+ </LI>
+ <LI>Passageway Communications (<TT><A NAME="tex2html82"
+ HREF="http://www.passageway.com">http://www.passageway.com</A></TT>)
+ </LI>
+ <LI>Dan Pelleg (<TT><A NAME="tex2html83"
+ HREF="http://www.libagent.org/">http://www.libagent.org/</A></TT>)
+ </LI>
+ <LI>Thodoris Pitikaris
+ </LI>
+ <LI>Paul Rantin
+ </LI>
+ <LI>Thomas J. Raef (<TT><A NAME="tex2html84"
+ HREF="http://www.ebasedsecurity.com">http://www.ebasedsecurity.com</A></TT>)
+ </LI>
+ <LI>Luke Reeves (<TT><A NAME="tex2html85"
+ HREF="http://www.neuro-tech.net/">http://www.neuro-tech.net/</A></TT>)
+ </LI>
+ <LI>RHX (<TT><A NAME="tex2html86"
+ HREF="http://www.rhx.it/">http://www.rhx.it/</A></TT>)
+ </LI>
+ <LI>Stefano Rizzetto
+ </LI>
+ <LI>Roaring Penguin Software Inc. (<TT><A NAME="tex2html87"
+ HREF="http://www.roaringpenguin.com/">http://www.roaringpenguin.com/</A></TT>)
+ </LI>
+ <LI>Luke Rosenthal
+ </LI>
+ <LI>Jenny Säfström (<TT><A NAME="tex2html88"
+ HREF="http://PokerListings.com">http://PokerListings.com</A></TT>)
+ </LI>
+ <LI>School of Engineering, University of Pennsylvania (<TT><A NAME="tex2html89"
+ HREF="http://www.seas.upenn.edu/">http://www.seas.upenn.edu/</A></TT>)
+ </LI>
+ <LI>Tim Scoff
+ </LI>
+ <LI>Seattle Server (<TT><A NAME="tex2html90"
+ HREF="http://www.seattleserver.com/">http://www.seattleserver.com/</A></TT>)
+ </LI>
+ <LI>Software Workshop Inc (<TT><A NAME="tex2html91"
+ HREF="http://www.softwareworkshop.com/">http://www.softwareworkshop.com/</A></TT>)
+ </LI>
+ <LI>Solutions In A Box (<TT><A NAME="tex2html92"
+ HREF="http://www.siab.com.au/">http://www.siab.com.au/</A></TT>)
+ </LI>
+ <LI>Stephane Rault
+ </LI>
+ <LI>SearchMain (<TT><A NAME="tex2html93"
+ HREF="http://www.searchmain.com/">http://www.searchmain.com/</A></TT>)
+ </LI>
+ <LI>Olivier Silber
+ </LI>
+ <LI>Fernando Augusto Medeiros Silva (<TT><A NAME="tex2html94"
+ HREF="http://www.linuxplace.com.br/">http://www.linuxplace.com.br/</A></TT>)
+ </LI>
+ <LI>Sollentuna Fria Gymnasium, Sweden (<TT><A NAME="tex2html95"
+ HREF="http://www.sfg.se/">http://www.sfg.se/</A></TT>)
+ </LI>
+ <LI>StarBand (<TT><A NAME="tex2html96"
+ HREF="http://www.starband.com/">http://www.starband.com/</A></TT>)
+ </LI>
+ <LI>Stroke of Color, Inc.
+ </LI>
+ <LI>Synchro Sistemas de Informacao (<TT><A NAME="tex2html97"
+ HREF="http://synchro.com.br/">http://synchro.com.br/</A></TT>)
+ </LI>
+ <LI>Sahil Tandon
+ </LI>
+ <LI>The Spamex Disposable Email Address Service (<TT><A NAME="tex2html98"
+ HREF="http://www.spamex.com">http://www.spamex.com</A></TT>)
+ </LI>
+ <LI>Brad Tarver
+ </LI>
+ <LI>TGT Tampermeier & Grill Steuerberatungs- und Wirtschaftstreuhand OEG (<TT><A NAME="tex2html99"
+ HREF="http://www.tgt.at/">http://www.tgt.at/</A></TT>)
+ </LI>
+ <LI>Per Reedtz Thomsen
+ </LI>
+ <LI>William Tisdale
+ </LI>
+ <LI>Up Time Technology (<TT><A NAME="tex2html100"
+ HREF="http://www.uptimetech.com/">http://www.uptimetech.com/</A></TT>)
+ </LI>
+ <LI>Ulfi
+ </LI>
+ <LI>Jeremy Vanderburg (<TT><A NAME="tex2html101"
+ HREF="http://www.jeremytech.com/">http://www.jeremytech.com/</A></TT>)
+ </LI>
+ <LI>Web.arbyte - Online-Marketing (<TT><A NAME="tex2html102"
+ HREF="http://www.webarbyte.de/">http://www.webarbyte.de/</A></TT>)
+ </LI>
+ <LI>Webzone Srl (<TT><A NAME="tex2html103"
+ HREF="http://www.webzone.it/">http://www.webzone.it/</A></TT>)
+ </LI>
+ <LI>Markus Welsch (<TT><A NAME="tex2html104"
+ HREF="http://www.linux-corner.net/">http://www.linux-corner.net/</A></TT>)
+ </LI>
+ <LI>Julia White (<TT><A NAME="tex2html105"
+ HREF="http://www.convert-tools.com/">http://www.convert-tools.com/</A></TT>)
+ </LI>
+ <LI>Nicklaus Wicker
+ </LI>
+ <LI>David Williams (<TT><A NAME="tex2html106"
+ HREF="http://kayakero.net/">http://kayakero.net/</A></TT>)
+ </LI>
+ <LI>Glenn R Williams
+ </LI>
+ <LI>Kelly Williams
+ </LI>
+ <LI>XRoads Networks (<TT><A NAME="tex2html107"
+ HREF="http://xroadsnetworks.com/">http://xroadsnetworks.com/</A></TT>)
+ </LI>
+ <LI>Zimbra open-source collaboration suite (<TT><A NAME="tex2html108"
+ HREF="http://www.zimbra.com/">http://www.zimbra.com/</A></TT>)
+
+ </LI>
+ </UL>
+
<P>
- Copyright © 1993, 1994, 1995, 1996,
- Nikos Drakos,
- Computer Based Learning Unit, University of Leeds.
+
+ <DIV CLASS="navigation"><HR>
+ <!--Navigation Panel-->
+ <A NAME="tex2html928"
+ HREF="node57.html">
+ <IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next" SRC="next.png"></A>
+ <A NAME="tex2html924"
+ HREF="node32.html">
+ <IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up" SRC="up.png"></A>
+ <A NAME="tex2html918"
+ HREF="node55.html">
+ <IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous" SRC="prev.png"></A>
+ <A NAME="tex2html926"
+ HREF="node1.html">
+ <IMG WIDTH="65" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="contents" SRC="contents.png"></A>
<BR>
- Copyright © 1997, 1998, 1999,
- <A HREF="http://www.maths.mq.edu.au/~ross/">Ross Moore</A>,
- Mathematics Department, Macquarie University, Sydney.
- <P>
- The command line arguments were: <BR>
- <STRONG>latex2html</STRONG> <TT>-local_icons clamdoc.tex</TT>
- <P>
- The translation was initiated by Tomasz Kojm on 2008-11-26
- <BR><HR>
+ <B> Next:</B> <A NAME="tex2html929"
+ HREF="node57.html">Graphics</A>
+ <B> Up:</B> <A NAME="tex2html925"
+ HREF="node32.html">LibClamAV</A>
+ <B> Previous:</B> <A NAME="tex2html919"
+ HREF="node55.html">Contributors</A>
+ <B> <A NAME="tex2html927"
+ HREF="node1.html">Contents</A></B> </DIV>
+ <!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
- 2008-11-26
+ 2009-02-25
++
</ADDRESS>
</BODY>
</HTML>
diff --combined etc/clamd.conf
index 5b0c3e1,f0da299..3d04340
--- a/etc/clamd.conf
+++ b/etc/clamd.conf
@@@ -11,7 -11,7 +11,7 @@@ Exampl
# LogFile must be writable for the user running daemon.
# A full path is required.
# Default: disabled
-#LogFile /tmp/clamd.log
+#LogFile /var/log/clamav/clamd.log
# By default the log file is locked for writing - the lock protects against
# running clamd multiple times (if want to run another clamd, please
@@@ -54,7 -54,7 +54,7 @@@
# This option allows you to save a process identifier of the listening
# daemon (main thread).
# Default: disabled
-#PidFile /var/run/clamd.pid
+#PidFile /var/run/clamav/clamd.pid
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@@ -69,7 -69,7 +69,7 @@@
# Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user)
-LocalSocket /tmp/clamd.socket
+LocalSocket /var/run/clamav/clamd
# Remove stale socket after unclean shutdown.
# Default: yes
@@@ -96,8 -96,8 +96,8 @@@
# Close the connection when the data size limit is exceeded.
# The value should match your MTA's limit for a maximum attachment size.
- # Default: 10M
- #StreamMaxLength 20M
+ # Default: 25M
+ #StreamMaxLength 10M
# Limit port range.
# Default: 1024
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list