Merge lp:ubuntu/quantal-security/clamav into lp:ubuntu/quantal/clamav
- Quantal (12.10)
- quantal-security
- Merge into quantal
Proposed by
joao paulo da silva
Status: | Rejected | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Rejected by: | Martin Pitt | ||||||||||||
Proposed branch: | lp:ubuntu/quantal-security/clamav | ||||||||||||
Merge into: | lp:ubuntu/quantal/clamav | ||||||||||||
Diff against target: | 35475 lines | ||||||||||||
To merge this branch: | bzr merge lp:ubuntu/quantal-security/clamav | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dmitry Shachnev | Disapprove | ||
Ubuntu branches | Pending | ||
Review via email: mp+156911@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 124. By Marc Deslauriers
-
Rebuild as a security update (LP: #1296856)
- 123. By Scott Kitterman
-
[ Seth Arnold ]
* SECURITY UPDATE: Updated to 0.97.8 to fix multiple security issues.
- CVE-2013-2020 and CVE-2013-2021[ Scott Kitterman ]
* Merge from Debian unstable (LP: #1172981). Remaining changes:
- Drop build-dep on electric-fence (in Universe)
- Add apparmor profiles for clamd and freshclam along with maintainer
script changes - 122. By Marc Deslauriers
-
* SECURITY UPDATE: Updated to 0.97.7 to fix multiple security issues.
(LP: #1157385)
- CVE numbers pending
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2012-10-08 12:29:39 +0000 |
3 | +++ ChangeLog 2013-04-03 16:48:24 +0000 |
4 | @@ -1,3 +1,8 @@ |
5 | +Wed Feb 20 10:05:00 EDT 2012 (multiple) |
6 | +--------------------------------- |
7 | + * Bug reported by Felix Groebert, Mateusz Jurczyk and Gynvael Coldwind of the |
8 | + Google Security Team. |
9 | + |
10 | Mon Sep 6 12:32:00 EDT 2012 (dar) |
11 | --------------------------------- |
12 | * libclamav: bb#5751 - cl_scansis() may returan a file descriptor instead |
13 | |
14 | === modified file 'Makefile.in' |
15 | --- Makefile.in 2012-06-19 21:39:28 +0000 |
16 | +++ Makefile.in 2013-04-03 16:48:24 +0000 |
17 | @@ -270,7 +270,6 @@ |
18 | PACKAGE_NAME = @PACKAGE_NAME@ |
19 | PACKAGE_STRING = @PACKAGE_STRING@ |
20 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
21 | -PACKAGE_URL = @PACKAGE_URL@ |
22 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
23 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
24 | RANLIB = @RANLIB@ |
25 | |
26 | === added file 'Makefile.in.orig' |
27 | --- Makefile.in.orig 1970-01-01 00:00:00 +0000 |
28 | +++ Makefile.in.orig 2013-04-03 16:48:24 +0000 |
29 | @@ -0,0 +1,968 @@ |
30 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. |
31 | +# @configure_input@ |
32 | + |
33 | +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
34 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
35 | +# Inc. |
36 | +# This Makefile.in is free software; the Free Software Foundation |
37 | +# gives unlimited permission to copy and/or distribute it, |
38 | +# with or without modifications, as long as this notice is preserved. |
39 | + |
40 | +# This program is distributed in the hope that it will be useful, |
41 | +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
42 | +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
43 | +# PARTICULAR PURPOSE. |
44 | + |
45 | +@SET_MAKE@ |
46 | + |
47 | +# |
48 | +# Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net> |
49 | +# |
50 | +# This program is free software; you can redistribute it and/or modify |
51 | +# it under the terms of the GNU General Public License as published by |
52 | +# the Free Software Foundation; either version 2 of the License, or |
53 | +# (at your option) any later version. |
54 | +# |
55 | +# This program is distributed in the hope that it will be useful, |
56 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
57 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
58 | +# GNU General Public License for more details. |
59 | +# |
60 | +# You should have received a copy of the GNU General Public License |
61 | +# along with this program; if not, write to the Free Software |
62 | +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
63 | +# MA 02110-1301, USA. |
64 | + |
65 | + |
66 | +VPATH = @srcdir@ |
67 | +pkgdatadir = $(datadir)/@PACKAGE@ |
68 | +pkgincludedir = $(includedir)/@PACKAGE@ |
69 | +pkglibdir = $(libdir)/@PACKAGE@ |
70 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ |
71 | +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
72 | +install_sh_DATA = $(install_sh) -c -m 644 |
73 | +install_sh_PROGRAM = $(install_sh) -c |
74 | +install_sh_SCRIPT = $(install_sh) -c |
75 | +INSTALL_HEADER = $(INSTALL_DATA) |
76 | +transform = $(program_transform_name) |
77 | +NORMAL_INSTALL = : |
78 | +PRE_INSTALL = : |
79 | +POST_INSTALL = : |
80 | +NORMAL_UNINSTALL = : |
81 | +PRE_UNINSTALL = : |
82 | +POST_UNINSTALL = : |
83 | +build_triplet = @build@ |
84 | +host_triplet = @host@ |
85 | +target_triplet = @target@ |
86 | +subdir = . |
87 | +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
88 | + $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \ |
89 | + $(srcdir)/clamav-config.in $(srcdir)/libclamav.pc.in \ |
90 | + $(srcdir)/platform.h.in $(top_srcdir)/configure \ |
91 | + $(top_srcdir)/docs/man/clamav-milter.8.in \ |
92 | + $(top_srcdir)/docs/man/clamav-milter.conf.5.in \ |
93 | + $(top_srcdir)/docs/man/clambc.1.in \ |
94 | + $(top_srcdir)/docs/man/clamconf.1.in \ |
95 | + $(top_srcdir)/docs/man/clamd.8.in \ |
96 | + $(top_srcdir)/docs/man/clamd.conf.5.in \ |
97 | + $(top_srcdir)/docs/man/clamdscan.1.in \ |
98 | + $(top_srcdir)/docs/man/clamdtop.1.in \ |
99 | + $(top_srcdir)/docs/man/clamscan.1.in \ |
100 | + $(top_srcdir)/docs/man/freshclam.1.in \ |
101 | + $(top_srcdir)/docs/man/freshclam.conf.5.in \ |
102 | + $(top_srcdir)/docs/man/sigtool.1.in AUTHORS COPYING ChangeLog \ |
103 | + INSTALL NEWS config/config.guess config/config.rpath \ |
104 | + config/config.sub config/depcomp config/install-sh \ |
105 | + config/ltmain.sh config/missing |
106 | +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
107 | +am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
108 | + $(top_srcdir)/m4/argz.m4 \ |
109 | + $(top_srcdir)/m4/ax_check_uname_syscall.m4 \ |
110 | + $(top_srcdir)/m4/fdpassing.m4 $(top_srcdir)/m4/lib-ld.m4 \ |
111 | + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ |
112 | + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/llvm.m4 \ |
113 | + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
114 | + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
115 | + $(top_srcdir)/m4/lt~obsolete.m4 \ |
116 | + $(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \ |
117 | + $(top_srcdir)/configure.in |
118 | +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
119 | + $(ACLOCAL_M4) |
120 | +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
121 | + configure.lineno config.status.lineno |
122 | +mkinstalldirs = $(install_sh) -d |
123 | +CONFIG_HEADER = clamav-config.h |
124 | +CONFIG_CLEAN_FILES = clamav-config libclamav.pc platform.h \ |
125 | + docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 \ |
126 | + docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 \ |
127 | + docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 \ |
128 | + docs/man/freshclam.1 docs/man/freshclam.conf.5 \ |
129 | + docs/man/sigtool.1 docs/man/clamdtop.1 |
130 | +CONFIG_CLEAN_VPATH_FILES = |
131 | +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
132 | +am__vpath_adj = case $$p in \ |
133 | + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
134 | + *) f=$$p;; \ |
135 | + esac; |
136 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; |
137 | +am__install_max = 40 |
138 | +am__nobase_strip_setup = \ |
139 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` |
140 | +am__nobase_strip = \ |
141 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" |
142 | +am__nobase_list = $(am__nobase_strip_setup); \ |
143 | + for p in $$list; do echo "$$p $$p"; done | \ |
144 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
145 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
146 | + if (++n[$$2] == $(am__install_max)) \ |
147 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
148 | + END { for (dir in files) print dir, files[dir] }' |
149 | +am__base_list = \ |
150 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
151 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
152 | +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" |
153 | +SCRIPTS = $(bin_SCRIPTS) |
154 | +AM_V_GEN = $(am__v_GEN_$(V)) |
155 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
156 | +am__v_GEN_0 = @echo " GEN " $@; |
157 | +AM_V_at = $(am__v_at_$(V)) |
158 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
159 | +am__v_at_0 = @ |
160 | +SOURCES = |
161 | +DIST_SOURCES = |
162 | +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
163 | + html-recursive info-recursive install-data-recursive \ |
164 | + install-dvi-recursive install-exec-recursive \ |
165 | + install-html-recursive install-info-recursive \ |
166 | + install-pdf-recursive install-ps-recursive install-recursive \ |
167 | + installcheck-recursive installdirs-recursive pdf-recursive \ |
168 | + ps-recursive uninstall-recursive |
169 | +DATA = $(pkgconfig_DATA) |
170 | +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
171 | + distclean-recursive maintainer-clean-recursive |
172 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
173 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
174 | + distdir dist dist-all distcheck |
175 | +ETAGS = etags |
176 | +CTAGS = ctags |
177 | +DIST_SUBDIRS = $(SUBDIRS) |
178 | +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
179 | +distdir = $(PACKAGE)-$(VERSION) |
180 | +top_distdir = $(distdir) |
181 | +am__remove_distdir = \ |
182 | + { test ! -d "$(distdir)" \ |
183 | + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
184 | + && rm -fr "$(distdir)"; }; } |
185 | +am__relativize = \ |
186 | + dir0=`pwd`; \ |
187 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
188 | + sed_rest='s,^[^/]*/*,,'; \ |
189 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ |
190 | + sed_butlast='s,/*[^/]*$$,,'; \ |
191 | + while test -n "$$dir1"; do \ |
192 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ |
193 | + if test "$$first" != "."; then \ |
194 | + if test "$$first" = ".."; then \ |
195 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ |
196 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ |
197 | + else \ |
198 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ |
199 | + if test "$$first2" = "$$first"; then \ |
200 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ |
201 | + else \ |
202 | + dir2="../$$dir2"; \ |
203 | + fi; \ |
204 | + dir0="$$dir0"/"$$first"; \ |
205 | + fi; \ |
206 | + fi; \ |
207 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
208 | + done; \ |
209 | + reldir="$$dir2" |
210 | +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 |
211 | +GZIP_ENV = --best |
212 | +distcleancheck_listfiles = find . -type f -print |
213 | +ACLOCAL = @ACLOCAL@ |
214 | +AMTAR = @AMTAR@ |
215 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
216 | +AR = @AR@ |
217 | +ARGZ_H = @ARGZ_H@ |
218 | +AUTOCONF = @AUTOCONF@ |
219 | +AUTOHEADER = @AUTOHEADER@ |
220 | +AUTOMAKE = @AUTOMAKE@ |
221 | +AWK = @AWK@ |
222 | +BUILD_CONFIGURE_FLAGS = @BUILD_CONFIGURE_FLAGS@ |
223 | +CC = @CC@ |
224 | +CCDEPMODE = @CCDEPMODE@ |
225 | +CFGDIR = @CFGDIR@ |
226 | +CFLAGS = @CFLAGS@ |
227 | +CHECK_CPPFLAGS = @CHECK_CPPFLAGS@ |
228 | +CHECK_LIBS = @CHECK_LIBS@ |
229 | +CLAMAVGROUP = @CLAMAVGROUP@ |
230 | +CLAMAVUSER = @CLAMAVUSER@ |
231 | +CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@ |
232 | +CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@ |
233 | +CLAMD_LIBS = @CLAMD_LIBS@ |
234 | +CPP = @CPP@ |
235 | +CPPFLAGS = @CPPFLAGS@ |
236 | +CURSES_CPPFLAGS = @CURSES_CPPFLAGS@ |
237 | +CURSES_LIBS = @CURSES_LIBS@ |
238 | +CYGPATH_W = @CYGPATH_W@ |
239 | +DBDIR = @DBDIR@ |
240 | +DEFS = @DEFS@ |
241 | +DEPDIR = @DEPDIR@ |
242 | +DSYMUTIL = @DSYMUTIL@ |
243 | +DUMPBIN = @DUMPBIN@ |
244 | +ECHO_C = @ECHO_C@ |
245 | +ECHO_N = @ECHO_N@ |
246 | +ECHO_T = @ECHO_T@ |
247 | +EGREP = @EGREP@ |
248 | +EXEEXT = @EXEEXT@ |
249 | +FGREP = @FGREP@ |
250 | +FRESHCLAM_LIBS = @FRESHCLAM_LIBS@ |
251 | +GCOV = @GCOV@ |
252 | +GENHTML = @GENHTML@ |
253 | +GETENT = @GETENT@ |
254 | +GPERF = @GPERF@ |
255 | +GREP = @GREP@ |
256 | +INCLTDL = @INCLTDL@ |
257 | +INSTALL = @INSTALL@ |
258 | +INSTALL_DATA = @INSTALL_DATA@ |
259 | +INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
260 | +INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
261 | +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
262 | +LCOV = @LCOV@ |
263 | +LD = @LD@ |
264 | +LDFLAGS = @LDFLAGS@ |
265 | +LIBADD_DL = @LIBADD_DL@ |
266 | +LIBADD_DLD_LINK = @LIBADD_DLD_LINK@ |
267 | +LIBADD_DLOPEN = @LIBADD_DLOPEN@ |
268 | +LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@ |
269 | +LIBBZ2 = @LIBBZ2@ |
270 | +LIBBZ2_PREFIX = @LIBBZ2_PREFIX@ |
271 | +LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@ |
272 | +LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@ |
273 | +LIBLTDL = @LIBLTDL@ |
274 | +LIBM = @LIBM@ |
275 | +LIBOBJS = @LIBOBJS@ |
276 | +LIBS = @LIBS@ |
277 | +LIBTOOL = @LIBTOOL@ |
278 | +LIPO = @LIPO@ |
279 | +LN_S = @LN_S@ |
280 | +LTDLDEPS = @LTDLDEPS@ |
281 | +LTDLINCL = @LTDLINCL@ |
282 | +LTDLOPEN = @LTDLOPEN@ |
283 | +LTLIBBZ2 = @LTLIBBZ2@ |
284 | +LTLIBOBJS = @LTLIBOBJS@ |
285 | +LT_CONFIG_H = @LT_CONFIG_H@ |
286 | +LT_DLLOADERS = @LT_DLLOADERS@ |
287 | +LT_DLPREOPEN = @LT_DLPREOPEN@ |
288 | +MAINT = @MAINT@ |
289 | +MAKEINFO = @MAKEINFO@ |
290 | +MKDIR_P = @MKDIR_P@ |
291 | +NM = @NM@ |
292 | +NMEDIT = @NMEDIT@ |
293 | +OBJDUMP = @OBJDUMP@ |
294 | +OBJEXT = @OBJEXT@ |
295 | +OTOOL = @OTOOL@ |
296 | +OTOOL64 = @OTOOL64@ |
297 | +PACKAGE = @PACKAGE@ |
298 | +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
299 | +PACKAGE_NAME = @PACKAGE_NAME@ |
300 | +PACKAGE_STRING = @PACKAGE_STRING@ |
301 | +PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
302 | +PACKAGE_VERSION = @PACKAGE_VERSION@ |
303 | +PATH_SEPARATOR = @PATH_SEPARATOR@ |
304 | +RANLIB = @RANLIB@ |
305 | +SED = @SED@ |
306 | +SET_MAKE = @SET_MAKE@ |
307 | +SHELL = @SHELL@ |
308 | +STRIP = @STRIP@ |
309 | +THREAD_LIBS = @THREAD_LIBS@ |
310 | +TH_SAFE = @TH_SAFE@ |
311 | +VERSION = @VERSION@ |
312 | +VERSIONSCRIPTFLAG = @VERSIONSCRIPTFLAG@ |
313 | +abs_builddir = @abs_builddir@ |
314 | +abs_srcdir = @abs_srcdir@ |
315 | +abs_top_builddir = @abs_top_builddir@ |
316 | +abs_top_srcdir = @abs_top_srcdir@ |
317 | +ac_ct_CC = @ac_ct_CC@ |
318 | +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
319 | +am__include = @am__include@ |
320 | +am__leading_dot = @am__leading_dot@ |
321 | +am__quote = @am__quote@ |
322 | +am__tar = @am__tar@ |
323 | +am__untar = @am__untar@ |
324 | +bindir = @bindir@ |
325 | +build = @build@ |
326 | +build_alias = @build_alias@ |
327 | +build_cpu = @build_cpu@ |
328 | +build_os = @build_os@ |
329 | +build_vendor = @build_vendor@ |
330 | +builddir = @builddir@ |
331 | +datadir = @datadir@ |
332 | +datarootdir = @datarootdir@ |
333 | +docdir = @docdir@ |
334 | +dvidir = @dvidir@ |
335 | +exec_prefix = @exec_prefix@ |
336 | +host = @host@ |
337 | +host_alias = @host_alias@ |
338 | +host_cpu = @host_cpu@ |
339 | +host_os = @host_os@ |
340 | +host_vendor = @host_vendor@ |
341 | +htmldir = @htmldir@ |
342 | +includedir = @includedir@ |
343 | +infodir = @infodir@ |
344 | +install_sh = @install_sh@ |
345 | +libdir = @libdir@ |
346 | +libexecdir = @libexecdir@ |
347 | +localedir = @localedir@ |
348 | +localstatedir = @localstatedir@ |
349 | +lt_ECHO = @lt_ECHO@ |
350 | +ltdl_LIBOBJS = @ltdl_LIBOBJS@ |
351 | +ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
352 | +mandir = @mandir@ |
353 | +mkdir_p = @mkdir_p@ |
354 | +oldincludedir = @oldincludedir@ |
355 | +pdfdir = @pdfdir@ |
356 | +prefix = @prefix@ |
357 | +program_transform_name = @program_transform_name@ |
358 | +psdir = @psdir@ |
359 | +sbindir = @sbindir@ |
360 | +sharedstatedir = @sharedstatedir@ |
361 | +srcdir = @srcdir@ |
362 | +subdirs = @subdirs@ |
363 | +sys_symbol_underscore = @sys_symbol_underscore@ |
364 | +sysconfdir = @sysconfdir@ |
365 | +target = @target@ |
366 | +target_alias = @target_alias@ |
367 | +target_cpu = @target_cpu@ |
368 | +target_os = @target_os@ |
369 | +target_vendor = @target_vendor@ |
370 | +top_build_prefix = @top_build_prefix@ |
371 | +top_builddir = @top_builddir@ |
372 | +top_srcdir = @top_srcdir@ |
373 | +ACLOCAL_AMFLAGS = -I m4 |
374 | +SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests |
375 | +EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map contrib |
376 | +bin_SCRIPTS = clamav-config |
377 | +pkgconfigdir = $(libdir)/pkgconfig |
378 | +pkgconfig_DATA = libclamav.pc |
379 | + |
380 | +# don't complain that configuration files and databases are not removed, this is intended |
381 | +distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print |
382 | +DISTCLEANFILES = target.h |
383 | +DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes |
384 | +all: clamav-config.h |
385 | + $(MAKE) $(AM_MAKEFLAGS) all-recursive |
386 | + |
387 | +.SUFFIXES: |
388 | +am--refresh: |
389 | + @: |
390 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
391 | + @for dep in $?; do \ |
392 | + case '$(am__configure_deps)' in \ |
393 | + *$$dep*) \ |
394 | + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ |
395 | + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ |
396 | + && exit 0; \ |
397 | + exit 1;; \ |
398 | + esac; \ |
399 | + done; \ |
400 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ |
401 | + $(am__cd) $(top_srcdir) && \ |
402 | + $(AUTOMAKE) --foreign Makefile |
403 | +.PRECIOUS: Makefile |
404 | +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
405 | + @case '$?' in \ |
406 | + *config.status*) \ |
407 | + echo ' $(SHELL) ./config.status'; \ |
408 | + $(SHELL) ./config.status;; \ |
409 | + *) \ |
410 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
411 | + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
412 | + esac; |
413 | + |
414 | +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
415 | + $(SHELL) ./config.status --recheck |
416 | + |
417 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
418 | + $(am__cd) $(srcdir) && $(AUTOCONF) |
419 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
420 | + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
421 | +$(am__aclocal_m4_deps): |
422 | + |
423 | +clamav-config.h: stamp-h1 |
424 | + @if test ! -f $@; then \ |
425 | + rm -f stamp-h1; \ |
426 | + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
427 | + else :; fi |
428 | + |
429 | +stamp-h1: $(srcdir)/clamav-config.h.in $(top_builddir)/config.status |
430 | + @rm -f stamp-h1 |
431 | + cd $(top_builddir) && $(SHELL) ./config.status clamav-config.h |
432 | +$(srcdir)/clamav-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
433 | + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) |
434 | + rm -f stamp-h1 |
435 | + touch $@ |
436 | + |
437 | +distclean-hdr: |
438 | + -rm -f clamav-config.h stamp-h1 |
439 | +clamav-config: $(top_builddir)/config.status $(srcdir)/clamav-config.in |
440 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
441 | +libclamav.pc: $(top_builddir)/config.status $(srcdir)/libclamav.pc.in |
442 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
443 | +platform.h: $(top_builddir)/config.status $(srcdir)/platform.h.in |
444 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
445 | +docs/man/clamav-milter.8: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamav-milter.8.in |
446 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
447 | +docs/man/clamav-milter.conf.5: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamav-milter.conf.5.in |
448 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
449 | +docs/man/clambc.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clambc.1.in |
450 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
451 | +docs/man/clamconf.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamconf.1.in |
452 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
453 | +docs/man/clamd.8: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamd.8.in |
454 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
455 | +docs/man/clamd.conf.5: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamd.conf.5.in |
456 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
457 | +docs/man/clamdscan.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamdscan.1.in |
458 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
459 | +docs/man/clamscan.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamscan.1.in |
460 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
461 | +docs/man/freshclam.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/freshclam.1.in |
462 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
463 | +docs/man/freshclam.conf.5: $(top_builddir)/config.status $(top_srcdir)/docs/man/freshclam.conf.5.in |
464 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
465 | +docs/man/sigtool.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/sigtool.1.in |
466 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
467 | +docs/man/clamdtop.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clamdtop.1.in |
468 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
469 | +install-binSCRIPTS: $(bin_SCRIPTS) |
470 | + @$(NORMAL_INSTALL) |
471 | + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
472 | + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ |
473 | + for p in $$list; do \ |
474 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
475 | + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ |
476 | + done | \ |
477 | + sed -e 'p;s,.*/,,;n' \ |
478 | + -e 'h;s|.*|.|' \ |
479 | + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ |
480 | + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ |
481 | + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ |
482 | + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ |
483 | + if (++n[d] == $(am__install_max)) { \ |
484 | + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ |
485 | + else { print "f", d "/" $$4, $$1 } } \ |
486 | + END { for (d in files) print "f", d, files[d] }' | \ |
487 | + while read type dir files; do \ |
488 | + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
489 | + test -z "$$files" || { \ |
490 | + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
491 | + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
492 | + } \ |
493 | + ; done |
494 | + |
495 | +uninstall-binSCRIPTS: |
496 | + @$(NORMAL_UNINSTALL) |
497 | + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ |
498 | + files=`for p in $$list; do echo "$$p"; done | \ |
499 | + sed -e 's,.*/,,;$(transform)'`; \ |
500 | + test -n "$$list" || exit 0; \ |
501 | + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
502 | + cd "$(DESTDIR)$(bindir)" && rm -f $$files |
503 | + |
504 | +installcheck-binSCRIPTS: $(bin_SCRIPTS) |
505 | + bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \ |
506 | + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
507 | + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
508 | + esac; \ |
509 | + f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ |
510 | + for opt in --help --version; do \ |
511 | + if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
512 | + 2>c$${pid}_.err </dev/null \ |
513 | + && test -n "`cat c$${pid}_.out`" \ |
514 | + && test -z "`cat c$${pid}_.err`"; then :; \ |
515 | + else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
516 | + done; \ |
517 | + done; rm -f c$${pid}_.???; exit $$bad |
518 | + |
519 | +mostlyclean-libtool: |
520 | + -rm -f *.lo |
521 | + |
522 | +clean-libtool: |
523 | + -rm -rf .libs _libs |
524 | + |
525 | +distclean-libtool: |
526 | + -rm -f libtool config.lt |
527 | +install-pkgconfigDATA: $(pkgconfig_DATA) |
528 | + @$(NORMAL_INSTALL) |
529 | + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
530 | + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
531 | + for p in $$list; do \ |
532 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
533 | + echo "$$d$$p"; \ |
534 | + done | $(am__base_list) | \ |
535 | + while read files; do \ |
536 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ |
537 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ |
538 | + done |
539 | + |
540 | +uninstall-pkgconfigDATA: |
541 | + @$(NORMAL_UNINSTALL) |
542 | + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
543 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
544 | + test -n "$$files" || exit 0; \ |
545 | + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ |
546 | + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files |
547 | + |
548 | +# This directory's subdirectories are mostly independent; you can cd |
549 | +# into them and run `make' without going through this Makefile. |
550 | +# To change the values of `make' variables: instead of editing Makefiles, |
551 | +# (1) if the variable is set in `config.status', edit `config.status' |
552 | +# (which will cause the Makefiles to be regenerated when you run `make'); |
553 | +# (2) otherwise, pass the desired values on the `make' command line. |
554 | +$(RECURSIVE_TARGETS): |
555 | + @fail= failcom='exit 1'; \ |
556 | + for f in x $$MAKEFLAGS; do \ |
557 | + case $$f in \ |
558 | + *=* | --[!k]*);; \ |
559 | + *k*) failcom='fail=yes';; \ |
560 | + esac; \ |
561 | + done; \ |
562 | + dot_seen=no; \ |
563 | + target=`echo $@ | sed s/-recursive//`; \ |
564 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
565 | + echo "Making $$target in $$subdir"; \ |
566 | + if test "$$subdir" = "."; then \ |
567 | + dot_seen=yes; \ |
568 | + local_target="$$target-am"; \ |
569 | + else \ |
570 | + local_target="$$target"; \ |
571 | + fi; \ |
572 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
573 | + || eval $$failcom; \ |
574 | + done; \ |
575 | + if test "$$dot_seen" = "no"; then \ |
576 | + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
577 | + fi; test -z "$$fail" |
578 | + |
579 | +$(RECURSIVE_CLEAN_TARGETS): |
580 | + @fail= failcom='exit 1'; \ |
581 | + for f in x $$MAKEFLAGS; do \ |
582 | + case $$f in \ |
583 | + *=* | --[!k]*);; \ |
584 | + *k*) failcom='fail=yes';; \ |
585 | + esac; \ |
586 | + done; \ |
587 | + dot_seen=no; \ |
588 | + case "$@" in \ |
589 | + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
590 | + *) list='$(SUBDIRS)' ;; \ |
591 | + esac; \ |
592 | + rev=''; for subdir in $$list; do \ |
593 | + if test "$$subdir" = "."; then :; else \ |
594 | + rev="$$subdir $$rev"; \ |
595 | + fi; \ |
596 | + done; \ |
597 | + rev="$$rev ."; \ |
598 | + target=`echo $@ | sed s/-recursive//`; \ |
599 | + for subdir in $$rev; do \ |
600 | + echo "Making $$target in $$subdir"; \ |
601 | + if test "$$subdir" = "."; then \ |
602 | + local_target="$$target-am"; \ |
603 | + else \ |
604 | + local_target="$$target"; \ |
605 | + fi; \ |
606 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
607 | + || eval $$failcom; \ |
608 | + done && test -z "$$fail" |
609 | +tags-recursive: |
610 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
611 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
612 | + done |
613 | +ctags-recursive: |
614 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
615 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
616 | + done |
617 | + |
618 | +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
619 | + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
620 | + unique=`for i in $$list; do \ |
621 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
622 | + done | \ |
623 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
624 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
625 | + mkid -fID $$unique |
626 | +tags: TAGS |
627 | + |
628 | +TAGS: tags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \ |
629 | + $(TAGS_FILES) $(LISP) |
630 | + set x; \ |
631 | + here=`pwd`; \ |
632 | + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
633 | + include_option=--etags-include; \ |
634 | + empty_fix=.; \ |
635 | + else \ |
636 | + include_option=--include; \ |
637 | + empty_fix=; \ |
638 | + fi; \ |
639 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
640 | + if test "$$subdir" = .; then :; else \ |
641 | + test ! -f $$subdir/TAGS || \ |
642 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
643 | + fi; \ |
644 | + done; \ |
645 | + list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(TAGS_FILES)'; \ |
646 | + unique=`for i in $$list; do \ |
647 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
648 | + done | \ |
649 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
650 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
651 | + shift; \ |
652 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
653 | + test -n "$$unique" || unique=$$empty_fix; \ |
654 | + if test $$# -gt 0; then \ |
655 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
656 | + "$$@" $$unique; \ |
657 | + else \ |
658 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
659 | + $$unique; \ |
660 | + fi; \ |
661 | + fi |
662 | +ctags: CTAGS |
663 | +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \ |
664 | + $(TAGS_FILES) $(LISP) |
665 | + list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(TAGS_FILES)'; \ |
666 | + unique=`for i in $$list; do \ |
667 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
668 | + done | \ |
669 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
670 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
671 | + test -z "$(CTAGS_ARGS)$$unique" \ |
672 | + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
673 | + $$unique |
674 | + |
675 | +GTAGS: |
676 | + here=`$(am__cd) $(top_builddir) && pwd` \ |
677 | + && $(am__cd) $(top_srcdir) \ |
678 | + && gtags -i $(GTAGS_ARGS) "$$here" |
679 | + |
680 | +distclean-tags: |
681 | + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
682 | + |
683 | +distdir: $(DISTFILES) |
684 | + $(am__remove_distdir) |
685 | + test -d "$(distdir)" || mkdir "$(distdir)" |
686 | + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
687 | + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
688 | + list='$(DISTFILES)'; \ |
689 | + dist_files=`for file in $$list; do echo $$file; done | \ |
690 | + sed -e "s|^$$srcdirstrip/||;t" \ |
691 | + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
692 | + case $$dist_files in \ |
693 | + */*) $(MKDIR_P) `echo "$$dist_files" | \ |
694 | + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
695 | + sort -u` ;; \ |
696 | + esac; \ |
697 | + for file in $$dist_files; do \ |
698 | + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
699 | + if test -d $$d/$$file; then \ |
700 | + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
701 | + if test -d "$(distdir)/$$file"; then \ |
702 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
703 | + fi; \ |
704 | + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
705 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
706 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
707 | + fi; \ |
708 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
709 | + else \ |
710 | + test -f "$(distdir)/$$file" \ |
711 | + || cp -p $$d/$$file "$(distdir)/$$file" \ |
712 | + || exit 1; \ |
713 | + fi; \ |
714 | + done |
715 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
716 | + if test "$$subdir" = .; then :; else \ |
717 | + test -d "$(distdir)/$$subdir" \ |
718 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
719 | + || exit 1; \ |
720 | + fi; \ |
721 | + done |
722 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
723 | + if test "$$subdir" = .; then :; else \ |
724 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
725 | + $(am__relativize); \ |
726 | + new_distdir=$$reldir; \ |
727 | + dir1=$$subdir; dir2="$(top_distdir)"; \ |
728 | + $(am__relativize); \ |
729 | + new_top_distdir=$$reldir; \ |
730 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ |
731 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ |
732 | + ($(am__cd) $$subdir && \ |
733 | + $(MAKE) $(AM_MAKEFLAGS) \ |
734 | + top_distdir="$$new_top_distdir" \ |
735 | + distdir="$$new_distdir" \ |
736 | + am__remove_distdir=: \ |
737 | + am__skip_length_check=: \ |
738 | + am__skip_mode_fix=: \ |
739 | + distdir) \ |
740 | + || exit 1; \ |
741 | + fi; \ |
742 | + done |
743 | + $(MAKE) $(AM_MAKEFLAGS) \ |
744 | + top_distdir="$(top_distdir)" distdir="$(distdir)" \ |
745 | + dist-hook |
746 | + -test -n "$(am__skip_mode_fix)" \ |
747 | + || find "$(distdir)" -type d ! -perm -755 \ |
748 | + -exec chmod u+rwx,go+rx {} \; -o \ |
749 | + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
750 | + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
751 | + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
752 | + || chmod -R a+r "$(distdir)" |
753 | +dist-gzip: distdir |
754 | + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
755 | + $(am__remove_distdir) |
756 | +dist-bzip2: distdir |
757 | + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
758 | + $(am__remove_distdir) |
759 | + |
760 | +dist-lzma: distdir |
761 | + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
762 | + $(am__remove_distdir) |
763 | + |
764 | +dist-xz: distdir |
765 | + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
766 | + $(am__remove_distdir) |
767 | + |
768 | +dist-tarZ: distdir |
769 | + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
770 | + $(am__remove_distdir) |
771 | + |
772 | +dist-shar: distdir |
773 | + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
774 | + $(am__remove_distdir) |
775 | + |
776 | +dist-zip: distdir |
777 | + -rm -f $(distdir).zip |
778 | + zip -rq $(distdir).zip $(distdir) |
779 | + $(am__remove_distdir) |
780 | + |
781 | +dist dist-all: distdir |
782 | + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
783 | + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
784 | + $(am__remove_distdir) |
785 | + |
786 | +# This target untars the dist file and tries a VPATH configuration. Then |
787 | +# it guarantees that the distribution is self-contained by making another |
788 | +# tarfile. |
789 | +distcheck: dist |
790 | + case '$(DIST_ARCHIVES)' in \ |
791 | + *.tar.gz*) \ |
792 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
793 | + *.tar.bz2*) \ |
794 | + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
795 | + *.tar.lzma*) \ |
796 | + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
797 | + *.tar.xz*) \ |
798 | + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
799 | + *.tar.Z*) \ |
800 | + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
801 | + *.shar.gz*) \ |
802 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
803 | + *.zip*) \ |
804 | + unzip $(distdir).zip ;;\ |
805 | + esac |
806 | + chmod -R a-w $(distdir); chmod a+w $(distdir) |
807 | + mkdir $(distdir)/_build |
808 | + mkdir $(distdir)/_inst |
809 | + chmod a-w $(distdir) |
810 | + test -d $(distdir)/_build || exit 0; \ |
811 | + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
812 | + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
813 | + && am__cwd=`pwd` \ |
814 | + && $(am__cd) $(distdir)/_build \ |
815 | + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
816 | + $(DISTCHECK_CONFIGURE_FLAGS) \ |
817 | + && $(MAKE) $(AM_MAKEFLAGS) \ |
818 | + && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
819 | + && $(MAKE) $(AM_MAKEFLAGS) check \ |
820 | + && $(MAKE) $(AM_MAKEFLAGS) install \ |
821 | + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ |
822 | + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ |
823 | + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ |
824 | + distuninstallcheck \ |
825 | + && chmod -R a-w "$$dc_install_base" \ |
826 | + && ({ \ |
827 | + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ |
828 | + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ |
829 | + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ |
830 | + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ |
831 | + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ |
832 | + } || { rm -rf "$$dc_destdir"; exit 1; }) \ |
833 | + && rm -rf "$$dc_destdir" \ |
834 | + && $(MAKE) $(AM_MAKEFLAGS) dist \ |
835 | + && rm -rf $(DIST_ARCHIVES) \ |
836 | + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
837 | + && cd "$$am__cwd" \ |
838 | + || exit 1 |
839 | + $(am__remove_distdir) |
840 | + @(echo "$(distdir) archives ready for distribution: "; \ |
841 | + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
842 | + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
843 | +distuninstallcheck: |
844 | + @$(am__cd) '$(distuninstallcheck_dir)' \ |
845 | + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
846 | + || { echo "ERROR: files left after uninstall:" ; \ |
847 | + if test -n "$(DESTDIR)"; then \ |
848 | + echo " (check DESTDIR support)"; \ |
849 | + fi ; \ |
850 | + $(distuninstallcheck_listfiles) ; \ |
851 | + exit 1; } >&2 |
852 | +distcleancheck: distclean |
853 | + @if test '$(srcdir)' = . ; then \ |
854 | + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ |
855 | + exit 1 ; \ |
856 | + fi |
857 | + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ |
858 | + || { echo "ERROR: files left in build directory after distclean:" ; \ |
859 | + $(distcleancheck_listfiles) ; \ |
860 | + exit 1; } >&2 |
861 | +check-am: all-am |
862 | +check: check-recursive |
863 | +all-am: Makefile $(SCRIPTS) $(DATA) clamav-config.h |
864 | +installdirs: installdirs-recursive |
865 | +installdirs-am: |
866 | + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \ |
867 | + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
868 | + done |
869 | +install: install-recursive |
870 | +install-exec: install-exec-recursive |
871 | +install-data: install-data-recursive |
872 | +uninstall: uninstall-recursive |
873 | + |
874 | +install-am: all-am |
875 | + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
876 | + |
877 | +installcheck: installcheck-recursive |
878 | +install-strip: |
879 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
880 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
881 | + `test -z '$(STRIP)' || \ |
882 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
883 | +mostlyclean-generic: |
884 | + |
885 | +clean-generic: |
886 | + |
887 | +distclean-generic: |
888 | + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
889 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
890 | + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) |
891 | + |
892 | +maintainer-clean-generic: |
893 | + @echo "This command is intended for maintainers to use" |
894 | + @echo "it deletes files that may require special tools to rebuild." |
895 | +clean: clean-recursive |
896 | + |
897 | +clean-am: clean-generic clean-libtool mostlyclean-am |
898 | + |
899 | +distclean: distclean-recursive |
900 | + -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
901 | + -rm -f Makefile |
902 | +distclean-am: clean-am distclean-generic distclean-hdr \ |
903 | + distclean-libtool distclean-tags |
904 | + |
905 | +dvi: dvi-recursive |
906 | + |
907 | +dvi-am: |
908 | + |
909 | +html: html-recursive |
910 | + |
911 | +html-am: |
912 | + |
913 | +info: info-recursive |
914 | + |
915 | +info-am: |
916 | + |
917 | +install-data-am: install-pkgconfigDATA |
918 | + |
919 | +install-dvi: install-dvi-recursive |
920 | + |
921 | +install-dvi-am: |
922 | + |
923 | +install-exec-am: install-binSCRIPTS |
924 | + |
925 | +install-html: install-html-recursive |
926 | + |
927 | +install-html-am: |
928 | + |
929 | +install-info: install-info-recursive |
930 | + |
931 | +install-info-am: |
932 | + |
933 | +install-man: |
934 | + |
935 | +install-pdf: install-pdf-recursive |
936 | + |
937 | +install-pdf-am: |
938 | + |
939 | +install-ps: install-ps-recursive |
940 | + |
941 | +install-ps-am: |
942 | + |
943 | +installcheck-am: installcheck-binSCRIPTS |
944 | + |
945 | +maintainer-clean: maintainer-clean-recursive |
946 | + -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
947 | + -rm -rf $(top_srcdir)/autom4te.cache |
948 | + -rm -f Makefile |
949 | +maintainer-clean-am: distclean-am maintainer-clean-generic |
950 | + |
951 | +mostlyclean: mostlyclean-recursive |
952 | + |
953 | +mostlyclean-am: mostlyclean-generic mostlyclean-libtool |
954 | + |
955 | +pdf: pdf-recursive |
956 | + |
957 | +pdf-am: |
958 | + |
959 | +ps: ps-recursive |
960 | + |
961 | +ps-am: |
962 | + |
963 | +uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA |
964 | + |
965 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
966 | + ctags-recursive install-am install-strip tags-recursive |
967 | + |
968 | +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
969 | + all all-am am--refresh check check-am clean clean-generic \ |
970 | + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
971 | + dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ |
972 | + dist-zip distcheck distclean distclean-generic distclean-hdr \ |
973 | + distclean-libtool distclean-tags distcleancheck distdir \ |
974 | + distuninstallcheck dvi dvi-am html html-am info info-am \ |
975 | + install install-am install-binSCRIPTS install-data \ |
976 | + install-data-am install-dvi install-dvi-am install-exec \ |
977 | + install-exec-am install-html install-html-am install-info \ |
978 | + install-info-am install-man install-pdf install-pdf-am \ |
979 | + install-pkgconfigDATA install-ps install-ps-am install-strip \ |
980 | + installcheck installcheck-am installcheck-binSCRIPTS \ |
981 | + installdirs installdirs-am maintainer-clean \ |
982 | + maintainer-clean-generic mostlyclean mostlyclean-generic \ |
983 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
984 | + uninstall uninstall-am uninstall-binSCRIPTS \ |
985 | + uninstall-pkgconfigDATA |
986 | + |
987 | +lcov: |
988 | + ($(MAKE); cd unit_tests; $(MAKE) lcov) |
989 | +quick-check: |
990 | + ($(MAKE); cd unit_tests; $(MAKE) quick-check) |
991 | + |
992 | +dist-hook: |
993 | + rm -rf $(distdir)/win32/clamav-for-windows $(distdir)/win32/build |
994 | + |
995 | +# Tell versions [3.59,3.63) of GNU make to not export all variables. |
996 | +# Otherwise a system limit (for SysV at least) may be exceeded. |
997 | +.NOEXPORT: |
998 | |
999 | === modified file 'NEWS' |
1000 | --- NEWS 2012-10-08 12:29:39 +0000 |
1001 | +++ NEWS 2013-04-03 16:48:24 +0000 |
1002 | @@ -1,9 +1,8 @@ |
1003 | -0.97.6 |
1004 | +0.97.7 |
1005 | ------ |
1006 | - |
1007 | -ClamAV 0.97.6 corrects two major bugs. One is bb#5571, where an invalid return |
1008 | -code was issued. The other is 5252, where an error in processing certain data |
1009 | -types occured. |
1010 | +ClamAV 0.97.7 addresses several reported potential security bugs. Thanks to |
1011 | +Felix Groebert, Mateusz Jurczyk and Gynvael Coldwind of the Google Security |
1012 | +Team for finding and reporting these issues. |
1013 | |
1014 | -- |
1015 | The ClamAV team (http://www.clamav.net/team) |
1016 | |
1017 | === modified file 'README' |
1018 | --- README 2012-10-08 12:29:39 +0000 |
1019 | +++ README 2013-04-03 16:48:24 +0000 |
1020 | @@ -1,6 +1,12 @@ |
1021 | Note: This README/NEWS file refers to the source tarball. Some things described |
1022 | here may not be available in binary packages. |
1023 | -- |
1024 | +0.97.7 |
1025 | +------ |
1026 | +ClamAV 0.97.7 addresses several reported potential security bugs. Thanks to |
1027 | +Felix Groebert, Mateusz Jurczyk and Gynvael Coldwind of the Google Security |
1028 | +Team for finding and reporting these issues. |
1029 | + |
1030 | 0.97.6 |
1031 | ------ |
1032 | ClamAV 0.97.6 corrects bug 5252 "CL_EFORMAT: Bad format or broken data ERROR |
1033 | |
1034 | === modified file 'aclocal.m4' |
1035 | --- aclocal.m4 2012-06-19 21:39:28 +0000 |
1036 | +++ aclocal.m4 2013-04-03 16:48:24 +0000 |
1037 | @@ -13,8 +13,8 @@ |
1038 | |
1039 | m4_ifndef([AC_AUTOCONF_VERSION], |
1040 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1041 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
1042 | -[m4_warning([this file was generated for autoconf 2.65. |
1043 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, |
1044 | +[m4_warning([this file was generated for autoconf 2.63. |
1045 | You have another version of autoconf. It may work, but is not guaranteed to. |
1046 | If you have problems, you may need to regenerate the build system entirely. |
1047 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1048 | |
1049 | === modified file 'clamav-config.h.in' |
1050 | --- clamav-config.h.in 2012-06-19 21:39:28 +0000 |
1051 | +++ clamav-config.h.in 2013-04-03 16:48:24 +0000 |
1052 | @@ -463,9 +463,6 @@ |
1053 | /* Define to the one symbol short name of this package. */ |
1054 | #undef PACKAGE_TARNAME |
1055 | |
1056 | -/* Define to the home page for this package. */ |
1057 | -#undef PACKAGE_URL |
1058 | - |
1059 | /* Define to the version of this package. */ |
1060 | #undef PACKAGE_VERSION |
1061 | |
1062 | @@ -554,14 +551,13 @@ |
1063 | nothing if this is not supported. Do not define if restrict is |
1064 | supported directly. */ |
1065 | #undef restrict |
1066 | -/* Work around a bug in Sun C++: it does not support _Restrict or |
1067 | - __restrict__, even though the corresponding Sun C compiler ends up with |
1068 | - "#define restrict _Restrict" or "#define restrict __restrict__" in the |
1069 | - previous line. Perhaps some future version of Sun C++ will work with |
1070 | - restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ |
1071 | +/* Work around a bug in Sun C++: it does not support _Restrict, even |
1072 | + though the corresponding Sun C compiler does, which causes |
1073 | + "#define restrict _Restrict" in the previous line. Perhaps some future |
1074 | + version of Sun C++ will work with _Restrict; if so, it'll probably |
1075 | + define __RESTRICT, just as Sun C does. */ |
1076 | #if defined __SUNPRO_CC && !defined __RESTRICT |
1077 | # define _Restrict |
1078 | -# define __restrict__ |
1079 | #endif |
1080 | |
1081 | /* Define to "int" if <sys/socket.h> does not define. */ |
1082 | |
1083 | === modified file 'clamav-milter/Makefile.in' |
1084 | --- clamav-milter/Makefile.in 2011-02-19 09:51:33 +0000 |
1085 | +++ clamav-milter/Makefile.in 2013-04-03 16:48:24 +0000 |
1086 | @@ -243,7 +243,6 @@ |
1087 | PACKAGE_NAME = @PACKAGE_NAME@ |
1088 | PACKAGE_STRING = @PACKAGE_STRING@ |
1089 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
1090 | -PACKAGE_URL = @PACKAGE_URL@ |
1091 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1092 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1093 | RANLIB = @RANLIB@ |
1094 | |
1095 | === modified file 'clambc/Makefile.in' |
1096 | --- clambc/Makefile.in 2011-02-19 09:51:33 +0000 |
1097 | +++ clambc/Makefile.in 2013-04-03 16:48:24 +0000 |
1098 | @@ -185,7 +185,6 @@ |
1099 | PACKAGE_NAME = @PACKAGE_NAME@ |
1100 | PACKAGE_STRING = @PACKAGE_STRING@ |
1101 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
1102 | -PACKAGE_URL = @PACKAGE_URL@ |
1103 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1104 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1105 | RANLIB = @RANLIB@ |
1106 | |
1107 | === modified file 'clamconf/Makefile.in' |
1108 | --- clamconf/Makefile.in 2011-02-19 09:51:33 +0000 |
1109 | +++ clamconf/Makefile.in 2013-04-03 16:48:24 +0000 |
1110 | @@ -203,7 +203,6 @@ |
1111 | PACKAGE_NAME = @PACKAGE_NAME@ |
1112 | PACKAGE_STRING = @PACKAGE_STRING@ |
1113 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
1114 | -PACKAGE_URL = @PACKAGE_URL@ |
1115 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1116 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1117 | RANLIB = @RANLIB@ |
1118 | |
1119 | === modified file 'clamd/Makefile.in' |
1120 | --- clamd/Makefile.in 2011-02-19 09:51:33 +0000 |
1121 | +++ clamd/Makefile.in 2013-04-03 16:48:24 +0000 |
1122 | @@ -221,7 +221,6 @@ |
1123 | PACKAGE_NAME = @PACKAGE_NAME@ |
1124 | PACKAGE_STRING = @PACKAGE_STRING@ |
1125 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
1126 | -PACKAGE_URL = @PACKAGE_URL@ |
1127 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1128 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1129 | RANLIB = @RANLIB@ |
1130 | |
1131 | === modified file 'clamd/scanner.c' |
1132 | --- clamd/scanner.c 2011-06-18 11:56:34 +0000 |
1133 | +++ clamd/scanner.c 2013-04-03 16:48:24 +0000 |
1134 | @@ -107,6 +107,7 @@ |
1135 | { |
1136 | struct scan_cb_data *scandata = data->data; |
1137 | const char *virname; |
1138 | + const char **virpp = &virname; |
1139 | int ret; |
1140 | int type = scandata->type; |
1141 | struct cb_context context; |
1142 | @@ -228,11 +229,18 @@ |
1143 | type == TYPE_MULTISCAN ? "MULTISCANFILE" : NULL); |
1144 | context.filename = filename; |
1145 | context.virsize = 0; |
1146 | - ret = cl_scanfile_callback(filename, &virname, &scandata->scanned, scandata->engine, scandata->options, &context); |
1147 | + ret = cl_scanfile_callback(filename, virpp, &scandata->scanned, scandata->engine, scandata->options, &context); |
1148 | thrmgr_setactivetask(NULL, NULL); |
1149 | |
1150 | + if (scandata->options & CL_SCAN_ALLMATCHES) { |
1151 | + virpp = (const char **)*virpp; /* temp hack for scanall mode until api augmentation */ |
1152 | + virname = virpp[0]; |
1153 | + } |
1154 | + |
1155 | if (thrmgr_group_need_terminate(scandata->conn->group)) { |
1156 | free(filename); |
1157 | + if (ret == CL_VIRUS && scandata->options & CL_SCAN_ALLMATCHES) |
1158 | + free((void *)virpp); |
1159 | logg("*Client disconnected while scanjob was active\n"); |
1160 | return ret == CL_ETIMEOUT ? ret : CL_BREAK; |
1161 | } |
1162 | @@ -241,8 +249,19 @@ |
1163 | scandata->infected++; |
1164 | if (conn_reply_virus(scandata->conn, filename, virname) == -1) { |
1165 | free(filename); |
1166 | + if (scandata->options & CL_SCAN_ALLMATCHES) |
1167 | + free((void *)virpp); |
1168 | return CL_ETIMEOUT; |
1169 | } |
1170 | + if (scandata->options & CL_SCAN_ALLMATCHES && virpp[1] != NULL) { |
1171 | + int i = 1; |
1172 | + while (NULL != virpp[i]) |
1173 | + if (conn_reply_virus(scandata->conn, filename, virpp[i++]) == -1) { |
1174 | + free(filename); |
1175 | + free((void *)virpp); |
1176 | + return CL_ETIMEOUT; |
1177 | + } |
1178 | + } |
1179 | if(context.virsize) |
1180 | detstats_add(virname, filename, context.virsize, context.virhash); |
1181 | if(context.virsize && optget(scandata->opts, "ExtendedDetectionInfo")->enabled) |
1182 | @@ -250,6 +269,11 @@ |
1183 | else |
1184 | logg("~%s: %s FOUND\n", filename, virname); |
1185 | virusaction(filename, virname, scandata->opts); |
1186 | + if (scandata->options & CL_SCAN_ALLMATCHES && virpp[1] != NULL) { |
1187 | + int i = 1; |
1188 | + while (NULL != virpp[i]) |
1189 | + logg("~%s: %s FOUND\n", filename, virpp[i++]); |
1190 | + } |
1191 | } else if (ret != CL_CLEAN) { |
1192 | scandata->errors++; |
1193 | if (conn_reply(scandata->conn, filename, cl_strerror(ret), "ERROR") == -1) { |
1194 | @@ -262,6 +286,8 @@ |
1195 | } |
1196 | |
1197 | free(filename); |
1198 | + if (ret == CL_VIRUS && scandata->options & CL_SCAN_ALLMATCHES) |
1199 | + free((void *)virpp); |
1200 | if(ret == CL_EMEM) /* stop scanning */ |
1201 | return ret; |
1202 | |
1203 | |
1204 | === modified file 'clamd/session.c' |
1205 | --- clamd/session.c 2011-06-18 11:56:34 +0000 |
1206 | +++ clamd/session.c 2013-04-03 16:48:24 +0000 |
1207 | @@ -94,7 +94,8 @@ |
1208 | {CMD16, sizeof(CMD16)-1, COMMAND_IDSESSION, 0, 0, 1}, |
1209 | {CMD17, sizeof(CMD17)-1, COMMAND_INSTREAM, 0, 0, 1}, |
1210 | {CMD19, sizeof(CMD19)-1, COMMAND_DETSTATSCLEAR, 0, 1, 1}, |
1211 | - {CMD20, sizeof(CMD20)-1, COMMAND_DETSTATS, 0, 1, 1} |
1212 | + {CMD20, sizeof(CMD20)-1, COMMAND_DETSTATS, 0, 1, 1}, |
1213 | + {CMD21, sizeof(CMD21)-1, COMMAND_ALLMATCHSCAN, 1, 0, 1} |
1214 | }; |
1215 | |
1216 | enum commands parse_command(const char *cmd, const char **argument, int oldstyle) |
1217 | @@ -346,7 +347,11 @@ |
1218 | conn->scanfd = -1; |
1219 | cli_unlink(conn->filename); |
1220 | return ret; |
1221 | - default: |
1222 | + case COMMAND_ALLMATCHSCAN: |
1223 | + thrmgr_setactivetask(NULL, "ALLMATCHSCAN"); |
1224 | + scandata.options |= CL_SCAN_ALLMATCHES; |
1225 | + type = TYPE_SCAN; |
1226 | + break;default: |
1227 | logg("!Invalid command distpached: %d\n", conn->cmdtype); |
1228 | return 1; |
1229 | } |
1230 | @@ -420,6 +425,7 @@ |
1231 | case COMMAND_SCAN: |
1232 | case COMMAND_CONTSCAN: |
1233 | case COMMAND_MULTISCAN: |
1234 | + case COMMAND_ALLMATCHSCAN: |
1235 | dup_conn->filename = strdup(argument); |
1236 | if (!dup_conn->filename) { |
1237 | logg("!Failed to allocate memory for filename\n"); |
1238 | @@ -591,6 +597,7 @@ |
1239 | case COMMAND_FILDES: |
1240 | case COMMAND_SCAN: |
1241 | case COMMAND_INSTREAMSCAN: |
1242 | + case COMMAND_ALLMATCHSCAN: |
1243 | return dispatch_command(conn, cmd, argument); |
1244 | case COMMAND_IDSESSION: |
1245 | conn->group = thrmgr_group_new(); |
1246 | |
1247 | === modified file 'clamd/session.h' |
1248 | --- clamd/session.h 2011-02-19 09:51:33 +0000 |
1249 | +++ clamd/session.h 2013-04-03 16:48:24 +0000 |
1250 | @@ -43,6 +43,8 @@ |
1251 | #define CMD19 "DETSTATSCLEAR" |
1252 | #define CMD20 "DETSTATS" |
1253 | |
1254 | +#define CMD21 "ALLMATCHSCAN" |
1255 | + |
1256 | #include "libclamav/clamav.h" |
1257 | #include "shared/optparser.h" |
1258 | #include "server.h" |
1259 | @@ -70,7 +72,8 @@ |
1260 | COMMAND_DETSTATS, |
1261 | /* internal commands */ |
1262 | COMMAND_MULTISCANFILE, |
1263 | - COMMAND_INSTREAMSCAN |
1264 | + COMMAND_INSTREAMSCAN, |
1265 | + COMMAND_ALLMATCHSCAN |
1266 | }; |
1267 | |
1268 | typedef struct client_conn_tag { |
1269 | |
1270 | === modified file 'clamdscan/Makefile.in' |
1271 | --- clamdscan/Makefile.in 2011-02-19 09:51:33 +0000 |
1272 | +++ clamdscan/Makefile.in 2013-04-03 16:48:24 +0000 |
1273 | @@ -214,7 +214,6 @@ |
1274 | PACKAGE_NAME = @PACKAGE_NAME@ |
1275 | PACKAGE_STRING = @PACKAGE_STRING@ |
1276 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
1277 | -PACKAGE_URL = @PACKAGE_URL@ |
1278 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1279 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1280 | RANLIB = @RANLIB@ |
1281 | |
1282 | === modified file 'clamdscan/client.c' |
1283 | --- clamdscan/client.c 2011-06-18 11:56:34 +0000 |
1284 | +++ clamdscan/client.c 2013-04-03 16:48:24 +0000 |
1285 | @@ -232,7 +232,9 @@ |
1286 | if(remote || scandash) { |
1287 | scantype = STREAM; |
1288 | session = optget(opts, "multiscan")->enabled; |
1289 | - } else if(optget(opts, "multiscan")->enabled) scantype = MULTI; |
1290 | + } |
1291 | + else if(optget(opts, "multiscan")->enabled) scantype = MULTI; |
1292 | + else if(optget(opts, "allmatch")->enabled) scantype = ALLMATCH; |
1293 | else scantype = CONT; |
1294 | |
1295 | maxrec = optget(clamdopts, "MaxDirectoryRecursion")->numarg; |
1296 | |
1297 | === modified file 'clamdscan/client.h' |
1298 | --- clamdscan/client.h 2010-05-20 22:09:21 +0000 |
1299 | +++ clamdscan/client.h 2013-04-03 16:48:24 +0000 |
1300 | @@ -27,7 +27,9 @@ |
1301 | CONT, |
1302 | MULTI, |
1303 | STREAM, |
1304 | - FILDES |
1305 | + FILDES, |
1306 | + ALLMATCH, |
1307 | + MAX_SCANTYPE = ALLMATCH |
1308 | }; |
1309 | |
1310 | int client(const struct optstruct *opts, int *infected, int *err); |
1311 | |
1312 | === modified file 'clamdscan/proto.c' |
1313 | --- clamdscan/proto.c 2011-06-18 11:56:34 +0000 |
1314 | +++ clamdscan/proto.c 2013-04-03 16:48:24 +0000 |
1315 | @@ -58,7 +58,7 @@ |
1316 | int printinfected; |
1317 | extern struct optstruct *clamdopts; |
1318 | |
1319 | -static const char *scancmd[] = { "CONTSCAN", "MULTISCAN" }; |
1320 | +static const char *scancmd[] = { "CONTSCAN", "MULTISCAN", "INSTREAM", "FILDES", "ALLMATCHSCAN" }; |
1321 | |
1322 | /* Connects to clamd |
1323 | * Returns a FD or -1 on error */ |
1324 | @@ -202,6 +202,11 @@ |
1325 | switch(scantype) { |
1326 | case MULTI: |
1327 | case CONT: |
1328 | + case ALLMATCH: |
1329 | + if (!filename) { |
1330 | + logg("Filename cannot be NULL for MULTISCAN or CONTSCAN.\n"); |
1331 | + return -1; |
1332 | + } |
1333 | len = strlen(filename) + strlen(scancmd[scantype]) + 3; |
1334 | if (!(bol = malloc(len))) { |
1335 | logg("!Cannot allocate a command buffer: %s\n", strerror(errno)); |
1336 | @@ -247,7 +252,13 @@ |
1337 | colon = strrchr(bol, ':'); |
1338 | } |
1339 | if(!colon) { |
1340 | - logg("Failed to parse reply\n"); |
1341 | + char * unkco = "UNKNOWN COMMAND"; |
1342 | + if (!strncmp(bol, unkco, sizeof(unkco) - 1)) |
1343 | + logg("clamd replied \"UNKNOWN COMMAND\". Command was %s\n", |
1344 | + (scantype < 0 || scantype > MAX_SCANTYPE) ? "unidentified" : |
1345 | + scancmd[scantype]); |
1346 | + else |
1347 | + logg("Failed to parse reply: \"%s\"\n", bol); |
1348 | return -1; |
1349 | } else if(!memcmp(eol - 7, " FOUND", 6)) { |
1350 | *(eol - 7) = 0; |
1351 | |
1352 | === modified file 'clamdtop/Makefile.in' |
1353 | --- clamdtop/Makefile.in 2011-02-19 09:51:33 +0000 |
1354 | +++ clamdtop/Makefile.in 2013-04-03 16:48:24 +0000 |
1355 | @@ -214,7 +214,6 @@ |
1356 | PACKAGE_NAME = @PACKAGE_NAME@ |
1357 | PACKAGE_STRING = @PACKAGE_STRING@ |
1358 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
1359 | -PACKAGE_URL = @PACKAGE_URL@ |
1360 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1361 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1362 | RANLIB = @RANLIB@ |
1363 | |
1364 | === modified file 'clamscan/Makefile.in' |
1365 | --- clamscan/Makefile.in 2011-02-19 09:51:33 +0000 |
1366 | +++ clamscan/Makefile.in 2013-04-03 16:48:24 +0000 |
1367 | @@ -205,7 +205,6 @@ |
1368 | PACKAGE_NAME = @PACKAGE_NAME@ |
1369 | PACKAGE_STRING = @PACKAGE_STRING@ |
1370 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
1371 | -PACKAGE_URL = @PACKAGE_URL@ |
1372 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1373 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1374 | RANLIB = @RANLIB@ |
1375 | |
1376 | === modified file 'clamscan/manager.c' |
1377 | --- clamscan/manager.c 2011-06-18 11:56:34 +0000 |
1378 | +++ clamscan/manager.c 2013-04-03 16:48:24 +0000 |
1379 | @@ -125,6 +125,7 @@ |
1380 | int ret = 0, fd, included, printclean = 1; |
1381 | const struct optstruct *opt; |
1382 | const char *virname; |
1383 | + const char **virpp = &virname; |
1384 | struct stat sb; |
1385 | |
1386 | if((opt = optget(opts, "exclude"))->enabled) { |
1387 | @@ -190,7 +191,16 @@ |
1388 | } |
1389 | |
1390 | if((ret = cl_scandesc(fd, &virname, &info.blocks, engine, options)) == CL_VIRUS) { |
1391 | - logg("~%s: %s FOUND\n", filename, virname); |
1392 | + if (options & CL_SCAN_ALLMATCHES) { |
1393 | + int i = 0; |
1394 | + virpp = (const char **)*virpp; /* temp hack for allscan until API enhancement */ |
1395 | + virname = virpp[0]; |
1396 | + while (virpp[i]) |
1397 | + logg("~%s: %s FOUND\n", filename, virpp[i++]); |
1398 | + free((void *)virpp); |
1399 | + } |
1400 | + else |
1401 | + logg("~%s: %s FOUND\n", filename, virname); |
1402 | info.files++; |
1403 | info.ifiles++; |
1404 | |
1405 | @@ -319,6 +329,8 @@ |
1406 | int ret; |
1407 | unsigned int fsize = 0; |
1408 | const char *virname, *tmpdir; |
1409 | + const char **virpp = &virname; |
1410 | + |
1411 | char *file, buff[FILEBUFF]; |
1412 | size_t bread; |
1413 | FILE *fs; |
1414 | @@ -358,7 +370,17 @@ |
1415 | info.rblocks += fsize / CL_COUNT_PRECISION; |
1416 | |
1417 | if((ret = cl_scanfile(file, &virname, &info.blocks, engine, options)) == CL_VIRUS) { |
1418 | - logg("stdin: %s FOUND\n", virname); |
1419 | + if (options & CL_SCAN_ALLMATCHES) { |
1420 | + int i = 0; |
1421 | + virpp = (const char **)*virpp; /* temp hack for scanall mode until api augmentation */ |
1422 | + virname = virpp[0]; |
1423 | + while (virpp[i]) |
1424 | + logg("stdin: %s FOUND\n", virpp[i++]); |
1425 | + free((void *)virpp); |
1426 | + } |
1427 | + else |
1428 | + logg("stdin: %s FOUND\n", virname); |
1429 | + |
1430 | info.ifiles++; |
1431 | |
1432 | if(bell) |
1433 | @@ -587,6 +609,9 @@ |
1434 | } |
1435 | |
1436 | /* set scan options */ |
1437 | + if(optget(opts, "allmatch")->enabled) |
1438 | + options |= CL_SCAN_ALLMATCHES; |
1439 | + |
1440 | if(optget(opts,"phishing-ssl")->enabled) |
1441 | options |= CL_SCAN_PHISHING_BLOCKSSL; |
1442 | |
1443 | |
1444 | === modified file 'configure' |
1445 | --- configure 2012-10-08 12:29:39 +0000 |
1446 | +++ configure 2013-04-03 16:48:24 +0000 |
1447 | @@ -1,24 +1,20 @@ |
1448 | #! /bin/sh |
1449 | # Guess values for system-dependent variables and create Makefiles. |
1450 | -# Generated by GNU Autoconf 2.65 for ClamAV 0.97.6. |
1451 | +# Generated by GNU Autoconf 2.63 for ClamAV 0.97.7. |
1452 | # |
1453 | # Report bugs to <http://bugs.clamav.net/>. |
1454 | # |
1455 | -# |
1456 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
1457 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1458 | -# Inc. |
1459 | -# |
1460 | -# |
1461 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
1462 | # This configure script is free software; the Free Software Foundation |
1463 | # gives unlimited permission to copy, distribute and modify it. |
1464 | -## -------------------- ## |
1465 | -## M4sh Initialization. ## |
1466 | -## -------------------- ## |
1467 | +## --------------------- ## |
1468 | +## M4sh Initialization. ## |
1469 | +## --------------------- ## |
1470 | |
1471 | # Be more Bourne compatible |
1472 | DUALCASE=1; export DUALCASE # for MKS sh |
1473 | -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : |
1474 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
1475 | emulate sh |
1476 | NULLCMD=: |
1477 | # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
1478 | @@ -26,15 +22,23 @@ |
1479 | alias -g '${1+"$@"}'='"$@"' |
1480 | setopt NO_GLOB_SUBST |
1481 | else |
1482 | - case `(set -o) 2>/dev/null` in #( |
1483 | - *posix*) : |
1484 | - set -o posix ;; #( |
1485 | - *) : |
1486 | - ;; |
1487 | + case `(set -o) 2>/dev/null` in |
1488 | + *posix*) set -o posix ;; |
1489 | esac |
1490 | + |
1491 | fi |
1492 | |
1493 | |
1494 | + |
1495 | + |
1496 | +# PATH needs CR |
1497 | +# Avoid depending upon Character Ranges. |
1498 | +as_cr_letters='abcdefghijklmnopqrstuvwxyz' |
1499 | +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' |
1500 | +as_cr_Letters=$as_cr_letters$as_cr_LETTERS |
1501 | +as_cr_digits='0123456789' |
1502 | +as_cr_alnum=$as_cr_Letters$as_cr_digits |
1503 | + |
1504 | as_nl=' |
1505 | ' |
1506 | export as_nl |
1507 | @@ -42,13 +46,7 @@ |
1508 | as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
1509 | as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo |
1510 | as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo |
1511 | -# Prefer a ksh shell builtin over an external printf program on Solaris, |
1512 | -# but without wasting forks for bash or zsh. |
1513 | -if test -z "$BASH_VERSION$ZSH_VERSION" \ |
1514 | - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then |
1515 | - as_echo='print -r --' |
1516 | - as_echo_n='print -rn --' |
1517 | -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then |
1518 | +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then |
1519 | as_echo='printf %s\n' |
1520 | as_echo_n='printf %s' |
1521 | else |
1522 | @@ -59,7 +57,7 @@ |
1523 | as_echo_body='eval expr "X$1" : "X\\(.*\\)"' |
1524 | as_echo_n_body='eval |
1525 | arg=$1; |
1526 | - case $arg in #( |
1527 | + case $arg in |
1528 | *"$as_nl"*) |
1529 | expr "X$arg" : "X\\(.*\\)$as_nl"; |
1530 | arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; |
1531 | @@ -82,6 +80,13 @@ |
1532 | } |
1533 | fi |
1534 | |
1535 | +# Support unset when possible. |
1536 | +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then |
1537 | + as_unset=unset |
1538 | +else |
1539 | + as_unset=false |
1540 | +fi |
1541 | + |
1542 | |
1543 | # IFS |
1544 | # We need space, tab and new line, in precisely that order. Quoting is |
1545 | @@ -91,15 +96,15 @@ |
1546 | IFS=" "" $as_nl" |
1547 | |
1548 | # Find who we are. Look in the path if we contain no directory separator. |
1549 | -case $0 in #(( |
1550 | +case $0 in |
1551 | *[\\/]* ) as_myself=$0 ;; |
1552 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1553 | for as_dir in $PATH |
1554 | do |
1555 | IFS=$as_save_IFS |
1556 | test -z "$as_dir" && as_dir=. |
1557 | - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break |
1558 | - done |
1559 | + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break |
1560 | +done |
1561 | IFS=$as_save_IFS |
1562 | |
1563 | ;; |
1564 | @@ -111,16 +116,12 @@ |
1565 | fi |
1566 | if test ! -f "$as_myself"; then |
1567 | $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
1568 | - exit 1 |
1569 | + { (exit 1); exit 1; } |
1570 | fi |
1571 | |
1572 | -# Unset variables that we do not need and which cause bugs (e.g. in |
1573 | -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" |
1574 | -# suppresses any "Segmentation fault" message there. '((' could |
1575 | -# trigger a bug in pdksh 5.2.14. |
1576 | -for as_var in BASH_ENV ENV MAIL MAILPATH |
1577 | -do eval test x\${$as_var+set} = xset \ |
1578 | - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : |
1579 | +# Work around bugs in pre-3.0 UWIN ksh. |
1580 | +for as_var in ENV MAIL MAILPATH |
1581 | +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var |
1582 | done |
1583 | PS1='$ ' |
1584 | PS2='> ' |
1585 | @@ -132,300 +133,330 @@ |
1586 | LANGUAGE=C |
1587 | export LANGUAGE |
1588 | |
1589 | +# Required to use basename. |
1590 | +if expr a : '\(a\)' >/dev/null 2>&1 && |
1591 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then |
1592 | + as_expr=expr |
1593 | +else |
1594 | + as_expr=false |
1595 | +fi |
1596 | + |
1597 | +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then |
1598 | + as_basename=basename |
1599 | +else |
1600 | + as_basename=false |
1601 | +fi |
1602 | + |
1603 | + |
1604 | +# Name of the executable. |
1605 | +as_me=`$as_basename -- "$0" || |
1606 | +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
1607 | + X"$0" : 'X\(//\)$' \| \ |
1608 | + X"$0" : 'X\(/\)' \| . 2>/dev/null || |
1609 | +$as_echo X/"$0" | |
1610 | + sed '/^.*\/\([^/][^/]*\)\/*$/{ |
1611 | + s//\1/ |
1612 | + q |
1613 | + } |
1614 | + /^X\/\(\/\/\)$/{ |
1615 | + s//\1/ |
1616 | + q |
1617 | + } |
1618 | + /^X\/\(\/\).*/{ |
1619 | + s//\1/ |
1620 | + q |
1621 | + } |
1622 | + s/.*/./; q'` |
1623 | + |
1624 | # CDPATH. |
1625 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1626 | +$as_unset CDPATH |
1627 | + |
1628 | |
1629 | if test "x$CONFIG_SHELL" = x; then |
1630 | - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
1631 | - emulate sh |
1632 | - NULLCMD=: |
1633 | - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which |
1634 | - # is contrary to our usage. Disable this feature. |
1635 | - alias -g '\${1+\"\$@\"}'='\"\$@\"' |
1636 | - setopt NO_GLOB_SUBST |
1637 | -else |
1638 | - case \`(set -o) 2>/dev/null\` in #( |
1639 | - *posix*) : |
1640 | - set -o posix ;; #( |
1641 | - *) : |
1642 | - ;; |
1643 | -esac |
1644 | -fi |
1645 | -" |
1646 | - as_required="as_fn_return () { (exit \$1); } |
1647 | -as_fn_success () { as_fn_return 0; } |
1648 | -as_fn_failure () { as_fn_return 1; } |
1649 | -as_fn_ret_success () { return 0; } |
1650 | -as_fn_ret_failure () { return 1; } |
1651 | - |
1652 | -exitcode=0 |
1653 | -as_fn_success || { exitcode=1; echo as_fn_success failed.; } |
1654 | -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } |
1655 | -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } |
1656 | -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } |
1657 | -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : |
1658 | - |
1659 | -else |
1660 | - exitcode=1; echo positional parameters were not saved. |
1661 | -fi |
1662 | -test x\$exitcode = x0 || exit 1" |
1663 | - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
1664 | - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
1665 | - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
1666 | - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 |
1667 | -test \$(( 1 + 1 )) = 2 || exit 1" |
1668 | - if (eval "$as_required") 2>/dev/null; then : |
1669 | + if (eval ":") 2>/dev/null; then |
1670 | as_have_required=yes |
1671 | else |
1672 | as_have_required=no |
1673 | fi |
1674 | - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : |
1675 | - |
1676 | -else |
1677 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1678 | -as_found=false |
1679 | + |
1680 | + if test $as_have_required = yes && (eval ": |
1681 | +(as_func_return () { |
1682 | + (exit \$1) |
1683 | +} |
1684 | +as_func_success () { |
1685 | + as_func_return 0 |
1686 | +} |
1687 | +as_func_failure () { |
1688 | + as_func_return 1 |
1689 | +} |
1690 | +as_func_ret_success () { |
1691 | + return 0 |
1692 | +} |
1693 | +as_func_ret_failure () { |
1694 | + return 1 |
1695 | +} |
1696 | + |
1697 | +exitcode=0 |
1698 | +if as_func_success; then |
1699 | + : |
1700 | +else |
1701 | + exitcode=1 |
1702 | + echo as_func_success failed. |
1703 | +fi |
1704 | + |
1705 | +if as_func_failure; then |
1706 | + exitcode=1 |
1707 | + echo as_func_failure succeeded. |
1708 | +fi |
1709 | + |
1710 | +if as_func_ret_success; then |
1711 | + : |
1712 | +else |
1713 | + exitcode=1 |
1714 | + echo as_func_ret_success failed. |
1715 | +fi |
1716 | + |
1717 | +if as_func_ret_failure; then |
1718 | + exitcode=1 |
1719 | + echo as_func_ret_failure succeeded. |
1720 | +fi |
1721 | + |
1722 | +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then |
1723 | + : |
1724 | +else |
1725 | + exitcode=1 |
1726 | + echo positional parameters were not saved. |
1727 | +fi |
1728 | + |
1729 | +test \$exitcode = 0) || { (exit 1); exit 1; } |
1730 | + |
1731 | +( |
1732 | + as_lineno_1=\$LINENO |
1733 | + as_lineno_2=\$LINENO |
1734 | + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && |
1735 | + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } |
1736 | +") 2> /dev/null; then |
1737 | + : |
1738 | +else |
1739 | + as_candidate_shells= |
1740 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1741 | for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH |
1742 | do |
1743 | IFS=$as_save_IFS |
1744 | test -z "$as_dir" && as_dir=. |
1745 | - as_found=: |
1746 | - case $as_dir in #( |
1747 | + case $as_dir in |
1748 | /*) |
1749 | for as_base in sh bash ksh sh5; do |
1750 | - # Try only shells that exist, to save several forks. |
1751 | - as_shell=$as_dir/$as_base |
1752 | - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && |
1753 | - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : |
1754 | - CONFIG_SHELL=$as_shell as_have_required=yes |
1755 | - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : |
1756 | - break 2 |
1757 | -fi |
1758 | -fi |
1759 | + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" |
1760 | done;; |
1761 | esac |
1762 | - as_found=false |
1763 | done |
1764 | -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && |
1765 | - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : |
1766 | - CONFIG_SHELL=$SHELL as_have_required=yes |
1767 | -fi; } |
1768 | IFS=$as_save_IFS |
1769 | |
1770 | |
1771 | - if test "x$CONFIG_SHELL" != x; then : |
1772 | - # We cannot yet assume a decent shell, so we have to provide a |
1773 | - # neutralization value for shells without unset; and this also |
1774 | - # works around shells that cannot unset nonexistent variables. |
1775 | - BASH_ENV=/dev/null |
1776 | - ENV=/dev/null |
1777 | - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1778 | + for as_shell in $as_candidate_shells $SHELL; do |
1779 | + # Try only shells that exist, to save several forks. |
1780 | + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && |
1781 | + { ("$as_shell") 2> /dev/null <<\_ASEOF |
1782 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
1783 | + emulate sh |
1784 | + NULLCMD=: |
1785 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
1786 | + # is contrary to our usage. Disable this feature. |
1787 | + alias -g '${1+"$@"}'='"$@"' |
1788 | + setopt NO_GLOB_SUBST |
1789 | +else |
1790 | + case `(set -o) 2>/dev/null` in |
1791 | + *posix*) set -o posix ;; |
1792 | +esac |
1793 | + |
1794 | +fi |
1795 | + |
1796 | + |
1797 | +: |
1798 | +_ASEOF |
1799 | +}; then |
1800 | + CONFIG_SHELL=$as_shell |
1801 | + as_have_required=yes |
1802 | + if { "$as_shell" 2> /dev/null <<\_ASEOF |
1803 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
1804 | + emulate sh |
1805 | + NULLCMD=: |
1806 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
1807 | + # is contrary to our usage. Disable this feature. |
1808 | + alias -g '${1+"$@"}'='"$@"' |
1809 | + setopt NO_GLOB_SUBST |
1810 | +else |
1811 | + case `(set -o) 2>/dev/null` in |
1812 | + *posix*) set -o posix ;; |
1813 | +esac |
1814 | + |
1815 | +fi |
1816 | + |
1817 | + |
1818 | +: |
1819 | +(as_func_return () { |
1820 | + (exit $1) |
1821 | +} |
1822 | +as_func_success () { |
1823 | + as_func_return 0 |
1824 | +} |
1825 | +as_func_failure () { |
1826 | + as_func_return 1 |
1827 | +} |
1828 | +as_func_ret_success () { |
1829 | + return 0 |
1830 | +} |
1831 | +as_func_ret_failure () { |
1832 | + return 1 |
1833 | +} |
1834 | + |
1835 | +exitcode=0 |
1836 | +if as_func_success; then |
1837 | + : |
1838 | +else |
1839 | + exitcode=1 |
1840 | + echo as_func_success failed. |
1841 | +fi |
1842 | + |
1843 | +if as_func_failure; then |
1844 | + exitcode=1 |
1845 | + echo as_func_failure succeeded. |
1846 | +fi |
1847 | + |
1848 | +if as_func_ret_success; then |
1849 | + : |
1850 | +else |
1851 | + exitcode=1 |
1852 | + echo as_func_ret_success failed. |
1853 | +fi |
1854 | + |
1855 | +if as_func_ret_failure; then |
1856 | + exitcode=1 |
1857 | + echo as_func_ret_failure succeeded. |
1858 | +fi |
1859 | + |
1860 | +if ( set x; as_func_ret_success y && test x = "$1" ); then |
1861 | + : |
1862 | +else |
1863 | + exitcode=1 |
1864 | + echo positional parameters were not saved. |
1865 | +fi |
1866 | + |
1867 | +test $exitcode = 0) || { (exit 1); exit 1; } |
1868 | + |
1869 | +( |
1870 | + as_lineno_1=$LINENO |
1871 | + as_lineno_2=$LINENO |
1872 | + test "x$as_lineno_1" != "x$as_lineno_2" && |
1873 | + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } |
1874 | + |
1875 | +_ASEOF |
1876 | +}; then |
1877 | + break |
1878 | +fi |
1879 | + |
1880 | +fi |
1881 | + |
1882 | + done |
1883 | + |
1884 | + if test "x$CONFIG_SHELL" != x; then |
1885 | + for as_var in BASH_ENV ENV |
1886 | + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var |
1887 | + done |
1888 | export CONFIG_SHELL |
1889 | exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
1890 | fi |
1891 | |
1892 | - if test x$as_have_required = xno; then : |
1893 | - $as_echo "$0: This script requires a shell more modern than all" |
1894 | - $as_echo "$0: the shells that I found on your system." |
1895 | - if test x${ZSH_VERSION+set} = xset ; then |
1896 | - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" |
1897 | - $as_echo "$0: be upgraded to zsh 4.3.4 or later." |
1898 | - else |
1899 | - $as_echo "$0: Please tell bug-autoconf@gnu.org and |
1900 | -$0: http://bugs.clamav.net/ about your system, including |
1901 | -$0: any error possibly output before this message. Then |
1902 | -$0: install a modern shell, or manually run the script |
1903 | -$0: under such a shell if you do have one." |
1904 | - fi |
1905 | - exit 1 |
1906 | -fi |
1907 | -fi |
1908 | -fi |
1909 | -SHELL=${CONFIG_SHELL-/bin/sh} |
1910 | -export SHELL |
1911 | -# Unset more variables known to interfere with behavior of common tools. |
1912 | -CLICOLOR_FORCE= GREP_OPTIONS= |
1913 | -unset CLICOLOR_FORCE GREP_OPTIONS |
1914 | - |
1915 | -## --------------------- ## |
1916 | -## M4sh Shell Functions. ## |
1917 | -## --------------------- ## |
1918 | -# as_fn_unset VAR |
1919 | -# --------------- |
1920 | -# Portably unset VAR. |
1921 | -as_fn_unset () |
1922 | -{ |
1923 | - { eval $1=; unset $1;} |
1924 | -} |
1925 | -as_unset=as_fn_unset |
1926 | - |
1927 | -# as_fn_set_status STATUS |
1928 | -# ----------------------- |
1929 | -# Set $? to STATUS, without forking. |
1930 | -as_fn_set_status () |
1931 | -{ |
1932 | - return $1 |
1933 | -} # as_fn_set_status |
1934 | - |
1935 | -# as_fn_exit STATUS |
1936 | -# ----------------- |
1937 | -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. |
1938 | -as_fn_exit () |
1939 | -{ |
1940 | - set +e |
1941 | - as_fn_set_status $1 |
1942 | - exit $1 |
1943 | -} # as_fn_exit |
1944 | - |
1945 | -# as_fn_mkdir_p |
1946 | -# ------------- |
1947 | -# Create "$as_dir" as a directory, including parents if necessary. |
1948 | -as_fn_mkdir_p () |
1949 | -{ |
1950 | - |
1951 | - case $as_dir in #( |
1952 | - -*) as_dir=./$as_dir;; |
1953 | - esac |
1954 | - test -d "$as_dir" || eval $as_mkdir_p || { |
1955 | - as_dirs= |
1956 | - while :; do |
1957 | - case $as_dir in #( |
1958 | - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( |
1959 | - *) as_qdir=$as_dir;; |
1960 | - esac |
1961 | - as_dirs="'$as_qdir' $as_dirs" |
1962 | - as_dir=`$as_dirname -- "$as_dir" || |
1963 | -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
1964 | - X"$as_dir" : 'X\(//\)[^/]' \| \ |
1965 | - X"$as_dir" : 'X\(//\)$' \| \ |
1966 | - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || |
1967 | -$as_echo X"$as_dir" | |
1968 | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
1969 | - s//\1/ |
1970 | - q |
1971 | - } |
1972 | - /^X\(\/\/\)[^/].*/{ |
1973 | - s//\1/ |
1974 | - q |
1975 | - } |
1976 | - /^X\(\/\/\)$/{ |
1977 | - s//\1/ |
1978 | - q |
1979 | - } |
1980 | - /^X\(\/\).*/{ |
1981 | - s//\1/ |
1982 | - q |
1983 | - } |
1984 | - s/.*/./; q'` |
1985 | - test -d "$as_dir" && break |
1986 | - done |
1987 | - test -z "$as_dirs" || eval "mkdir $as_dirs" |
1988 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
1989 | - |
1990 | - |
1991 | -} # as_fn_mkdir_p |
1992 | -# as_fn_append VAR VALUE |
1993 | -# ---------------------- |
1994 | -# Append the text in VALUE to the end of the definition contained in VAR. Take |
1995 | -# advantage of any shell optimizations that allow amortized linear growth over |
1996 | -# repeated appends, instead of the typical quadratic growth present in naive |
1997 | -# implementations. |
1998 | -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : |
1999 | - eval 'as_fn_append () |
2000 | - { |
2001 | - eval $1+=\$2 |
2002 | - }' |
2003 | -else |
2004 | - as_fn_append () |
2005 | - { |
2006 | - eval $1=\$$1\$2 |
2007 | - } |
2008 | -fi # as_fn_append |
2009 | - |
2010 | -# as_fn_arith ARG... |
2011 | -# ------------------ |
2012 | -# Perform arithmetic evaluation on the ARGs, and store the result in the |
2013 | -# global $as_val. Take advantage of shells that can avoid forks. The arguments |
2014 | -# must be portable across $(()) and expr. |
2015 | -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : |
2016 | - eval 'as_fn_arith () |
2017 | - { |
2018 | - as_val=$(( $* )) |
2019 | - }' |
2020 | -else |
2021 | - as_fn_arith () |
2022 | - { |
2023 | - as_val=`expr "$@" || test $? -eq 1` |
2024 | - } |
2025 | -fi # as_fn_arith |
2026 | - |
2027 | - |
2028 | -# as_fn_error ERROR [LINENO LOG_FD] |
2029 | -# --------------------------------- |
2030 | -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
2031 | -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
2032 | -# script with status $?, using 1 if that was 0. |
2033 | -as_fn_error () |
2034 | -{ |
2035 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
2036 | - if test "$3"; then |
2037 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2038 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
2039 | - fi |
2040 | - $as_echo "$as_me: error: $1" >&2 |
2041 | - as_fn_exit $as_status |
2042 | -} # as_fn_error |
2043 | - |
2044 | -if expr a : '\(a\)' >/dev/null 2>&1 && |
2045 | - test "X`expr 00001 : '.*\(...\)'`" = X001; then |
2046 | - as_expr=expr |
2047 | -else |
2048 | - as_expr=false |
2049 | -fi |
2050 | - |
2051 | -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then |
2052 | - as_basename=basename |
2053 | -else |
2054 | - as_basename=false |
2055 | -fi |
2056 | - |
2057 | -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then |
2058 | - as_dirname=dirname |
2059 | -else |
2060 | - as_dirname=false |
2061 | -fi |
2062 | - |
2063 | -as_me=`$as_basename -- "$0" || |
2064 | -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
2065 | - X"$0" : 'X\(//\)$' \| \ |
2066 | - X"$0" : 'X\(/\)' \| . 2>/dev/null || |
2067 | -$as_echo X/"$0" | |
2068 | - sed '/^.*\/\([^/][^/]*\)\/*$/{ |
2069 | - s//\1/ |
2070 | - q |
2071 | - } |
2072 | - /^X\/\(\/\/\)$/{ |
2073 | - s//\1/ |
2074 | - q |
2075 | - } |
2076 | - /^X\/\(\/\).*/{ |
2077 | - s//\1/ |
2078 | - q |
2079 | - } |
2080 | - s/.*/./; q'` |
2081 | - |
2082 | -# Avoid depending upon Character Ranges. |
2083 | -as_cr_letters='abcdefghijklmnopqrstuvwxyz' |
2084 | -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' |
2085 | -as_cr_Letters=$as_cr_letters$as_cr_LETTERS |
2086 | -as_cr_digits='0123456789' |
2087 | -as_cr_alnum=$as_cr_Letters$as_cr_digits |
2088 | - |
2089 | - |
2090 | - as_lineno_1=$LINENO as_lineno_1a=$LINENO |
2091 | - as_lineno_2=$LINENO as_lineno_2a=$LINENO |
2092 | - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && |
2093 | - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { |
2094 | - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) |
2095 | + |
2096 | + if test $as_have_required = no; then |
2097 | + echo This script requires a shell more modern than all the |
2098 | + echo shells that I found on your system. Please install a |
2099 | + echo modern shell, or manually run the script under such a |
2100 | + echo shell if you do have one. |
2101 | + { (exit 1); exit 1; } |
2102 | +fi |
2103 | + |
2104 | + |
2105 | +fi |
2106 | + |
2107 | +fi |
2108 | + |
2109 | + |
2110 | + |
2111 | +(eval "as_func_return () { |
2112 | + (exit \$1) |
2113 | +} |
2114 | +as_func_success () { |
2115 | + as_func_return 0 |
2116 | +} |
2117 | +as_func_failure () { |
2118 | + as_func_return 1 |
2119 | +} |
2120 | +as_func_ret_success () { |
2121 | + return 0 |
2122 | +} |
2123 | +as_func_ret_failure () { |
2124 | + return 1 |
2125 | +} |
2126 | + |
2127 | +exitcode=0 |
2128 | +if as_func_success; then |
2129 | + : |
2130 | +else |
2131 | + exitcode=1 |
2132 | + echo as_func_success failed. |
2133 | +fi |
2134 | + |
2135 | +if as_func_failure; then |
2136 | + exitcode=1 |
2137 | + echo as_func_failure succeeded. |
2138 | +fi |
2139 | + |
2140 | +if as_func_ret_success; then |
2141 | + : |
2142 | +else |
2143 | + exitcode=1 |
2144 | + echo as_func_ret_success failed. |
2145 | +fi |
2146 | + |
2147 | +if as_func_ret_failure; then |
2148 | + exitcode=1 |
2149 | + echo as_func_ret_failure succeeded. |
2150 | +fi |
2151 | + |
2152 | +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then |
2153 | + : |
2154 | +else |
2155 | + exitcode=1 |
2156 | + echo positional parameters were not saved. |
2157 | +fi |
2158 | + |
2159 | +test \$exitcode = 0") || { |
2160 | + echo No shell found that supports shell functions. |
2161 | + echo Please tell bug-autoconf@gnu.org about your system, |
2162 | + echo including any error possibly output before this message. |
2163 | + echo This can help us improve future autoconf versions. |
2164 | + echo Configuration will now proceed without shell functions. |
2165 | +} |
2166 | + |
2167 | + |
2168 | + |
2169 | + as_lineno_1=$LINENO |
2170 | + as_lineno_2=$LINENO |
2171 | + test "x$as_lineno_1" != "x$as_lineno_2" && |
2172 | + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { |
2173 | + |
2174 | + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO |
2175 | + # uniformly replaced by the line number. The first 'sed' inserts a |
2176 | + # line-number line after each line using $LINENO; the second 'sed' |
2177 | + # does the real work. The second script uses 'N' to pair each |
2178 | + # line-number line with the line containing $LINENO, and appends |
2179 | + # trailing '-' during substitution so that $LINENO is not a special |
2180 | + # case at line end. |
2181 | + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the |
2182 | + # scripts with optimization help from Paolo Bonzini. Blame Lee |
2183 | + # E. McMahon (1931-1989) for sed's syntax. :-) |
2184 | sed -n ' |
2185 | p |
2186 | /[$]LINENO/= |
2187 | @@ -442,7 +473,8 @@ |
2188 | s/-\n.*// |
2189 | ' >$as_me.lineno && |
2190 | chmod +x "$as_me.lineno" || |
2191 | - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
2192 | + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 |
2193 | + { (exit 1); exit 1; }; } |
2194 | |
2195 | # Don't try to exec as it changes $[0], causing all sort of problems |
2196 | # (the dirname of $[0] is not the place where we might find the |
2197 | @@ -452,18 +484,29 @@ |
2198 | exit |
2199 | } |
2200 | |
2201 | + |
2202 | +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then |
2203 | + as_dirname=dirname |
2204 | +else |
2205 | + as_dirname=false |
2206 | +fi |
2207 | + |
2208 | ECHO_C= ECHO_N= ECHO_T= |
2209 | -case `echo -n x` in #((((( |
2210 | +case `echo -n x` in |
2211 | -n*) |
2212 | - case `echo 'xy\c'` in |
2213 | + case `echo 'x\c'` in |
2214 | *c*) ECHO_T=' ';; # ECHO_T is single tab character. |
2215 | - xy) ECHO_C='\c';; |
2216 | - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null |
2217 | - ECHO_T=' ';; |
2218 | + *) ECHO_C='\c';; |
2219 | esac;; |
2220 | *) |
2221 | ECHO_N='-n';; |
2222 | esac |
2223 | +if expr a : '\(a\)' >/dev/null 2>&1 && |
2224 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then |
2225 | + as_expr=expr |
2226 | +else |
2227 | + as_expr=false |
2228 | +fi |
2229 | |
2230 | rm -f conf$$ conf$$.exe conf$$.file |
2231 | if test -d conf$$.dir; then |
2232 | @@ -493,7 +536,7 @@ |
2233 | rmdir conf$$.dir 2>/dev/null |
2234 | |
2235 | if mkdir -p . 2>/dev/null; then |
2236 | - as_mkdir_p='mkdir -p "$as_dir"' |
2237 | + as_mkdir_p=: |
2238 | else |
2239 | test -d ./-p && rmdir ./-p |
2240 | as_mkdir_p=false |
2241 | @@ -512,10 +555,10 @@ |
2242 | if test -d "$1"; then |
2243 | test -d "$1/."; |
2244 | else |
2245 | - case $1 in #( |
2246 | + case $1 in |
2247 | -*)set "./$1";; |
2248 | esac; |
2249 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
2250 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in |
2251 | ???[sx]*):;;*)false;;esac;fi |
2252 | '\'' sh |
2253 | ' |
2254 | @@ -529,6 +572,7 @@ |
2255 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
2256 | |
2257 | |
2258 | + |
2259 | lt_ltdl_dir='libltdl' |
2260 | |
2261 | |
2262 | @@ -680,8 +724,7 @@ |
2263 | |
2264 | |
2265 | |
2266 | -test -n "$DJDIR" || exec 7<&0 </dev/null |
2267 | -exec 6>&1 |
2268 | +exec 7<&0 </dev/null 6>&1 |
2269 | |
2270 | # Name of the host. |
2271 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
2272 | @@ -699,14 +742,14 @@ |
2273 | subdirs= |
2274 | MFLAGS= |
2275 | MAKEFLAGS= |
2276 | +SHELL=${CONFIG_SHELL-/bin/sh} |
2277 | |
2278 | # Identity of this package. |
2279 | PACKAGE_NAME='ClamAV' |
2280 | PACKAGE_TARNAME='clamav' |
2281 | -PACKAGE_VERSION='0.97.6' |
2282 | -PACKAGE_STRING='ClamAV 0.97.6' |
2283 | +PACKAGE_VERSION='0.97.7' |
2284 | +PACKAGE_STRING='ClamAV 0.97.7' |
2285 | PACKAGE_BUGREPORT='http://bugs.clamav.net/' |
2286 | -PACKAGE_URL='http://www.clamav.net/' |
2287 | |
2288 | ac_unique_file="clamscan/clamscan.c" |
2289 | # Factoring default headers for most tests. |
2290 | @@ -922,7 +965,6 @@ |
2291 | program_transform_name |
2292 | prefix |
2293 | exec_prefix |
2294 | -PACKAGE_URL |
2295 | PACKAGE_BUGREPORT |
2296 | PACKAGE_STRING |
2297 | PACKAGE_VERSION |
2298 | @@ -1106,7 +1148,8 @@ |
2299 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
2300 | # Reject names that are not valid shell variable names. |
2301 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2302 | - as_fn_error "invalid feature name: $ac_useropt" |
2303 | + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 |
2304 | + { (exit 1); exit 1; }; } |
2305 | ac_useropt_orig=$ac_useropt |
2306 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2307 | case $ac_user_opts in |
2308 | @@ -1132,7 +1175,8 @@ |
2309 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
2310 | # Reject names that are not valid shell variable names. |
2311 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2312 | - as_fn_error "invalid feature name: $ac_useropt" |
2313 | + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 |
2314 | + { (exit 1); exit 1; }; } |
2315 | ac_useropt_orig=$ac_useropt |
2316 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2317 | case $ac_user_opts in |
2318 | @@ -1336,7 +1380,8 @@ |
2319 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
2320 | # Reject names that are not valid shell variable names. |
2321 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2322 | - as_fn_error "invalid package name: $ac_useropt" |
2323 | + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 |
2324 | + { (exit 1); exit 1; }; } |
2325 | ac_useropt_orig=$ac_useropt |
2326 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2327 | case $ac_user_opts in |
2328 | @@ -1352,7 +1397,8 @@ |
2329 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
2330 | # Reject names that are not valid shell variable names. |
2331 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
2332 | - as_fn_error "invalid package name: $ac_useropt" |
2333 | + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 |
2334 | + { (exit 1); exit 1; }; } |
2335 | ac_useropt_orig=$ac_useropt |
2336 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
2337 | case $ac_user_opts in |
2338 | @@ -1382,17 +1428,17 @@ |
2339 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
2340 | x_libraries=$ac_optarg ;; |
2341 | |
2342 | - -*) as_fn_error "unrecognized option: \`$ac_option' |
2343 | -Try \`$0 --help' for more information." |
2344 | + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option |
2345 | +Try \`$0 --help' for more information." >&2 |
2346 | + { (exit 1); exit 1; }; } |
2347 | ;; |
2348 | |
2349 | *=*) |
2350 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` |
2351 | # Reject names that are not valid shell variable names. |
2352 | - case $ac_envvar in #( |
2353 | - '' | [0-9]* | *[!_$as_cr_alnum]* ) |
2354 | - as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
2355 | - esac |
2356 | + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && |
2357 | + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 |
2358 | + { (exit 1); exit 1; }; } |
2359 | eval $ac_envvar=\$ac_optarg |
2360 | export $ac_envvar ;; |
2361 | |
2362 | @@ -1409,13 +1455,15 @@ |
2363 | |
2364 | if test -n "$ac_prev"; then |
2365 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
2366 | - as_fn_error "missing argument to $ac_option" |
2367 | + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 |
2368 | + { (exit 1); exit 1; }; } |
2369 | fi |
2370 | |
2371 | if test -n "$ac_unrecognized_opts"; then |
2372 | case $enable_option_checking in |
2373 | no) ;; |
2374 | - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; |
2375 | + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 |
2376 | + { (exit 1); exit 1; }; } ;; |
2377 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
2378 | esac |
2379 | fi |
2380 | @@ -1438,7 +1486,8 @@ |
2381 | [\\/$]* | ?:[\\/]* ) continue;; |
2382 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
2383 | esac |
2384 | - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
2385 | + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 |
2386 | + { (exit 1); exit 1; }; } |
2387 | done |
2388 | |
2389 | # There might be people who depend on the old broken behavior: `$host' |
2390 | @@ -1468,9 +1517,11 @@ |
2391 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
2392 | ac_ls_di=`ls -di .` && |
2393 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
2394 | - as_fn_error "working directory cannot be determined" |
2395 | + { $as_echo "$as_me: error: working directory cannot be determined" >&2 |
2396 | + { (exit 1); exit 1; }; } |
2397 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
2398 | - as_fn_error "pwd does not report name of working directory" |
2399 | + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 |
2400 | + { (exit 1); exit 1; }; } |
2401 | |
2402 | |
2403 | # Find the source files, if location was not specified. |
2404 | @@ -1509,11 +1560,13 @@ |
2405 | fi |
2406 | if test ! -r "$srcdir/$ac_unique_file"; then |
2407 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
2408 | - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
2409 | + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 |
2410 | + { (exit 1); exit 1; }; } |
2411 | fi |
2412 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
2413 | ac_abs_confdir=`( |
2414 | - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
2415 | + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 |
2416 | + { (exit 1); exit 1; }; } |
2417 | pwd)` |
2418 | # When building in place, set srcdir=. |
2419 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
2420 | @@ -1539,7 +1592,7 @@ |
2421 | # Omit some internal or obsolete options to make the list less imposing. |
2422 | # This message is too long to be a string in the A/UX 3.1 sh. |
2423 | cat <<_ACEOF |
2424 | -\`configure' configures ClamAV 0.97.6 to adapt to many kinds of systems. |
2425 | +\`configure' configures ClamAV 0.97.7 to adapt to many kinds of systems. |
2426 | |
2427 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2428 | |
2429 | @@ -1610,7 +1663,7 @@ |
2430 | |
2431 | if test -n "$ac_init_help"; then |
2432 | case $ac_init_help in |
2433 | - short | recursive ) echo "Configuration of ClamAV 0.97.6:";; |
2434 | + short | recursive ) echo "Configuration of ClamAV 0.97.7:";; |
2435 | esac |
2436 | cat <<\_ACEOF |
2437 | |
2438 | @@ -1696,7 +1749,7 @@ |
2439 | LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
2440 | nonstandard directory <lib dir> |
2441 | LIBS libraries to pass to the linker, e.g. -l<library> |
2442 | - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
2443 | + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if |
2444 | you have headers in a nonstandard directory <include dir> |
2445 | CPP C preprocessor |
2446 | |
2447 | @@ -1704,7 +1757,6 @@ |
2448 | it to find libraries and programs with nonstandard names/locations. |
2449 | |
2450 | Report bugs to <http://bugs.clamav.net/>. |
2451 | -ClamAV home page: <http://www.clamav.net/>. |
2452 | _ACEOF |
2453 | ac_status=$? |
2454 | fi |
2455 | @@ -1767,472 +1819,22 @@ |
2456 | test -n "$ac_init_help" && exit $ac_status |
2457 | if $ac_init_version; then |
2458 | cat <<\_ACEOF |
2459 | -ClamAV configure 0.97.6 |
2460 | -generated by GNU Autoconf 2.65 |
2461 | +ClamAV configure 0.97.7 |
2462 | +generated by GNU Autoconf 2.63 |
2463 | |
2464 | -Copyright (C) 2009 Free Software Foundation, Inc. |
2465 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
2466 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
2467 | This configure script is free software; the Free Software Foundation |
2468 | gives unlimited permission to copy, distribute and modify it. |
2469 | _ACEOF |
2470 | exit |
2471 | fi |
2472 | - |
2473 | -## ------------------------ ## |
2474 | -## Autoconf initialization. ## |
2475 | -## ------------------------ ## |
2476 | - |
2477 | -# ac_fn_c_try_compile LINENO |
2478 | -# -------------------------- |
2479 | -# Try to compile conftest.$ac_ext, and return whether this succeeded. |
2480 | -ac_fn_c_try_compile () |
2481 | -{ |
2482 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2483 | - rm -f conftest.$ac_objext |
2484 | - if { { ac_try="$ac_compile" |
2485 | -case "(($ac_try" in |
2486 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2487 | - *) ac_try_echo=$ac_try;; |
2488 | -esac |
2489 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2490 | -$as_echo "$ac_try_echo"; } >&5 |
2491 | - (eval "$ac_compile") 2>conftest.err |
2492 | - ac_status=$? |
2493 | - if test -s conftest.err; then |
2494 | - grep -v '^ *+' conftest.err >conftest.er1 |
2495 | - cat conftest.er1 >&5 |
2496 | - mv -f conftest.er1 conftest.err |
2497 | - fi |
2498 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2499 | - test $ac_status = 0; } && { |
2500 | - test -z "$ac_c_werror_flag" || |
2501 | - test ! -s conftest.err |
2502 | - } && test -s conftest.$ac_objext; then : |
2503 | - ac_retval=0 |
2504 | -else |
2505 | - $as_echo "$as_me: failed program was:" >&5 |
2506 | -sed 's/^/| /' conftest.$ac_ext >&5 |
2507 | - |
2508 | - ac_retval=1 |
2509 | -fi |
2510 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2511 | - as_fn_set_status $ac_retval |
2512 | - |
2513 | -} # ac_fn_c_try_compile |
2514 | - |
2515 | -# ac_fn_c_try_link LINENO |
2516 | -# ----------------------- |
2517 | -# Try to link conftest.$ac_ext, and return whether this succeeded. |
2518 | -ac_fn_c_try_link () |
2519 | -{ |
2520 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2521 | - rm -f conftest.$ac_objext conftest$ac_exeext |
2522 | - if { { ac_try="$ac_link" |
2523 | -case "(($ac_try" in |
2524 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2525 | - *) ac_try_echo=$ac_try;; |
2526 | -esac |
2527 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2528 | -$as_echo "$ac_try_echo"; } >&5 |
2529 | - (eval "$ac_link") 2>conftest.err |
2530 | - ac_status=$? |
2531 | - if test -s conftest.err; then |
2532 | - grep -v '^ *+' conftest.err >conftest.er1 |
2533 | - cat conftest.er1 >&5 |
2534 | - mv -f conftest.er1 conftest.err |
2535 | - fi |
2536 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2537 | - test $ac_status = 0; } && { |
2538 | - test -z "$ac_c_werror_flag" || |
2539 | - test ! -s conftest.err |
2540 | - } && test -s conftest$ac_exeext && { |
2541 | - test "$cross_compiling" = yes || |
2542 | - $as_test_x conftest$ac_exeext |
2543 | - }; then : |
2544 | - ac_retval=0 |
2545 | -else |
2546 | - $as_echo "$as_me: failed program was:" >&5 |
2547 | -sed 's/^/| /' conftest.$ac_ext >&5 |
2548 | - |
2549 | - ac_retval=1 |
2550 | -fi |
2551 | - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information |
2552 | - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would |
2553 | - # interfere with the next link command; also delete a directory that is |
2554 | - # left behind by Apple's compiler. We do this before executing the actions. |
2555 | - rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
2556 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2557 | - as_fn_set_status $ac_retval |
2558 | - |
2559 | -} # ac_fn_c_try_link |
2560 | - |
2561 | -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES |
2562 | -# ------------------------------------------------------- |
2563 | -# Tests whether HEADER exists and can be compiled using the include files in |
2564 | -# INCLUDES, setting the cache variable VAR accordingly. |
2565 | -ac_fn_c_check_header_compile () |
2566 | -{ |
2567 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2568 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2569 | -$as_echo_n "checking for $2... " >&6; } |
2570 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2571 | - $as_echo_n "(cached) " >&6 |
2572 | -else |
2573 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2574 | -/* end confdefs.h. */ |
2575 | -$4 |
2576 | -#include <$2> |
2577 | -_ACEOF |
2578 | -if ac_fn_c_try_compile "$LINENO"; then : |
2579 | - eval "$3=yes" |
2580 | -else |
2581 | - eval "$3=no" |
2582 | -fi |
2583 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2584 | -fi |
2585 | -eval ac_res=\$$3 |
2586 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2587 | -$as_echo "$ac_res" >&6; } |
2588 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2589 | - |
2590 | -} # ac_fn_c_check_header_compile |
2591 | - |
2592 | -# ac_fn_c_try_cpp LINENO |
2593 | -# ---------------------- |
2594 | -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. |
2595 | -ac_fn_c_try_cpp () |
2596 | -{ |
2597 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2598 | - if { { ac_try="$ac_cpp conftest.$ac_ext" |
2599 | -case "(($ac_try" in |
2600 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2601 | - *) ac_try_echo=$ac_try;; |
2602 | -esac |
2603 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2604 | -$as_echo "$ac_try_echo"; } >&5 |
2605 | - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err |
2606 | - ac_status=$? |
2607 | - if test -s conftest.err; then |
2608 | - grep -v '^ *+' conftest.err >conftest.er1 |
2609 | - cat conftest.er1 >&5 |
2610 | - mv -f conftest.er1 conftest.err |
2611 | - fi |
2612 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2613 | - test $ac_status = 0; } >/dev/null && { |
2614 | - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
2615 | - test ! -s conftest.err |
2616 | - }; then : |
2617 | - ac_retval=0 |
2618 | -else |
2619 | - $as_echo "$as_me: failed program was:" >&5 |
2620 | -sed 's/^/| /' conftest.$ac_ext >&5 |
2621 | - |
2622 | - ac_retval=1 |
2623 | -fi |
2624 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2625 | - as_fn_set_status $ac_retval |
2626 | - |
2627 | -} # ac_fn_c_try_cpp |
2628 | - |
2629 | -# ac_fn_c_try_run LINENO |
2630 | -# ---------------------- |
2631 | -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes |
2632 | -# that executables *can* be run. |
2633 | -ac_fn_c_try_run () |
2634 | -{ |
2635 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2636 | - if { { ac_try="$ac_link" |
2637 | -case "(($ac_try" in |
2638 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2639 | - *) ac_try_echo=$ac_try;; |
2640 | -esac |
2641 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2642 | -$as_echo "$ac_try_echo"; } >&5 |
2643 | - (eval "$ac_link") 2>&5 |
2644 | - ac_status=$? |
2645 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2646 | - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' |
2647 | - { { case "(($ac_try" in |
2648 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2649 | - *) ac_try_echo=$ac_try;; |
2650 | -esac |
2651 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2652 | -$as_echo "$ac_try_echo"; } >&5 |
2653 | - (eval "$ac_try") 2>&5 |
2654 | - ac_status=$? |
2655 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2656 | - test $ac_status = 0; }; }; then : |
2657 | - ac_retval=0 |
2658 | -else |
2659 | - $as_echo "$as_me: program exited with status $ac_status" >&5 |
2660 | - $as_echo "$as_me: failed program was:" >&5 |
2661 | -sed 's/^/| /' conftest.$ac_ext >&5 |
2662 | - |
2663 | - ac_retval=$ac_status |
2664 | -fi |
2665 | - rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
2666 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2667 | - as_fn_set_status $ac_retval |
2668 | - |
2669 | -} # ac_fn_c_try_run |
2670 | - |
2671 | -# ac_fn_c_check_func LINENO FUNC VAR |
2672 | -# ---------------------------------- |
2673 | -# Tests whether FUNC exists, setting the cache variable VAR accordingly |
2674 | -ac_fn_c_check_func () |
2675 | -{ |
2676 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2677 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2678 | -$as_echo_n "checking for $2... " >&6; } |
2679 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2680 | - $as_echo_n "(cached) " >&6 |
2681 | -else |
2682 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2683 | -/* end confdefs.h. */ |
2684 | -/* Define $2 to an innocuous variant, in case <limits.h> declares $2. |
2685 | - For example, HP-UX 11i <limits.h> declares gettimeofday. */ |
2686 | -#define $2 innocuous_$2 |
2687 | - |
2688 | -/* System header to define __stub macros and hopefully few prototypes, |
2689 | - which can conflict with char $2 (); below. |
2690 | - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
2691 | - <limits.h> exists even on freestanding compilers. */ |
2692 | - |
2693 | -#ifdef __STDC__ |
2694 | -# include <limits.h> |
2695 | -#else |
2696 | -# include <assert.h> |
2697 | -#endif |
2698 | - |
2699 | -#undef $2 |
2700 | - |
2701 | -/* Override any GCC internal prototype to avoid an error. |
2702 | - Use char because int might match the return type of a GCC |
2703 | - builtin and then its argument prototype would still apply. */ |
2704 | -#ifdef __cplusplus |
2705 | -extern "C" |
2706 | -#endif |
2707 | -char $2 (); |
2708 | -/* The GNU C library defines this for functions which it implements |
2709 | - to always fail with ENOSYS. Some functions are actually named |
2710 | - something starting with __ and the normal name is an alias. */ |
2711 | -#if defined __stub_$2 || defined __stub___$2 |
2712 | -choke me |
2713 | -#endif |
2714 | - |
2715 | -int |
2716 | -main () |
2717 | -{ |
2718 | -return $2 (); |
2719 | - ; |
2720 | - return 0; |
2721 | -} |
2722 | -_ACEOF |
2723 | -if ac_fn_c_try_link "$LINENO"; then : |
2724 | - eval "$3=yes" |
2725 | -else |
2726 | - eval "$3=no" |
2727 | -fi |
2728 | -rm -f core conftest.err conftest.$ac_objext \ |
2729 | - conftest$ac_exeext conftest.$ac_ext |
2730 | -fi |
2731 | -eval ac_res=\$$3 |
2732 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2733 | -$as_echo "$ac_res" >&6; } |
2734 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2735 | - |
2736 | -} # ac_fn_c_check_func |
2737 | - |
2738 | -# ac_fn_c_check_decl LINENO SYMBOL VAR |
2739 | -# ------------------------------------ |
2740 | -# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. |
2741 | -ac_fn_c_check_decl () |
2742 | -{ |
2743 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2744 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 |
2745 | -$as_echo_n "checking whether $2 is declared... " >&6; } |
2746 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2747 | - $as_echo_n "(cached) " >&6 |
2748 | -else |
2749 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2750 | -/* end confdefs.h. */ |
2751 | -$4 |
2752 | -int |
2753 | -main () |
2754 | -{ |
2755 | -#ifndef $2 |
2756 | - (void) $2; |
2757 | -#endif |
2758 | - |
2759 | - ; |
2760 | - return 0; |
2761 | -} |
2762 | -_ACEOF |
2763 | -if ac_fn_c_try_compile "$LINENO"; then : |
2764 | - eval "$3=yes" |
2765 | -else |
2766 | - eval "$3=no" |
2767 | -fi |
2768 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2769 | -fi |
2770 | -eval ac_res=\$$3 |
2771 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2772 | -$as_echo "$ac_res" >&6; } |
2773 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2774 | - |
2775 | -} # ac_fn_c_check_decl |
2776 | - |
2777 | -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES |
2778 | -# ------------------------------------------- |
2779 | -# Tests whether TYPE exists after having included INCLUDES, setting cache |
2780 | -# variable VAR accordingly. |
2781 | -ac_fn_c_check_type () |
2782 | -{ |
2783 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2784 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2785 | -$as_echo_n "checking for $2... " >&6; } |
2786 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2787 | - $as_echo_n "(cached) " >&6 |
2788 | -else |
2789 | - eval "$3=no" |
2790 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2791 | -/* end confdefs.h. */ |
2792 | -$4 |
2793 | -int |
2794 | -main () |
2795 | -{ |
2796 | -if (sizeof ($2)) |
2797 | - return 0; |
2798 | - ; |
2799 | - return 0; |
2800 | -} |
2801 | -_ACEOF |
2802 | -if ac_fn_c_try_compile "$LINENO"; then : |
2803 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2804 | -/* end confdefs.h. */ |
2805 | -$4 |
2806 | -int |
2807 | -main () |
2808 | -{ |
2809 | -if (sizeof (($2))) |
2810 | - return 0; |
2811 | - ; |
2812 | - return 0; |
2813 | -} |
2814 | -_ACEOF |
2815 | -if ac_fn_c_try_compile "$LINENO"; then : |
2816 | - |
2817 | -else |
2818 | - eval "$3=yes" |
2819 | -fi |
2820 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2821 | -fi |
2822 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2823 | -fi |
2824 | -eval ac_res=\$$3 |
2825 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2826 | -$as_echo "$ac_res" >&6; } |
2827 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2828 | - |
2829 | -} # ac_fn_c_check_type |
2830 | - |
2831 | -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES |
2832 | -# ------------------------------------------------------- |
2833 | -# Tests whether HEADER exists, giving a warning if it cannot be compiled using |
2834 | -# the include files in INCLUDES and setting the cache variable VAR |
2835 | -# accordingly. |
2836 | -ac_fn_c_check_header_mongrel () |
2837 | -{ |
2838 | - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2839 | - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2840 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2841 | -$as_echo_n "checking for $2... " >&6; } |
2842 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2843 | - $as_echo_n "(cached) " >&6 |
2844 | -fi |
2845 | -eval ac_res=\$$3 |
2846 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2847 | -$as_echo "$ac_res" >&6; } |
2848 | -else |
2849 | - # Is the header compilable? |
2850 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 |
2851 | -$as_echo_n "checking $2 usability... " >&6; } |
2852 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2853 | -/* end confdefs.h. */ |
2854 | -$4 |
2855 | -#include <$2> |
2856 | -_ACEOF |
2857 | -if ac_fn_c_try_compile "$LINENO"; then : |
2858 | - ac_header_compiler=yes |
2859 | -else |
2860 | - ac_header_compiler=no |
2861 | -fi |
2862 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2863 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 |
2864 | -$as_echo "$ac_header_compiler" >&6; } |
2865 | - |
2866 | -# Is the header present? |
2867 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 |
2868 | -$as_echo_n "checking $2 presence... " >&6; } |
2869 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2870 | -/* end confdefs.h. */ |
2871 | -#include <$2> |
2872 | -_ACEOF |
2873 | -if ac_fn_c_try_cpp "$LINENO"; then : |
2874 | - ac_header_preproc=yes |
2875 | -else |
2876 | - ac_header_preproc=no |
2877 | -fi |
2878 | -rm -f conftest.err conftest.$ac_ext |
2879 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 |
2880 | -$as_echo "$ac_header_preproc" >&6; } |
2881 | - |
2882 | -# So? What about this header? |
2883 | -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( |
2884 | - yes:no: ) |
2885 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 |
2886 | -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} |
2887 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
2888 | -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
2889 | - ;; |
2890 | - no:yes:* ) |
2891 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 |
2892 | -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} |
2893 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 |
2894 | -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} |
2895 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 |
2896 | -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} |
2897 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 |
2898 | -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} |
2899 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
2900 | -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
2901 | -( cat <<\_ASBOX |
2902 | -## -------------------------------------- ## |
2903 | -## Report this to http://bugs.clamav.net/ ## |
2904 | -## -------------------------------------- ## |
2905 | -_ASBOX |
2906 | - ) | sed "s/^/$as_me: WARNING: /" >&2 |
2907 | - ;; |
2908 | -esac |
2909 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2910 | -$as_echo_n "checking for $2... " >&6; } |
2911 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
2912 | - $as_echo_n "(cached) " >&6 |
2913 | -else |
2914 | - eval "$3=\$ac_header_compiler" |
2915 | -fi |
2916 | -eval ac_res=\$$3 |
2917 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
2918 | -$as_echo "$ac_res" >&6; } |
2919 | -fi |
2920 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
2921 | - |
2922 | -} # ac_fn_c_check_header_mongrel |
2923 | cat >config.log <<_ACEOF |
2924 | This file contains any messages produced by compilers while |
2925 | running configure, to aid debugging if configure makes a mistake. |
2926 | |
2927 | -It was created by ClamAV $as_me 0.97.6, which was |
2928 | -generated by GNU Autoconf 2.65. Invocation command line was |
2929 | +It was created by ClamAV $as_me 0.97.7, which was |
2930 | +generated by GNU Autoconf 2.63. Invocation command line was |
2931 | |
2932 | $ $0 $@ |
2933 | |
2934 | @@ -2268,8 +1870,8 @@ |
2935 | do |
2936 | IFS=$as_save_IFS |
2937 | test -z "$as_dir" && as_dir=. |
2938 | - $as_echo "PATH: $as_dir" |
2939 | - done |
2940 | + $as_echo "PATH: $as_dir" |
2941 | +done |
2942 | IFS=$as_save_IFS |
2943 | |
2944 | } >&5 |
2945 | @@ -2306,9 +1908,9 @@ |
2946 | ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
2947 | esac |
2948 | case $ac_pass in |
2949 | - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; |
2950 | + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; |
2951 | 2) |
2952 | - as_fn_append ac_configure_args1 " '$ac_arg'" |
2953 | + ac_configure_args1="$ac_configure_args1 '$ac_arg'" |
2954 | if test $ac_must_keep_next = true; then |
2955 | ac_must_keep_next=false # Got value, back to normal. |
2956 | else |
2957 | @@ -2324,13 +1926,13 @@ |
2958 | -* ) ac_must_keep_next=true ;; |
2959 | esac |
2960 | fi |
2961 | - as_fn_append ac_configure_args " '$ac_arg'" |
2962 | + ac_configure_args="$ac_configure_args '$ac_arg'" |
2963 | ;; |
2964 | esac |
2965 | done |
2966 | done |
2967 | -{ ac_configure_args0=; unset ac_configure_args0;} |
2968 | -{ ac_configure_args1=; unset ac_configure_args1;} |
2969 | +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } |
2970 | +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } |
2971 | |
2972 | # When interrupted or exit'd, cleanup temporary files, and complete |
2973 | # config.log. We remove comments because anyway the quotes in there |
2974 | @@ -2355,13 +1957,13 @@ |
2975 | case $ac_val in #( |
2976 | *${as_nl}*) |
2977 | case $ac_var in #( |
2978 | - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 |
2979 | + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 |
2980 | $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; |
2981 | esac |
2982 | case $ac_var in #( |
2983 | _ | IFS | as_nl) ;; #( |
2984 | BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( |
2985 | - *) { eval $ac_var=; unset $ac_var;} ;; |
2986 | + *) $as_unset $ac_var ;; |
2987 | esac ;; |
2988 | esac |
2989 | done |
2990 | @@ -2433,41 +2035,39 @@ |
2991 | exit $exit_status |
2992 | ' 0 |
2993 | for ac_signal in 1 2 13 15; do |
2994 | - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal |
2995 | + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal |
2996 | done |
2997 | ac_signal=0 |
2998 | |
2999 | # confdefs.h avoids OS command line length limits that DEFS can exceed. |
3000 | rm -f -r conftest* confdefs.h |
3001 | |
3002 | -$as_echo "/* confdefs.h */" > confdefs.h |
3003 | - |
3004 | # Predefined preprocessor variables. |
3005 | |
3006 | cat >>confdefs.h <<_ACEOF |
3007 | #define PACKAGE_NAME "$PACKAGE_NAME" |
3008 | _ACEOF |
3009 | |
3010 | + |
3011 | cat >>confdefs.h <<_ACEOF |
3012 | #define PACKAGE_TARNAME "$PACKAGE_TARNAME" |
3013 | _ACEOF |
3014 | |
3015 | + |
3016 | cat >>confdefs.h <<_ACEOF |
3017 | #define PACKAGE_VERSION "$PACKAGE_VERSION" |
3018 | _ACEOF |
3019 | |
3020 | + |
3021 | cat >>confdefs.h <<_ACEOF |
3022 | #define PACKAGE_STRING "$PACKAGE_STRING" |
3023 | _ACEOF |
3024 | |
3025 | + |
3026 | cat >>confdefs.h <<_ACEOF |
3027 | #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" |
3028 | _ACEOF |
3029 | |
3030 | -cat >>confdefs.h <<_ACEOF |
3031 | -#define PACKAGE_URL "$PACKAGE_URL" |
3032 | -_ACEOF |
3033 | - |
3034 | |
3035 | # Let the site file select an alternate cache file if it wants to. |
3036 | # Prefer an explicitly selected file to automatically selected ones. |
3037 | @@ -2485,8 +2085,8 @@ |
3038 | for ac_site_file in "$ac_site_file1" "$ac_site_file2" |
3039 | do |
3040 | test "x$ac_site_file" = xNONE && continue |
3041 | - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then |
3042 | - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
3043 | + if test -r "$ac_site_file"; then |
3044 | + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 |
3045 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} |
3046 | sed 's/^/| /' "$ac_site_file" >&5 |
3047 | . "$ac_site_file" |
3048 | @@ -2494,10 +2094,10 @@ |
3049 | done |
3050 | |
3051 | if test -r "$cache_file"; then |
3052 | - # Some versions of bash will fail to source /dev/null (special files |
3053 | - # actually), so we avoid doing that. DJGPP emulates it as a regular file. |
3054 | - if test /dev/null != "$cache_file" && test -f "$cache_file"; then |
3055 | - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 |
3056 | + # Some versions of bash will fail to source /dev/null (special |
3057 | + # files actually), so we avoid doing that. |
3058 | + if test -f "$cache_file"; then |
3059 | + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 |
3060 | $as_echo "$as_me: loading cache $cache_file" >&6;} |
3061 | case $cache_file in |
3062 | [\\/]* | ?:[\\/]* ) . "$cache_file";; |
3063 | @@ -2505,7 +2105,7 @@ |
3064 | esac |
3065 | fi |
3066 | else |
3067 | - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 |
3068 | + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 |
3069 | $as_echo "$as_me: creating cache $cache_file" >&6;} |
3070 | >$cache_file |
3071 | fi |
3072 | @@ -2520,11 +2120,11 @@ |
3073 | eval ac_new_val=\$ac_env_${ac_var}_value |
3074 | case $ac_old_set,$ac_new_set in |
3075 | set,) |
3076 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 |
3077 | + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 |
3078 | $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} |
3079 | ac_cache_corrupted=: ;; |
3080 | ,set) |
3081 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 |
3082 | + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 |
3083 | $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} |
3084 | ac_cache_corrupted=: ;; |
3085 | ,);; |
3086 | @@ -2534,17 +2134,17 @@ |
3087 | ac_old_val_w=`echo x $ac_old_val` |
3088 | ac_new_val_w=`echo x $ac_new_val` |
3089 | if test "$ac_old_val_w" != "$ac_new_val_w"; then |
3090 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 |
3091 | + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 |
3092 | $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} |
3093 | ac_cache_corrupted=: |
3094 | else |
3095 | - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 |
3096 | + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 |
3097 | $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} |
3098 | eval $ac_var=\$ac_old_val |
3099 | fi |
3100 | - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 |
3101 | + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 |
3102 | $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} |
3103 | - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 |
3104 | + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 |
3105 | $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} |
3106 | fi;; |
3107 | esac |
3108 | @@ -2556,20 +2156,43 @@ |
3109 | esac |
3110 | case " $ac_configure_args " in |
3111 | *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. |
3112 | - *) as_fn_append ac_configure_args " '$ac_arg'" ;; |
3113 | + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; |
3114 | esac |
3115 | fi |
3116 | done |
3117 | if $ac_cache_corrupted; then |
3118 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3119 | + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
3120 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3121 | - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
3122 | + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 |
3123 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
3124 | - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
3125 | + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 |
3126 | +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} |
3127 | + { (exit 1); exit 1; }; } |
3128 | fi |
3129 | -## -------------------- ## |
3130 | -## Main body of script. ## |
3131 | -## -------------------- ## |
3132 | + |
3133 | + |
3134 | + |
3135 | + |
3136 | + |
3137 | + |
3138 | + |
3139 | + |
3140 | + |
3141 | + |
3142 | + |
3143 | + |
3144 | + |
3145 | + |
3146 | + |
3147 | + |
3148 | + |
3149 | + |
3150 | + |
3151 | + |
3152 | + |
3153 | + |
3154 | + |
3155 | + |
3156 | |
3157 | ac_ext=c |
3158 | ac_cpp='$CPP $CPPFLAGS' |
3159 | @@ -2580,18 +2203,27 @@ |
3160 | |
3161 | |
3162 | |
3163 | + |
3164 | ac_aux_dir= |
3165 | for ac_dir in config "$srcdir"/config; do |
3166 | - for ac_t in install-sh install.sh shtool; do |
3167 | - if test -f "$ac_dir/$ac_t"; then |
3168 | - ac_aux_dir=$ac_dir |
3169 | - ac_install_sh="$ac_aux_dir/$ac_t -c" |
3170 | - break 2 |
3171 | - fi |
3172 | - done |
3173 | + if test -f "$ac_dir/install-sh"; then |
3174 | + ac_aux_dir=$ac_dir |
3175 | + ac_install_sh="$ac_aux_dir/install-sh -c" |
3176 | + break |
3177 | + elif test -f "$ac_dir/install.sh"; then |
3178 | + ac_aux_dir=$ac_dir |
3179 | + ac_install_sh="$ac_aux_dir/install.sh -c" |
3180 | + break |
3181 | + elif test -f "$ac_dir/shtool"; then |
3182 | + ac_aux_dir=$ac_dir |
3183 | + ac_install_sh="$ac_aux_dir/shtool install -c" |
3184 | + break |
3185 | + fi |
3186 | done |
3187 | if test -z "$ac_aux_dir"; then |
3188 | - as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 |
3189 | + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 |
3190 | +$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} |
3191 | + { (exit 1); exit 1; }; } |
3192 | fi |
3193 | |
3194 | # These three variables are undocumented and unsupported, |
3195 | @@ -2610,27 +2242,35 @@ |
3196 | |
3197 | # Make sure we can run config.sub. |
3198 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
3199 | - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
3200 | + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 |
3201 | +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} |
3202 | + { (exit 1); exit 1; }; } |
3203 | |
3204 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
3205 | +{ $as_echo "$as_me:$LINENO: checking build system type" >&5 |
3206 | $as_echo_n "checking build system type... " >&6; } |
3207 | -if test "${ac_cv_build+set}" = set; then : |
3208 | +if test "${ac_cv_build+set}" = set; then |
3209 | $as_echo_n "(cached) " >&6 |
3210 | else |
3211 | ac_build_alias=$build_alias |
3212 | test "x$ac_build_alias" = x && |
3213 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
3214 | test "x$ac_build_alias" = x && |
3215 | - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 |
3216 | + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 |
3217 | +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} |
3218 | + { (exit 1); exit 1; }; } |
3219 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
3220 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
3221 | + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 |
3222 | +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} |
3223 | + { (exit 1); exit 1; }; } |
3224 | |
3225 | fi |
3226 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
3227 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 |
3228 | $as_echo "$ac_cv_build" >&6; } |
3229 | case $ac_cv_build in |
3230 | *-*-*) ;; |
3231 | -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; |
3232 | +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 |
3233 | +$as_echo "$as_me: error: invalid value of canonical build" >&2;} |
3234 | + { (exit 1); exit 1; }; };; |
3235 | esac |
3236 | build=$ac_cv_build |
3237 | ac_save_IFS=$IFS; IFS='-' |
3238 | @@ -2646,24 +2286,28 @@ |
3239 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac |
3240 | |
3241 | |
3242 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 |
3243 | +{ $as_echo "$as_me:$LINENO: checking host system type" >&5 |
3244 | $as_echo_n "checking host system type... " >&6; } |
3245 | -if test "${ac_cv_host+set}" = set; then : |
3246 | +if test "${ac_cv_host+set}" = set; then |
3247 | $as_echo_n "(cached) " >&6 |
3248 | else |
3249 | if test "x$host_alias" = x; then |
3250 | ac_cv_host=$ac_cv_build |
3251 | else |
3252 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
3253 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
3254 | + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 |
3255 | +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} |
3256 | + { (exit 1); exit 1; }; } |
3257 | fi |
3258 | |
3259 | fi |
3260 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 |
3261 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 |
3262 | $as_echo "$ac_cv_host" >&6; } |
3263 | case $ac_cv_host in |
3264 | *-*-*) ;; |
3265 | -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; |
3266 | +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 |
3267 | +$as_echo "$as_me: error: invalid value of canonical host" >&2;} |
3268 | + { (exit 1); exit 1; }; };; |
3269 | esac |
3270 | host=$ac_cv_host |
3271 | ac_save_IFS=$IFS; IFS='-' |
3272 | @@ -2679,24 +2323,28 @@ |
3273 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac |
3274 | |
3275 | |
3276 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 |
3277 | +{ $as_echo "$as_me:$LINENO: checking target system type" >&5 |
3278 | $as_echo_n "checking target system type... " >&6; } |
3279 | -if test "${ac_cv_target+set}" = set; then : |
3280 | +if test "${ac_cv_target+set}" = set; then |
3281 | $as_echo_n "(cached) " >&6 |
3282 | else |
3283 | if test "x$target_alias" = x; then |
3284 | ac_cv_target=$ac_cv_host |
3285 | else |
3286 | ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || |
3287 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 |
3288 | + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 |
3289 | +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} |
3290 | + { (exit 1); exit 1; }; } |
3291 | fi |
3292 | |
3293 | fi |
3294 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 |
3295 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 |
3296 | $as_echo "$ac_cv_target" >&6; } |
3297 | case $ac_cv_target in |
3298 | *-*-*) ;; |
3299 | -*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; |
3300 | +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 |
3301 | +$as_echo "$as_me: error: invalid value of canonical target" >&2;} |
3302 | + { (exit 1); exit 1; }; };; |
3303 | esac |
3304 | target=$ac_cv_target |
3305 | ac_save_IFS=$IFS; IFS='-' |
3306 | @@ -2719,7 +2367,6 @@ |
3307 | NONENONEs,x,x, && |
3308 | program_prefix=${target_alias}- |
3309 | |
3310 | - |
3311 | target_cpu_arch="unknown" |
3312 | case $target_cpu in |
3313 | i386*|i486*|i586*|i686*|i786*) target_cpu_arch=i386 ;; |
3314 | @@ -2776,7 +2423,7 @@ |
3315 | # |
3316 | # |
3317 | if $ac_need_target_h_file_new ; then |
3318 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: creating $ac_need_target_h_file - canonical system defines" >&5 |
3319 | +{ $as_echo "$as_me:$LINENO: result: creating $ac_need_target_h_file - canonical system defines" >&5 |
3320 | $as_echo "creating $ac_need_target_h_file - canonical system defines" >&6; } |
3321 | echo /'*' automatically generated by $PACKAGE configure '*'/ >$ac_need_target_h_file |
3322 | echo /'*' on `date` '*'/ >>$ac_need_target_h_file |
3323 | @@ -2850,7 +2497,7 @@ |
3324 | # |
3325 | # |
3326 | if $ac_need_target_h_file_new ; then |
3327 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: creating $ac_need_target_h_file - canonical system defines" >&5 |
3328 | +{ $as_echo "$as_me:$LINENO: result: creating $ac_need_target_h_file - canonical system defines" >&5 |
3329 | $as_echo "creating $ac_need_target_h_file - canonical system defines" >&6; } |
3330 | echo /'*' automatically generated by $PACKAGE configure '*'/ >$ac_need_target_h_file |
3331 | echo /'*' on `date` '*'/ >>$ac_need_target_h_file |
3332 | @@ -2923,10 +2570,10 @@ |
3333 | # OS/2's system install, which has a completely different semantic |
3334 | # ./install, which can be erroneously created by make from ./install.sh. |
3335 | # Reject install programs that cannot install multiple files. |
3336 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
3337 | +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 |
3338 | $as_echo_n "checking for a BSD-compatible install... " >&6; } |
3339 | if test -z "$INSTALL"; then |
3340 | -if test "${ac_cv_path_install+set}" = set; then : |
3341 | +if test "${ac_cv_path_install+set}" = set; then |
3342 | $as_echo_n "(cached) " >&6 |
3343 | else |
3344 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3345 | @@ -2934,11 +2581,11 @@ |
3346 | do |
3347 | IFS=$as_save_IFS |
3348 | test -z "$as_dir" && as_dir=. |
3349 | - # Account for people who put trailing slashes in PATH elements. |
3350 | -case $as_dir/ in #(( |
3351 | - ./ | .// | /[cC]/* | \ |
3352 | + # Account for people who put trailing slashes in PATH elements. |
3353 | +case $as_dir/ in |
3354 | + ./ | .// | /cC/* | \ |
3355 | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ |
3356 | - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ |
3357 | + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ |
3358 | /usr/ucb/* ) ;; |
3359 | *) |
3360 | # OSF1 and SCO ODT 3.0 have their own names for install. |
3361 | @@ -2975,7 +2622,7 @@ |
3362 | ;; |
3363 | esac |
3364 | |
3365 | - done |
3366 | +done |
3367 | IFS=$as_save_IFS |
3368 | |
3369 | rm -rf conftest.one conftest.two conftest.dir |
3370 | @@ -2991,7 +2638,7 @@ |
3371 | INSTALL=$ac_install_sh |
3372 | fi |
3373 | fi |
3374 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 |
3375 | +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 |
3376 | $as_echo "$INSTALL" >&6; } |
3377 | |
3378 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. |
3379 | @@ -3002,7 +2649,7 @@ |
3380 | |
3381 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
3382 | |
3383 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
3384 | +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 |
3385 | $as_echo_n "checking whether build environment is sane... " >&6; } |
3386 | # Just in case |
3387 | sleep 1 |
3388 | @@ -3013,11 +2660,15 @@ |
3389 | ' |
3390 | case `pwd` in |
3391 | *[\\\"\#\$\&\'\`$am_lf]*) |
3392 | - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; |
3393 | + { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 |
3394 | +$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} |
3395 | + { (exit 1); exit 1; }; };; |
3396 | esac |
3397 | case $srcdir in |
3398 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
3399 | - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
3400 | + { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 |
3401 | +$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} |
3402 | + { (exit 1); exit 1; }; };; |
3403 | esac |
3404 | |
3405 | # Do `set' in a subshell so we don't clobber the current shell's |
3406 | @@ -3039,8 +2690,11 @@ |
3407 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
3408 | # broken ls alias from the environment. This has actually |
3409 | # happened. Such a system could not be considered "sane". |
3410 | - as_fn_error "ls -t appears to fail. Make sure there is not a broken |
3411 | -alias in your environment" "$LINENO" 5 |
3412 | + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken |
3413 | +alias in your environment" >&5 |
3414 | +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken |
3415 | +alias in your environment" >&2;} |
3416 | + { (exit 1); exit 1; }; } |
3417 | fi |
3418 | |
3419 | test "$2" = conftest.file |
3420 | @@ -3049,10 +2703,13 @@ |
3421 | # Ok. |
3422 | : |
3423 | else |
3424 | - as_fn_error "newly created file is older than distributed files! |
3425 | -Check your system clock" "$LINENO" 5 |
3426 | + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! |
3427 | +Check your system clock" >&5 |
3428 | +$as_echo "$as_me: error: newly created file is older than distributed files! |
3429 | +Check your system clock" >&2;} |
3430 | + { (exit 1); exit 1; }; } |
3431 | fi |
3432 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3433 | +{ $as_echo "$as_me:$LINENO: result: yes" >&5 |
3434 | $as_echo "yes" >&6; } |
3435 | test "$program_prefix" != NONE && |
3436 | program_transform_name="s&^&$program_prefix&;$program_transform_name" |
3437 | @@ -3080,7 +2737,7 @@ |
3438 | am_missing_run="$MISSING --run " |
3439 | else |
3440 | am_missing_run= |
3441 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 |
3442 | + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 |
3443 | $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} |
3444 | fi |
3445 | |
3446 | @@ -3101,9 +2758,9 @@ |
3447 | if test -n "$ac_tool_prefix"; then |
3448 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
3449 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
3450 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3451 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
3452 | $as_echo_n "checking for $ac_word... " >&6; } |
3453 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
3454 | +if test "${ac_cv_prog_STRIP+set}" = set; then |
3455 | $as_echo_n "(cached) " >&6 |
3456 | else |
3457 | if test -n "$STRIP"; then |
3458 | @@ -3114,24 +2771,24 @@ |
3459 | do |
3460 | IFS=$as_save_IFS |
3461 | test -z "$as_dir" && as_dir=. |
3462 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3463 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3464 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3465 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
3466 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3467 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3468 | break 2 |
3469 | fi |
3470 | done |
3471 | - done |
3472 | +done |
3473 | IFS=$as_save_IFS |
3474 | |
3475 | fi |
3476 | fi |
3477 | STRIP=$ac_cv_prog_STRIP |
3478 | if test -n "$STRIP"; then |
3479 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 |
3480 | + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 |
3481 | $as_echo "$STRIP" >&6; } |
3482 | else |
3483 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3484 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
3485 | $as_echo "no" >&6; } |
3486 | fi |
3487 | |
3488 | @@ -3141,9 +2798,9 @@ |
3489 | ac_ct_STRIP=$STRIP |
3490 | # Extract the first word of "strip", so it can be a program name with args. |
3491 | set dummy strip; ac_word=$2 |
3492 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3493 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
3494 | $as_echo_n "checking for $ac_word... " >&6; } |
3495 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
3496 | +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then |
3497 | $as_echo_n "(cached) " >&6 |
3498 | else |
3499 | if test -n "$ac_ct_STRIP"; then |
3500 | @@ -3154,24 +2811,24 @@ |
3501 | do |
3502 | IFS=$as_save_IFS |
3503 | test -z "$as_dir" && as_dir=. |
3504 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3505 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3506 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3507 | ac_cv_prog_ac_ct_STRIP="strip" |
3508 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3509 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3510 | break 2 |
3511 | fi |
3512 | done |
3513 | - done |
3514 | +done |
3515 | IFS=$as_save_IFS |
3516 | |
3517 | fi |
3518 | fi |
3519 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP |
3520 | if test -n "$ac_ct_STRIP"; then |
3521 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 |
3522 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 |
3523 | $as_echo "$ac_ct_STRIP" >&6; } |
3524 | else |
3525 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3526 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
3527 | $as_echo "no" >&6; } |
3528 | fi |
3529 | |
3530 | @@ -3180,7 +2837,7 @@ |
3531 | else |
3532 | case $cross_compiling:$ac_tool_warned in |
3533 | yes:) |
3534 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3535 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
3536 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3537 | ac_tool_warned=yes ;; |
3538 | esac |
3539 | @@ -3193,10 +2850,10 @@ |
3540 | fi |
3541 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
3542 | |
3543 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 |
3544 | +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 |
3545 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } |
3546 | if test -z "$MKDIR_P"; then |
3547 | - if test "${ac_cv_path_mkdir+set}" = set; then : |
3548 | + if test "${ac_cv_path_mkdir+set}" = set; then |
3549 | $as_echo_n "(cached) " >&6 |
3550 | else |
3551 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3552 | @@ -3204,7 +2861,7 @@ |
3553 | do |
3554 | IFS=$as_save_IFS |
3555 | test -z "$as_dir" && as_dir=. |
3556 | - for ac_prog in mkdir gmkdir; do |
3557 | + for ac_prog in mkdir gmkdir; do |
3558 | for ac_exec_ext in '' $ac_executable_extensions; do |
3559 | { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue |
3560 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
3561 | @@ -3216,12 +2873,11 @@ |
3562 | esac |
3563 | done |
3564 | done |
3565 | - done |
3566 | +done |
3567 | IFS=$as_save_IFS |
3568 | |
3569 | fi |
3570 | |
3571 | - test -d ./--version && rmdir ./--version |
3572 | if test "${ac_cv_path_mkdir+set}" = set; then |
3573 | MKDIR_P="$ac_cv_path_mkdir -p" |
3574 | else |
3575 | @@ -3229,10 +2885,11 @@ |
3576 | # value for MKDIR_P within a source directory, because that will |
3577 | # break other packages using the cache if that directory is |
3578 | # removed, or if the value is a relative name. |
3579 | + test -d ./--version && rmdir ./--version |
3580 | MKDIR_P="$ac_install_sh -d" |
3581 | fi |
3582 | fi |
3583 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 |
3584 | +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 |
3585 | $as_echo "$MKDIR_P" >&6; } |
3586 | |
3587 | mkdir_p="$MKDIR_P" |
3588 | @@ -3245,9 +2902,9 @@ |
3589 | do |
3590 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
3591 | set dummy $ac_prog; ac_word=$2 |
3592 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3593 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
3594 | $as_echo_n "checking for $ac_word... " >&6; } |
3595 | -if test "${ac_cv_prog_AWK+set}" = set; then : |
3596 | +if test "${ac_cv_prog_AWK+set}" = set; then |
3597 | $as_echo_n "(cached) " >&6 |
3598 | else |
3599 | if test -n "$AWK"; then |
3600 | @@ -3258,24 +2915,24 @@ |
3601 | do |
3602 | IFS=$as_save_IFS |
3603 | test -z "$as_dir" && as_dir=. |
3604 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3605 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3606 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3607 | ac_cv_prog_AWK="$ac_prog" |
3608 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3609 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3610 | break 2 |
3611 | fi |
3612 | done |
3613 | - done |
3614 | +done |
3615 | IFS=$as_save_IFS |
3616 | |
3617 | fi |
3618 | fi |
3619 | AWK=$ac_cv_prog_AWK |
3620 | if test -n "$AWK"; then |
3621 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 |
3622 | + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 |
3623 | $as_echo "$AWK" >&6; } |
3624 | else |
3625 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3626 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
3627 | $as_echo "no" >&6; } |
3628 | fi |
3629 | |
3630 | @@ -3283,11 +2940,11 @@ |
3631 | test -n "$AWK" && break |
3632 | done |
3633 | |
3634 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
3635 | +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
3636 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
3637 | set x ${MAKE-make} |
3638 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
3639 | -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : |
3640 | +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then |
3641 | $as_echo_n "(cached) " >&6 |
3642 | else |
3643 | cat >conftest.make <<\_ACEOF |
3644 | @@ -3305,11 +2962,11 @@ |
3645 | rm -f conftest.make |
3646 | fi |
3647 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then |
3648 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3649 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 |
3650 | $as_echo "yes" >&6; } |
3651 | SET_MAKE= |
3652 | else |
3653 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3654 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
3655 | $as_echo "no" >&6; } |
3656 | SET_MAKE="MAKE=${MAKE-make}" |
3657 | fi |
3658 | @@ -3329,7 +2986,9 @@ |
3659 | am__isrc=' -I$(srcdir)' |
3660 | # test to see if srcdir already configured |
3661 | if test -f $srcdir/config.status; then |
3662 | - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
3663 | + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 |
3664 | +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} |
3665 | + { (exit 1); exit 1; }; } |
3666 | fi |
3667 | fi |
3668 | |
3669 | @@ -3345,7 +3004,7 @@ |
3670 | |
3671 | # Define the identity of the package. |
3672 | PACKAGE='clamav' |
3673 | - VERSION='0.97.6' |
3674 | + VERSION='0.97.7' |
3675 | |
3676 | |
3677 | # Some tools Automake needs. |
3678 | @@ -3371,7 +3030,7 @@ |
3679 | AMTAR=${AMTAR-"${am_missing_run}tar"} |
3680 | |
3681 | |
3682 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 |
3683 | +{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5 |
3684 | $as_echo_n "checking how to create a ustar tar archive... " >&6; } |
3685 | # Loop over all known methods to create a tar archive until one works. |
3686 | _am_tools='gnutar plaintar pax cpio none' |
3687 | @@ -3444,13 +3103,13 @@ |
3688 | done |
3689 | rm -rf conftest.dir |
3690 | |
3691 | -if test "${am_cv_prog_tar_ustar+set}" = set; then : |
3692 | +if test "${am_cv_prog_tar_ustar+set}" = set; then |
3693 | $as_echo_n "(cached) " >&6 |
3694 | else |
3695 | am_cv_prog_tar_ustar=$_am_tool |
3696 | fi |
3697 | |
3698 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 |
3699 | +{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5 |
3700 | $as_echo "$am_cv_prog_tar_ustar" >&6; } |
3701 | |
3702 | |
3703 | @@ -3458,7 +3117,7 @@ |
3704 | |
3705 | |
3706 | # Check whether --enable-silent-rules was given. |
3707 | -if test "${enable_silent_rules+set}" = set; then : |
3708 | +if test "${enable_silent_rules+set}" = set; then |
3709 | enableval=$enable_silent_rules; |
3710 | fi |
3711 | |
3712 | @@ -3471,13 +3130,15 @@ |
3713 | |
3714 | |
3715 | |
3716 | -$as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h |
3717 | - |
3718 | - |
3719 | -VERSION="0.97.6" |
3720 | +cat >>confdefs.h <<\_ACEOF |
3721 | +#define PACKAGE PACKAGE_NAME |
3722 | +_ACEOF |
3723 | + |
3724 | + |
3725 | +VERSION="0.97.7" |
3726 | |
3727 | LC_CURRENT=7 |
3728 | -LC_REVISION=15 |
3729 | +LC_REVISION=16 |
3730 | LC_AGE=1 |
3731 | LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" |
3732 | |
3733 | @@ -3486,9 +3147,9 @@ |
3734 | do |
3735 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
3736 | set dummy $ac_prog; ac_word=$2 |
3737 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3738 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
3739 | $as_echo_n "checking for $ac_word... " >&6; } |
3740 | -if test "${ac_cv_prog_AWK+set}" = set; then : |
3741 | +if test "${ac_cv_prog_AWK+set}" = set; then |
3742 | $as_echo_n "(cached) " >&6 |
3743 | else |
3744 | if test -n "$AWK"; then |
3745 | @@ -3499,24 +3160,24 @@ |
3746 | do |
3747 | IFS=$as_save_IFS |
3748 | test -z "$as_dir" && as_dir=. |
3749 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3750 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3751 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3752 | ac_cv_prog_AWK="$ac_prog" |
3753 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3754 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3755 | break 2 |
3756 | fi |
3757 | done |
3758 | - done |
3759 | +done |
3760 | IFS=$as_save_IFS |
3761 | |
3762 | fi |
3763 | fi |
3764 | AWK=$ac_cv_prog_AWK |
3765 | if test -n "$AWK"; then |
3766 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 |
3767 | + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 |
3768 | $as_echo "$AWK" >&6; } |
3769 | else |
3770 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3771 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
3772 | $as_echo "no" >&6; } |
3773 | fi |
3774 | |
3775 | @@ -3524,23 +3185,115 @@ |
3776 | test -n "$AWK" && break |
3777 | done |
3778 | |
3779 | - |
3780 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 |
3781 | +# Find a good install program. We prefer a C program (faster), |
3782 | +# so one script is as good as another. But avoid the broken or |
3783 | +# incompatible versions: |
3784 | +# SysV /etc/install, /usr/sbin/install |
3785 | +# SunOS /usr/etc/install |
3786 | +# IRIX /sbin/install |
3787 | +# AIX /bin/install |
3788 | +# AmigaOS /C/install, which installs bootblocks on floppy discs |
3789 | +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag |
3790 | +# AFS /usr/afsws/bin/install, which mishandles nonexistent args |
3791 | +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" |
3792 | +# OS/2's system install, which has a completely different semantic |
3793 | +# ./install, which can be erroneously created by make from ./install.sh. |
3794 | +# Reject install programs that cannot install multiple files. |
3795 | +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 |
3796 | +$as_echo_n "checking for a BSD-compatible install... " >&6; } |
3797 | +if test -z "$INSTALL"; then |
3798 | +if test "${ac_cv_path_install+set}" = set; then |
3799 | + $as_echo_n "(cached) " >&6 |
3800 | +else |
3801 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3802 | +for as_dir in $PATH |
3803 | +do |
3804 | + IFS=$as_save_IFS |
3805 | + test -z "$as_dir" && as_dir=. |
3806 | + # Account for people who put trailing slashes in PATH elements. |
3807 | +case $as_dir/ in |
3808 | + ./ | .// | /cC/* | \ |
3809 | + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ |
3810 | + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ |
3811 | + /usr/ucb/* ) ;; |
3812 | + *) |
3813 | + # OSF1 and SCO ODT 3.0 have their own names for install. |
3814 | + # Don't use installbsd from OSF since it installs stuff as root |
3815 | + # by default. |
3816 | + for ac_prog in ginstall scoinst install; do |
3817 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3818 | + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then |
3819 | + if test $ac_prog = install && |
3820 | + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
3821 | + # AIX install. It has an incompatible calling convention. |
3822 | + : |
3823 | + elif test $ac_prog = install && |
3824 | + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
3825 | + # program-specific install script used by HP pwplus--don't use. |
3826 | + : |
3827 | + else |
3828 | + rm -rf conftest.one conftest.two conftest.dir |
3829 | + echo one > conftest.one |
3830 | + echo two > conftest.two |
3831 | + mkdir conftest.dir |
3832 | + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && |
3833 | + test -s conftest.one && test -s conftest.two && |
3834 | + test -s conftest.dir/conftest.one && |
3835 | + test -s conftest.dir/conftest.two |
3836 | + then |
3837 | + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" |
3838 | + break 3 |
3839 | + fi |
3840 | + fi |
3841 | + fi |
3842 | + done |
3843 | + done |
3844 | + ;; |
3845 | +esac |
3846 | + |
3847 | +done |
3848 | +IFS=$as_save_IFS |
3849 | + |
3850 | +rm -rf conftest.one conftest.two conftest.dir |
3851 | + |
3852 | +fi |
3853 | + if test "${ac_cv_path_install+set}" = set; then |
3854 | + INSTALL=$ac_cv_path_install |
3855 | + else |
3856 | + # As a last resort, use the slow shell script. Don't cache a |
3857 | + # value for INSTALL within a source directory, because that will |
3858 | + # break other packages using the cache if that directory is |
3859 | + # removed, or if the value is a relative name. |
3860 | + INSTALL=$ac_install_sh |
3861 | + fi |
3862 | +fi |
3863 | +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 |
3864 | +$as_echo "$INSTALL" >&6; } |
3865 | + |
3866 | +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. |
3867 | +# It thinks the first close brace ends the variable substitution. |
3868 | +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' |
3869 | + |
3870 | +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' |
3871 | + |
3872 | +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
3873 | + |
3874 | +{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 |
3875 | $as_echo_n "checking whether ln -s works... " >&6; } |
3876 | LN_S=$as_ln_s |
3877 | if test "$LN_S" = "ln -s"; then |
3878 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3879 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 |
3880 | $as_echo "yes" >&6; } |
3881 | else |
3882 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 |
3883 | + { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 |
3884 | $as_echo "no, using $LN_S" >&6; } |
3885 | fi |
3886 | |
3887 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
3888 | +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
3889 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
3890 | set x ${MAKE-make} |
3891 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
3892 | -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : |
3893 | +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then |
3894 | $as_echo_n "(cached) " >&6 |
3895 | else |
3896 | cat >conftest.make <<\_ACEOF |
3897 | @@ -3558,11 +3311,11 @@ |
3898 | rm -f conftest.make |
3899 | fi |
3900 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then |
3901 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3902 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 |
3903 | $as_echo "yes" >&6; } |
3904 | SET_MAKE= |
3905 | else |
3906 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3907 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
3908 | $as_echo "no" >&6; } |
3909 | SET_MAKE="MAKE=${MAKE-make}" |
3910 | fi |
3911 | @@ -3578,7 +3331,7 @@ |
3912 | |
3913 | case `pwd` in |
3914 | *\ * | *\ *) |
3915 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 |
3916 | + { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 |
3917 | $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; |
3918 | esac |
3919 | |
3920 | @@ -3613,7 +3366,7 @@ |
3921 | .PHONY: am__doit |
3922 | END |
3923 | # If we don't find an include directive, just comment out the code. |
3924 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 |
3925 | +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 |
3926 | $as_echo_n "checking for style of include used by $am_make... " >&6; } |
3927 | am__include="#" |
3928 | am__quote= |
3929 | @@ -3641,12 +3394,12 @@ |
3930 | fi |
3931 | |
3932 | |
3933 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 |
3934 | +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 |
3935 | $as_echo "$_am_result" >&6; } |
3936 | rm -f confinc confmf |
3937 | |
3938 | # Check whether --enable-dependency-tracking was given. |
3939 | -if test "${enable_dependency_tracking+set}" = set; then : |
3940 | +if test "${enable_dependency_tracking+set}" = set; then |
3941 | enableval=$enable_dependency_tracking; |
3942 | fi |
3943 | |
3944 | @@ -3671,9 +3424,9 @@ |
3945 | if test -n "$ac_tool_prefix"; then |
3946 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
3947 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
3948 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3949 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
3950 | $as_echo_n "checking for $ac_word... " >&6; } |
3951 | -if test "${ac_cv_prog_CC+set}" = set; then : |
3952 | +if test "${ac_cv_prog_CC+set}" = set; then |
3953 | $as_echo_n "(cached) " >&6 |
3954 | else |
3955 | if test -n "$CC"; then |
3956 | @@ -3684,24 +3437,24 @@ |
3957 | do |
3958 | IFS=$as_save_IFS |
3959 | test -z "$as_dir" && as_dir=. |
3960 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3961 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3962 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3963 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
3964 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3965 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3966 | break 2 |
3967 | fi |
3968 | done |
3969 | - done |
3970 | +done |
3971 | IFS=$as_save_IFS |
3972 | |
3973 | fi |
3974 | fi |
3975 | CC=$ac_cv_prog_CC |
3976 | if test -n "$CC"; then |
3977 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
3978 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 |
3979 | $as_echo "$CC" >&6; } |
3980 | else |
3981 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3982 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
3983 | $as_echo "no" >&6; } |
3984 | fi |
3985 | |
3986 | @@ -3711,9 +3464,9 @@ |
3987 | ac_ct_CC=$CC |
3988 | # Extract the first word of "gcc", so it can be a program name with args. |
3989 | set dummy gcc; ac_word=$2 |
3990 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3991 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
3992 | $as_echo_n "checking for $ac_word... " >&6; } |
3993 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
3994 | +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
3995 | $as_echo_n "(cached) " >&6 |
3996 | else |
3997 | if test -n "$ac_ct_CC"; then |
3998 | @@ -3724,24 +3477,24 @@ |
3999 | do |
4000 | IFS=$as_save_IFS |
4001 | test -z "$as_dir" && as_dir=. |
4002 | - for ac_exec_ext in '' $ac_executable_extensions; do |
4003 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4004 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4005 | ac_cv_prog_ac_ct_CC="gcc" |
4006 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4007 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4008 | break 2 |
4009 | fi |
4010 | done |
4011 | - done |
4012 | +done |
4013 | IFS=$as_save_IFS |
4014 | |
4015 | fi |
4016 | fi |
4017 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
4018 | if test -n "$ac_ct_CC"; then |
4019 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
4020 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
4021 | $as_echo "$ac_ct_CC" >&6; } |
4022 | else |
4023 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4024 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
4025 | $as_echo "no" >&6; } |
4026 | fi |
4027 | |
4028 | @@ -3750,7 +3503,7 @@ |
4029 | else |
4030 | case $cross_compiling:$ac_tool_warned in |
4031 | yes:) |
4032 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
4033 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
4034 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
4035 | ac_tool_warned=yes ;; |
4036 | esac |
4037 | @@ -3764,9 +3517,9 @@ |
4038 | if test -n "$ac_tool_prefix"; then |
4039 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
4040 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
4041 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4042 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4043 | $as_echo_n "checking for $ac_word... " >&6; } |
4044 | -if test "${ac_cv_prog_CC+set}" = set; then : |
4045 | +if test "${ac_cv_prog_CC+set}" = set; then |
4046 | $as_echo_n "(cached) " >&6 |
4047 | else |
4048 | if test -n "$CC"; then |
4049 | @@ -3777,24 +3530,24 @@ |
4050 | do |
4051 | IFS=$as_save_IFS |
4052 | test -z "$as_dir" && as_dir=. |
4053 | - for ac_exec_ext in '' $ac_executable_extensions; do |
4054 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4055 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4056 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
4057 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4058 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4059 | break 2 |
4060 | fi |
4061 | done |
4062 | - done |
4063 | +done |
4064 | IFS=$as_save_IFS |
4065 | |
4066 | fi |
4067 | fi |
4068 | CC=$ac_cv_prog_CC |
4069 | if test -n "$CC"; then |
4070 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
4071 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 |
4072 | $as_echo "$CC" >&6; } |
4073 | else |
4074 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4075 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
4076 | $as_echo "no" >&6; } |
4077 | fi |
4078 | |
4079 | @@ -3804,9 +3557,9 @@ |
4080 | if test -z "$CC"; then |
4081 | # Extract the first word of "cc", so it can be a program name with args. |
4082 | set dummy cc; ac_word=$2 |
4083 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4084 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4085 | $as_echo_n "checking for $ac_word... " >&6; } |
4086 | -if test "${ac_cv_prog_CC+set}" = set; then : |
4087 | +if test "${ac_cv_prog_CC+set}" = set; then |
4088 | $as_echo_n "(cached) " >&6 |
4089 | else |
4090 | if test -n "$CC"; then |
4091 | @@ -3818,18 +3571,18 @@ |
4092 | do |
4093 | IFS=$as_save_IFS |
4094 | test -z "$as_dir" && as_dir=. |
4095 | - for ac_exec_ext in '' $ac_executable_extensions; do |
4096 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4097 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4098 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
4099 | ac_prog_rejected=yes |
4100 | continue |
4101 | fi |
4102 | ac_cv_prog_CC="cc" |
4103 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4104 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4105 | break 2 |
4106 | fi |
4107 | done |
4108 | - done |
4109 | +done |
4110 | IFS=$as_save_IFS |
4111 | |
4112 | if test $ac_prog_rejected = yes; then |
4113 | @@ -3848,10 +3601,10 @@ |
4114 | fi |
4115 | CC=$ac_cv_prog_CC |
4116 | if test -n "$CC"; then |
4117 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
4118 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 |
4119 | $as_echo "$CC" >&6; } |
4120 | else |
4121 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4122 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
4123 | $as_echo "no" >&6; } |
4124 | fi |
4125 | |
4126 | @@ -3863,9 +3616,9 @@ |
4127 | do |
4128 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
4129 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
4130 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4131 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4132 | $as_echo_n "checking for $ac_word... " >&6; } |
4133 | -if test "${ac_cv_prog_CC+set}" = set; then : |
4134 | +if test "${ac_cv_prog_CC+set}" = set; then |
4135 | $as_echo_n "(cached) " >&6 |
4136 | else |
4137 | if test -n "$CC"; then |
4138 | @@ -3876,24 +3629,24 @@ |
4139 | do |
4140 | IFS=$as_save_IFS |
4141 | test -z "$as_dir" && as_dir=. |
4142 | - for ac_exec_ext in '' $ac_executable_extensions; do |
4143 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4144 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4145 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
4146 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4147 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4148 | break 2 |
4149 | fi |
4150 | done |
4151 | - done |
4152 | +done |
4153 | IFS=$as_save_IFS |
4154 | |
4155 | fi |
4156 | fi |
4157 | CC=$ac_cv_prog_CC |
4158 | if test -n "$CC"; then |
4159 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
4160 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 |
4161 | $as_echo "$CC" >&6; } |
4162 | else |
4163 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4164 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
4165 | $as_echo "no" >&6; } |
4166 | fi |
4167 | |
4168 | @@ -3907,9 +3660,9 @@ |
4169 | do |
4170 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
4171 | set dummy $ac_prog; ac_word=$2 |
4172 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4173 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
4174 | $as_echo_n "checking for $ac_word... " >&6; } |
4175 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
4176 | +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
4177 | $as_echo_n "(cached) " >&6 |
4178 | else |
4179 | if test -n "$ac_ct_CC"; then |
4180 | @@ -3920,24 +3673,24 @@ |
4181 | do |
4182 | IFS=$as_save_IFS |
4183 | test -z "$as_dir" && as_dir=. |
4184 | - for ac_exec_ext in '' $ac_executable_extensions; do |
4185 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4186 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
4187 | ac_cv_prog_ac_ct_CC="$ac_prog" |
4188 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4189 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4190 | break 2 |
4191 | fi |
4192 | done |
4193 | - done |
4194 | +done |
4195 | IFS=$as_save_IFS |
4196 | |
4197 | fi |
4198 | fi |
4199 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
4200 | if test -n "$ac_ct_CC"; then |
4201 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
4202 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
4203 | $as_echo "$ac_ct_CC" >&6; } |
4204 | else |
4205 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4206 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
4207 | $as_echo "no" >&6; } |
4208 | fi |
4209 | |
4210 | @@ -3950,7 +3703,7 @@ |
4211 | else |
4212 | case $cross_compiling:$ac_tool_warned in |
4213 | yes:) |
4214 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
4215 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
4216 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
4217 | ac_tool_warned=yes ;; |
4218 | esac |
4219 | @@ -3961,37 +3714,57 @@ |
4220 | fi |
4221 | |
4222 | |
4223 | -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4224 | +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
4225 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4226 | -as_fn_error "no acceptable C compiler found in \$PATH |
4227 | -See \`config.log' for more details." "$LINENO" 5; } |
4228 | +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH |
4229 | +See \`config.log' for more details." >&5 |
4230 | +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH |
4231 | +See \`config.log' for more details." >&2;} |
4232 | + { (exit 1); exit 1; }; }; } |
4233 | |
4234 | # Provide some information about the compiler. |
4235 | -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
4236 | +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 |
4237 | set X $ac_compile |
4238 | ac_compiler=$2 |
4239 | -for ac_option in --version -v -V -qversion; do |
4240 | - { { ac_try="$ac_compiler $ac_option >&5" |
4241 | -case "(($ac_try" in |
4242 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4243 | - *) ac_try_echo=$ac_try;; |
4244 | -esac |
4245 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4246 | -$as_echo "$ac_try_echo"; } >&5 |
4247 | - (eval "$ac_compiler $ac_option >&5") 2>conftest.err |
4248 | - ac_status=$? |
4249 | - if test -s conftest.err; then |
4250 | - sed '10a\ |
4251 | -... rest of stderr output deleted ... |
4252 | - 10q' conftest.err >conftest.er1 |
4253 | - cat conftest.er1 >&5 |
4254 | - fi |
4255 | - rm -f conftest.er1 conftest.err |
4256 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4257 | - test $ac_status = 0; } |
4258 | -done |
4259 | +{ (ac_try="$ac_compiler --version >&5" |
4260 | +case "(($ac_try" in |
4261 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4262 | + *) ac_try_echo=$ac_try;; |
4263 | +esac |
4264 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4265 | +$as_echo "$ac_try_echo") >&5 |
4266 | + (eval "$ac_compiler --version >&5") 2>&5 |
4267 | + ac_status=$? |
4268 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4269 | + (exit $ac_status); } |
4270 | +{ (ac_try="$ac_compiler -v >&5" |
4271 | +case "(($ac_try" in |
4272 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4273 | + *) ac_try_echo=$ac_try;; |
4274 | +esac |
4275 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4276 | +$as_echo "$ac_try_echo") >&5 |
4277 | + (eval "$ac_compiler -v >&5") 2>&5 |
4278 | + ac_status=$? |
4279 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4280 | + (exit $ac_status); } |
4281 | +{ (ac_try="$ac_compiler -V >&5" |
4282 | +case "(($ac_try" in |
4283 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4284 | + *) ac_try_echo=$ac_try;; |
4285 | +esac |
4286 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4287 | +$as_echo "$ac_try_echo") >&5 |
4288 | + (eval "$ac_compiler -V >&5") 2>&5 |
4289 | + ac_status=$? |
4290 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4291 | + (exit $ac_status); } |
4292 | |
4293 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4294 | +cat >conftest.$ac_ext <<_ACEOF |
4295 | +/* confdefs.h. */ |
4296 | +_ACEOF |
4297 | +cat confdefs.h >>conftest.$ac_ext |
4298 | +cat >>conftest.$ac_ext <<_ACEOF |
4299 | /* end confdefs.h. */ |
4300 | |
4301 | int |
4302 | @@ -4007,8 +3780,8 @@ |
4303 | # Try to create an executable without -o first, disregard a.out. |
4304 | # It will help us diagnose broken compilers, and finding out an intuition |
4305 | # of exeext. |
4306 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
4307 | -$as_echo_n "checking whether the C compiler works... " >&6; } |
4308 | +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 |
4309 | +$as_echo_n "checking for C compiler default output file name... " >&6; } |
4310 | ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
4311 | |
4312 | # The possible output files: |
4313 | @@ -4024,17 +3797,17 @@ |
4314 | done |
4315 | rm -f $ac_rmfiles |
4316 | |
4317 | -if { { ac_try="$ac_link_default" |
4318 | +if { (ac_try="$ac_link_default" |
4319 | case "(($ac_try" in |
4320 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4321 | *) ac_try_echo=$ac_try;; |
4322 | esac |
4323 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4324 | -$as_echo "$ac_try_echo"; } >&5 |
4325 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4326 | +$as_echo "$ac_try_echo") >&5 |
4327 | (eval "$ac_link_default") 2>&5 |
4328 | ac_status=$? |
4329 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4330 | - test $ac_status = 0; }; then : |
4331 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4332 | + (exit $ac_status); }; then |
4333 | # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. |
4334 | # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' |
4335 | # in a Makefile. We should not override ac_cv_exeext if it was cached, |
4336 | @@ -4051,7 +3824,7 @@ |
4337 | # certainly right. |
4338 | break;; |
4339 | *.* ) |
4340 | - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; |
4341 | + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; |
4342 | then :; else |
4343 | ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
4344 | fi |
4345 | @@ -4070,42 +3843,84 @@ |
4346 | else |
4347 | ac_file='' |
4348 | fi |
4349 | -if test -z "$ac_file"; then : |
4350 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4351 | -$as_echo "no" >&6; } |
4352 | -$as_echo "$as_me: failed program was:" >&5 |
4353 | -sed 's/^/| /' conftest.$ac_ext >&5 |
4354 | |
4355 | -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4356 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4357 | -{ as_fn_set_status 77 |
4358 | -as_fn_error "C compiler cannot create executables |
4359 | -See \`config.log' for more details." "$LINENO" 5; }; } |
4360 | -else |
4361 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
4362 | -$as_echo "yes" >&6; } |
4363 | -fi |
4364 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
4365 | -$as_echo_n "checking for C compiler default output file name... " >&6; } |
4366 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 |
4367 | +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 |
4368 | $as_echo "$ac_file" >&6; } |
4369 | +if test -z "$ac_file"; then |
4370 | + $as_echo "$as_me: failed program was:" >&5 |
4371 | +sed 's/^/| /' conftest.$ac_ext >&5 |
4372 | + |
4373 | +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
4374 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4375 | +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables |
4376 | +See \`config.log' for more details." >&5 |
4377 | +$as_echo "$as_me: error: C compiler cannot create executables |
4378 | +See \`config.log' for more details." >&2;} |
4379 | + { (exit 77); exit 77; }; }; } |
4380 | +fi |
4381 | + |
4382 | ac_exeext=$ac_cv_exeext |
4383 | |
4384 | +# Check that the compiler produces executables we can run. If not, either |
4385 | +# the compiler is broken, or we cross compile. |
4386 | +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 |
4387 | +$as_echo_n "checking whether the C compiler works... " >&6; } |
4388 | +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 |
4389 | +# If not cross compiling, check that we can run a simple program. |
4390 | +if test "$cross_compiling" != yes; then |
4391 | + if { ac_try='./$ac_file' |
4392 | + { (case "(($ac_try" in |
4393 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4394 | + *) ac_try_echo=$ac_try;; |
4395 | +esac |
4396 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4397 | +$as_echo "$ac_try_echo") >&5 |
4398 | + (eval "$ac_try") 2>&5 |
4399 | + ac_status=$? |
4400 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4401 | + (exit $ac_status); }; }; then |
4402 | + cross_compiling=no |
4403 | + else |
4404 | + if test "$cross_compiling" = maybe; then |
4405 | + cross_compiling=yes |
4406 | + else |
4407 | + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
4408 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4409 | +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. |
4410 | +If you meant to cross compile, use \`--host'. |
4411 | +See \`config.log' for more details." >&5 |
4412 | +$as_echo "$as_me: error: cannot run C compiled programs. |
4413 | +If you meant to cross compile, use \`--host'. |
4414 | +See \`config.log' for more details." >&2;} |
4415 | + { (exit 1); exit 1; }; }; } |
4416 | + fi |
4417 | + fi |
4418 | +fi |
4419 | +{ $as_echo "$as_me:$LINENO: result: yes" >&5 |
4420 | +$as_echo "yes" >&6; } |
4421 | + |
4422 | rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out |
4423 | ac_clean_files=$ac_clean_files_save |
4424 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 |
4425 | +# Check that the compiler produces executables we can run. If not, either |
4426 | +# the compiler is broken, or we cross compile. |
4427 | +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 |
4428 | +$as_echo_n "checking whether we are cross compiling... " >&6; } |
4429 | +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 |
4430 | +$as_echo "$cross_compiling" >&6; } |
4431 | + |
4432 | +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 |
4433 | $as_echo_n "checking for suffix of executables... " >&6; } |
4434 | -if { { ac_try="$ac_link" |
4435 | +if { (ac_try="$ac_link" |
4436 | case "(($ac_try" in |
4437 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4438 | *) ac_try_echo=$ac_try;; |
4439 | esac |
4440 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4441 | -$as_echo "$ac_try_echo"; } >&5 |
4442 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4443 | +$as_echo "$ac_try_echo") >&5 |
4444 | (eval "$ac_link") 2>&5 |
4445 | ac_status=$? |
4446 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4447 | - test $ac_status = 0; }; then : |
4448 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4449 | + (exit $ac_status); }; then |
4450 | # If both `conftest.exe' and `conftest' are `present' (well, observable) |
4451 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will |
4452 | # work properly (i.e., refer to `conftest.exe'), while it won't with |
4453 | @@ -4120,83 +3935,32 @@ |
4454 | esac |
4455 | done |
4456 | else |
4457 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4458 | + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
4459 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4460 | -as_fn_error "cannot compute suffix of executables: cannot compile and link |
4461 | -See \`config.log' for more details." "$LINENO" 5; } |
4462 | +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link |
4463 | +See \`config.log' for more details." >&5 |
4464 | +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link |
4465 | +See \`config.log' for more details." >&2;} |
4466 | + { (exit 1); exit 1; }; }; } |
4467 | fi |
4468 | -rm -f conftest conftest$ac_cv_exeext |
4469 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
4470 | + |
4471 | +rm -f conftest$ac_cv_exeext |
4472 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 |
4473 | $as_echo "$ac_cv_exeext" >&6; } |
4474 | |
4475 | rm -f conftest.$ac_ext |
4476 | EXEEXT=$ac_cv_exeext |
4477 | ac_exeext=$EXEEXT |
4478 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4479 | -/* end confdefs.h. */ |
4480 | -#include <stdio.h> |
4481 | -int |
4482 | -main () |
4483 | -{ |
4484 | -FILE *f = fopen ("conftest.out", "w"); |
4485 | - return ferror (f) || fclose (f) != 0; |
4486 | - |
4487 | - ; |
4488 | - return 0; |
4489 | -} |
4490 | -_ACEOF |
4491 | -ac_clean_files="$ac_clean_files conftest.out" |
4492 | -# Check that the compiler produces executables we can run. If not, either |
4493 | -# the compiler is broken, or we cross compile. |
4494 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
4495 | -$as_echo_n "checking whether we are cross compiling... " >&6; } |
4496 | -if test "$cross_compiling" != yes; then |
4497 | - { { ac_try="$ac_link" |
4498 | -case "(($ac_try" in |
4499 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4500 | - *) ac_try_echo=$ac_try;; |
4501 | -esac |
4502 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4503 | -$as_echo "$ac_try_echo"; } >&5 |
4504 | - (eval "$ac_link") 2>&5 |
4505 | - ac_status=$? |
4506 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4507 | - test $ac_status = 0; } |
4508 | - if { ac_try='./conftest$ac_cv_exeext' |
4509 | - { { case "(($ac_try" in |
4510 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4511 | - *) ac_try_echo=$ac_try;; |
4512 | -esac |
4513 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4514 | -$as_echo "$ac_try_echo"; } >&5 |
4515 | - (eval "$ac_try") 2>&5 |
4516 | - ac_status=$? |
4517 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4518 | - test $ac_status = 0; }; }; then |
4519 | - cross_compiling=no |
4520 | - else |
4521 | - if test "$cross_compiling" = maybe; then |
4522 | - cross_compiling=yes |
4523 | - else |
4524 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4525 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4526 | -as_fn_error "cannot run C compiled programs. |
4527 | -If you meant to cross compile, use \`--host'. |
4528 | -See \`config.log' for more details." "$LINENO" 5; } |
4529 | - fi |
4530 | - fi |
4531 | -fi |
4532 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
4533 | -$as_echo "$cross_compiling" >&6; } |
4534 | - |
4535 | -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out |
4536 | -ac_clean_files=$ac_clean_files_save |
4537 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
4538 | +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 |
4539 | $as_echo_n "checking for suffix of object files... " >&6; } |
4540 | -if test "${ac_cv_objext+set}" = set; then : |
4541 | +if test "${ac_cv_objext+set}" = set; then |
4542 | $as_echo_n "(cached) " >&6 |
4543 | else |
4544 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4545 | + cat >conftest.$ac_ext <<_ACEOF |
4546 | +/* confdefs.h. */ |
4547 | +_ACEOF |
4548 | +cat confdefs.h >>conftest.$ac_ext |
4549 | +cat >>conftest.$ac_ext <<_ACEOF |
4550 | /* end confdefs.h. */ |
4551 | |
4552 | int |
4553 | @@ -4208,17 +3972,17 @@ |
4554 | } |
4555 | _ACEOF |
4556 | rm -f conftest.o conftest.obj |
4557 | -if { { ac_try="$ac_compile" |
4558 | +if { (ac_try="$ac_compile" |
4559 | case "(($ac_try" in |
4560 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4561 | *) ac_try_echo=$ac_try;; |
4562 | esac |
4563 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
4564 | -$as_echo "$ac_try_echo"; } >&5 |
4565 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4566 | +$as_echo "$ac_try_echo") >&5 |
4567 | (eval "$ac_compile") 2>&5 |
4568 | ac_status=$? |
4569 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4570 | - test $ac_status = 0; }; then : |
4571 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4572 | + (exit $ac_status); }; then |
4573 | for ac_file in conftest.o conftest.obj conftest.*; do |
4574 | test -f "$ac_file" || continue; |
4575 | case $ac_file in |
4576 | @@ -4231,23 +3995,31 @@ |
4577 | $as_echo "$as_me: failed program was:" >&5 |
4578 | sed 's/^/| /' conftest.$ac_ext >&5 |
4579 | |
4580 | -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4581 | +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
4582 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4583 | -as_fn_error "cannot compute suffix of object files: cannot compile |
4584 | -See \`config.log' for more details." "$LINENO" 5; } |
4585 | +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile |
4586 | +See \`config.log' for more details." >&5 |
4587 | +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile |
4588 | +See \`config.log' for more details." >&2;} |
4589 | + { (exit 1); exit 1; }; }; } |
4590 | fi |
4591 | + |
4592 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
4593 | fi |
4594 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 |
4595 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 |
4596 | $as_echo "$ac_cv_objext" >&6; } |
4597 | OBJEXT=$ac_cv_objext |
4598 | ac_objext=$OBJEXT |
4599 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
4600 | +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 |
4601 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
4602 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
4603 | +if test "${ac_cv_c_compiler_gnu+set}" = set; then |
4604 | $as_echo_n "(cached) " >&6 |
4605 | else |
4606 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4607 | + cat >conftest.$ac_ext <<_ACEOF |
4608 | +/* confdefs.h. */ |
4609 | +_ACEOF |
4610 | +cat confdefs.h >>conftest.$ac_ext |
4611 | +cat >>conftest.$ac_ext <<_ACEOF |
4612 | /* end confdefs.h. */ |
4613 | |
4614 | int |
4615 | @@ -4261,16 +4033,37 @@ |
4616 | return 0; |
4617 | } |
4618 | _ACEOF |
4619 | -if ac_fn_c_try_compile "$LINENO"; then : |
4620 | +rm -f conftest.$ac_objext |
4621 | +if { (ac_try="$ac_compile" |
4622 | +case "(($ac_try" in |
4623 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4624 | + *) ac_try_echo=$ac_try;; |
4625 | +esac |
4626 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4627 | +$as_echo "$ac_try_echo") >&5 |
4628 | + (eval "$ac_compile") 2>conftest.er1 |
4629 | + ac_status=$? |
4630 | + grep -v '^ *+' conftest.er1 >conftest.err |
4631 | + rm -f conftest.er1 |
4632 | + cat conftest.err >&5 |
4633 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4634 | + (exit $ac_status); } && { |
4635 | + test -z "$ac_c_werror_flag" || |
4636 | + test ! -s conftest.err |
4637 | + } && test -s conftest.$ac_objext; then |
4638 | ac_compiler_gnu=yes |
4639 | else |
4640 | - ac_compiler_gnu=no |
4641 | + $as_echo "$as_me: failed program was:" >&5 |
4642 | +sed 's/^/| /' conftest.$ac_ext >&5 |
4643 | + |
4644 | + ac_compiler_gnu=no |
4645 | fi |
4646 | + |
4647 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4648 | ac_cv_c_compiler_gnu=$ac_compiler_gnu |
4649 | |
4650 | fi |
4651 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 |
4652 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 |
4653 | $as_echo "$ac_cv_c_compiler_gnu" >&6; } |
4654 | if test $ac_compiler_gnu = yes; then |
4655 | GCC=yes |
4656 | @@ -4279,16 +4072,20 @@ |
4657 | fi |
4658 | ac_test_CFLAGS=${CFLAGS+set} |
4659 | ac_save_CFLAGS=$CFLAGS |
4660 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
4661 | +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 |
4662 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
4663 | -if test "${ac_cv_prog_cc_g+set}" = set; then : |
4664 | +if test "${ac_cv_prog_cc_g+set}" = set; then |
4665 | $as_echo_n "(cached) " >&6 |
4666 | else |
4667 | ac_save_c_werror_flag=$ac_c_werror_flag |
4668 | ac_c_werror_flag=yes |
4669 | ac_cv_prog_cc_g=no |
4670 | CFLAGS="-g" |
4671 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4672 | + cat >conftest.$ac_ext <<_ACEOF |
4673 | +/* confdefs.h. */ |
4674 | +_ACEOF |
4675 | +cat confdefs.h >>conftest.$ac_ext |
4676 | +cat >>conftest.$ac_ext <<_ACEOF |
4677 | /* end confdefs.h. */ |
4678 | |
4679 | int |
4680 | @@ -4299,11 +4096,35 @@ |
4681 | return 0; |
4682 | } |
4683 | _ACEOF |
4684 | -if ac_fn_c_try_compile "$LINENO"; then : |
4685 | +rm -f conftest.$ac_objext |
4686 | +if { (ac_try="$ac_compile" |
4687 | +case "(($ac_try" in |
4688 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4689 | + *) ac_try_echo=$ac_try;; |
4690 | +esac |
4691 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4692 | +$as_echo "$ac_try_echo") >&5 |
4693 | + (eval "$ac_compile") 2>conftest.er1 |
4694 | + ac_status=$? |
4695 | + grep -v '^ *+' conftest.er1 >conftest.err |
4696 | + rm -f conftest.er1 |
4697 | + cat conftest.err >&5 |
4698 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4699 | + (exit $ac_status); } && { |
4700 | + test -z "$ac_c_werror_flag" || |
4701 | + test ! -s conftest.err |
4702 | + } && test -s conftest.$ac_objext; then |
4703 | ac_cv_prog_cc_g=yes |
4704 | else |
4705 | - CFLAGS="" |
4706 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4707 | + $as_echo "$as_me: failed program was:" >&5 |
4708 | +sed 's/^/| /' conftest.$ac_ext >&5 |
4709 | + |
4710 | + CFLAGS="" |
4711 | + cat >conftest.$ac_ext <<_ACEOF |
4712 | +/* confdefs.h. */ |
4713 | +_ACEOF |
4714 | +cat confdefs.h >>conftest.$ac_ext |
4715 | +cat >>conftest.$ac_ext <<_ACEOF |
4716 | /* end confdefs.h. */ |
4717 | |
4718 | int |
4719 | @@ -4314,12 +4135,36 @@ |
4720 | return 0; |
4721 | } |
4722 | _ACEOF |
4723 | -if ac_fn_c_try_compile "$LINENO"; then : |
4724 | +rm -f conftest.$ac_objext |
4725 | +if { (ac_try="$ac_compile" |
4726 | +case "(($ac_try" in |
4727 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4728 | + *) ac_try_echo=$ac_try;; |
4729 | +esac |
4730 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4731 | +$as_echo "$ac_try_echo") >&5 |
4732 | + (eval "$ac_compile") 2>conftest.er1 |
4733 | + ac_status=$? |
4734 | + grep -v '^ *+' conftest.er1 >conftest.err |
4735 | + rm -f conftest.er1 |
4736 | + cat conftest.err >&5 |
4737 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4738 | + (exit $ac_status); } && { |
4739 | + test -z "$ac_c_werror_flag" || |
4740 | + test ! -s conftest.err |
4741 | + } && test -s conftest.$ac_objext; then |
4742 | + : |
4743 | +else |
4744 | + $as_echo "$as_me: failed program was:" >&5 |
4745 | +sed 's/^/| /' conftest.$ac_ext >&5 |
4746 | |
4747 | -else |
4748 | - ac_c_werror_flag=$ac_save_c_werror_flag |
4749 | + ac_c_werror_flag=$ac_save_c_werror_flag |
4750 | CFLAGS="-g" |
4751 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4752 | + cat >conftest.$ac_ext <<_ACEOF |
4753 | +/* confdefs.h. */ |
4754 | +_ACEOF |
4755 | +cat confdefs.h >>conftest.$ac_ext |
4756 | +cat >>conftest.$ac_ext <<_ACEOF |
4757 | /* end confdefs.h. */ |
4758 | |
4759 | int |
4760 | @@ -4330,17 +4175,42 @@ |
4761 | return 0; |
4762 | } |
4763 | _ACEOF |
4764 | -if ac_fn_c_try_compile "$LINENO"; then : |
4765 | +rm -f conftest.$ac_objext |
4766 | +if { (ac_try="$ac_compile" |
4767 | +case "(($ac_try" in |
4768 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4769 | + *) ac_try_echo=$ac_try;; |
4770 | +esac |
4771 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4772 | +$as_echo "$ac_try_echo") >&5 |
4773 | + (eval "$ac_compile") 2>conftest.er1 |
4774 | + ac_status=$? |
4775 | + grep -v '^ *+' conftest.er1 >conftest.err |
4776 | + rm -f conftest.er1 |
4777 | + cat conftest.err >&5 |
4778 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4779 | + (exit $ac_status); } && { |
4780 | + test -z "$ac_c_werror_flag" || |
4781 | + test ! -s conftest.err |
4782 | + } && test -s conftest.$ac_objext; then |
4783 | ac_cv_prog_cc_g=yes |
4784 | -fi |
4785 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4786 | -fi |
4787 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4788 | -fi |
4789 | +else |
4790 | + $as_echo "$as_me: failed program was:" >&5 |
4791 | +sed 's/^/| /' conftest.$ac_ext >&5 |
4792 | + |
4793 | + |
4794 | +fi |
4795 | + |
4796 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4797 | +fi |
4798 | + |
4799 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4800 | +fi |
4801 | + |
4802 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
4803 | ac_c_werror_flag=$ac_save_c_werror_flag |
4804 | fi |
4805 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 |
4806 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 |
4807 | $as_echo "$ac_cv_prog_cc_g" >&6; } |
4808 | if test "$ac_test_CFLAGS" = set; then |
4809 | CFLAGS=$ac_save_CFLAGS |
4810 | @@ -4357,14 +4227,18 @@ |
4811 | CFLAGS= |
4812 | fi |
4813 | fi |
4814 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
4815 | +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 |
4816 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
4817 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : |
4818 | +if test "${ac_cv_prog_cc_c89+set}" = set; then |
4819 | $as_echo_n "(cached) " >&6 |
4820 | else |
4821 | ac_cv_prog_cc_c89=no |
4822 | ac_save_CC=$CC |
4823 | -cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4824 | +cat >conftest.$ac_ext <<_ACEOF |
4825 | +/* confdefs.h. */ |
4826 | +_ACEOF |
4827 | +cat confdefs.h >>conftest.$ac_ext |
4828 | +cat >>conftest.$ac_ext <<_ACEOF |
4829 | /* end confdefs.h. */ |
4830 | #include <stdarg.h> |
4831 | #include <stdio.h> |
4832 | @@ -4421,9 +4295,32 @@ |
4833 | -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" |
4834 | do |
4835 | CC="$ac_save_CC $ac_arg" |
4836 | - if ac_fn_c_try_compile "$LINENO"; then : |
4837 | + rm -f conftest.$ac_objext |
4838 | +if { (ac_try="$ac_compile" |
4839 | +case "(($ac_try" in |
4840 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
4841 | + *) ac_try_echo=$ac_try;; |
4842 | +esac |
4843 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
4844 | +$as_echo "$ac_try_echo") >&5 |
4845 | + (eval "$ac_compile") 2>conftest.er1 |
4846 | + ac_status=$? |
4847 | + grep -v '^ *+' conftest.er1 >conftest.err |
4848 | + rm -f conftest.er1 |
4849 | + cat conftest.err >&5 |
4850 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4851 | + (exit $ac_status); } && { |
4852 | + test -z "$ac_c_werror_flag" || |
4853 | + test ! -s conftest.err |
4854 | + } && test -s conftest.$ac_objext; then |
4855 | ac_cv_prog_cc_c89=$ac_arg |
4856 | +else |
4857 | + $as_echo "$as_me: failed program was:" >&5 |
4858 | +sed 's/^/| /' conftest.$ac_ext >&5 |
4859 | + |
4860 | + |
4861 | fi |
4862 | + |
4863 | rm -f core conftest.err conftest.$ac_objext |
4864 | test "x$ac_cv_prog_cc_c89" != "xno" && break |
4865 | done |
4866 | @@ -4434,19 +4331,17 @@ |
4867 | # AC_CACHE_VAL |
4868 | case "x$ac_cv_prog_cc_c89" in |
4869 | x) |
4870 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 |
4871 | + { $as_echo "$as_me:$LINENO: result: none needed" >&5 |
4872 | $as_echo "none needed" >&6; } ;; |
4873 | xno) |
4874 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 |
4875 | + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 |
4876 | $as_echo "unsupported" >&6; } ;; |
4877 | *) |
4878 | CC="$CC $ac_cv_prog_cc_c89" |
4879 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 |
4880 | + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 |
4881 | $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; |
4882 | esac |
4883 | -if test "x$ac_cv_prog_cc_c89" != xno; then : |
4884 | |
4885 | -fi |
4886 | |
4887 | ac_ext=c |
4888 | ac_cpp='$CPP $CPPFLAGS' |
4889 | @@ -4456,9 +4351,9 @@ |
4890 | |
4891 | depcc="$CC" am_compiler_list= |
4892 | |
4893 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
4894 | +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 |
4895 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
4896 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
4897 | +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then |
4898 | $as_echo_n "(cached) " >&6 |
4899 | else |
4900 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
4901 | @@ -4566,7 +4461,7 @@ |
4902 | fi |
4903 | |
4904 | fi |
4905 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 |
4906 | +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 |
4907 | $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } |
4908 | CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type |
4909 | |
4910 | @@ -4581,9 +4476,9 @@ |
4911 | fi |
4912 | |
4913 | |
4914 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 |
4915 | +{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 |
4916 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } |
4917 | -if test "${ac_cv_path_SED+set}" = set; then : |
4918 | +if test "${ac_cv_path_SED+set}" = set; then |
4919 | $as_echo_n "(cached) " >&6 |
4920 | else |
4921 | ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ |
4922 | @@ -4591,7 +4486,7 @@ |
4923 | ac_script="$ac_script$as_nl$ac_script" |
4924 | done |
4925 | echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed |
4926 | - { ac_script=; unset ac_script;} |
4927 | + $as_unset ac_script || ac_script= |
4928 | if test -z "$SED"; then |
4929 | ac_path_SED_found=false |
4930 | # Loop through the user's path and test for each of PROGNAME-LIST |
4931 | @@ -4600,7 +4495,7 @@ |
4932 | do |
4933 | IFS=$as_save_IFS |
4934 | test -z "$as_dir" && as_dir=. |
4935 | - for ac_prog in sed gsed; do |
4936 | + for ac_prog in sed gsed; do |
4937 | for ac_exec_ext in '' $ac_executable_extensions; do |
4938 | ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" |
4939 | { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue |
4940 | @@ -4620,7 +4515,7 @@ |
4941 | $as_echo '' >> "conftest.nl" |
4942 | "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break |
4943 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break |
4944 | - as_fn_arith $ac_count + 1 && ac_count=$as_val |
4945 | + ac_count=`expr $ac_count + 1` |
4946 | if test $ac_count -gt ${ac_path_SED_max-0}; then |
4947 | # Best one so far, save it but keep looking for a better one |
4948 | ac_cv_path_SED="$ac_path_SED" |
4949 | @@ -4635,17 +4530,19 @@ |
4950 | $ac_path_SED_found && break 3 |
4951 | done |
4952 | done |
4953 | - done |
4954 | +done |
4955 | IFS=$as_save_IFS |
4956 | if test -z "$ac_cv_path_SED"; then |
4957 | - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
4958 | + { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 |
4959 | +$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} |
4960 | + { (exit 1); exit 1; }; } |
4961 | fi |
4962 | else |
4963 | ac_cv_path_SED=$SED |
4964 | fi |
4965 | |
4966 | fi |
4967 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 |
4968 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 |
4969 | $as_echo "$ac_cv_path_SED" >&6; } |
4970 | SED="$ac_cv_path_SED" |
4971 | rm -f conftest.sed |
4972 | @@ -4663,9 +4560,9 @@ |
4973 | |
4974 | |
4975 | |
4976 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
4977 | +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 |
4978 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
4979 | -if test "${ac_cv_path_GREP+set}" = set; then : |
4980 | +if test "${ac_cv_path_GREP+set}" = set; then |
4981 | $as_echo_n "(cached) " >&6 |
4982 | else |
4983 | if test -z "$GREP"; then |
4984 | @@ -4676,7 +4573,7 @@ |
4985 | do |
4986 | IFS=$as_save_IFS |
4987 | test -z "$as_dir" && as_dir=. |
4988 | - for ac_prog in grep ggrep; do |
4989 | + for ac_prog in grep ggrep; do |
4990 | for ac_exec_ext in '' $ac_executable_extensions; do |
4991 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
4992 | { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
4993 | @@ -4696,7 +4593,7 @@ |
4994 | $as_echo 'GREP' >> "conftest.nl" |
4995 | "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break |
4996 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break |
4997 | - as_fn_arith $ac_count + 1 && ac_count=$as_val |
4998 | + ac_count=`expr $ac_count + 1` |
4999 | if test $ac_count -gt ${ac_path_GREP_max-0}; then |
5000 | # Best one so far, save it but keep looking for a better one |
The diff has been truncated for viewing.
The update has already been released to -security (see bug 1157385).