1 diff --git a/ChangeLog b/ChangeLog
2 deleted file mode 100755
7 -1.99.22 Prevent unbounded increasing of the file when overwriting or truncating to size different than zero. Many bugs fixed.
8 -1.99.21 Using boost template library. New file format.
9 -1.99.20 File format changed, incompatible with 1.99.19 and lower. Bug fixes, looks like it works with fsx-linux.
10 -1.99.19 Better compatibility with version 1.99.17.
11 -1.99.18 Bug fix release. Upgrade is highly recommended.
12 -1.99.17 stat (fstat, lstat, ls...) and other operations speeded up significatly on filesystems that support extended attributes. Several minor bugs fixed.
13 -1.99.16 Implement statfs system call (get file system statistics). The 'df' utility works correctly now.
14 -1.99.15 Better support for newer gcc. Include errno.h where's neccessary.
15 -1.99.14 Some bugs fixed. FuseCompress should work much better with rsync now.
16 -1.99.13 FuseCompress now requires storage directory and mount point. These must be different. Include errno.h in TransformCompress.cpp.
17 -1.99.12 Halve size of zero length files.
18 -1.99.11 Better support for programs that use hardlinks. Better handling with files that are already compressed in fusecompress_offline.
19 -1.99.10 Move all source code files to src subdirectory. Include errno.h in FileRawCompressed.cpp.
20 -1.99.9 Include errno.h in FileManager.cpp.
21 -1.99.8 Make FuseCompress more robust when testing with fsstress.
22 -1.99.7 Remove script fusecompress_offline.sh. Program fusecompress_offline has now the same functionality.
23 -1.99.6 Show license when running fusecompress or fusecompress_offline. Fixed Makefile.am to include fusecompress_offline.sh into dist.
24 -1.99.5 Using fixed size types in file format. Using little-endian in file format. Added fusecompress_offline.sh script.
25 -1.99.4 Fixed compilation problems on x86_64.
26 -1.99.3 Fixed CompressedTable. It really works now.
28 diff --git a/LICENSE b/LICENSE
30 index 0000000..366214f
34 +This program is distributed under GNU/GPLv2 and later.
35 diff --git a/Makefile.in b/Makefile.in
36 index 15ec520..0cc45f6 100644
40 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
41 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
44 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
45 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
46 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
48 # This Makefile.in is free software; the Free Software Foundation
49 # gives unlimited permission to copy and/or distribute it,
50 # with or without modifications, as long as this notice is preserved.
54 pkgdatadir = $(datadir)/@PACKAGE@
55 -pkglibdir = $(libdir)/@PACKAGE@
56 pkgincludedir = $(includedir)/@PACKAGE@
57 +pkglibdir = $(libdir)/@PACKAGE@
58 +pkglibexecdir = $(libexecdir)/@PACKAGE@
59 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
60 install_sh_DATA = $(install_sh) -c -m 644
61 install_sh_PROGRAM = $(install_sh) -c
62 @@ -49,6 +51,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
63 mkinstalldirs = $(install_sh) -d
64 CONFIG_HEADER = config.h
66 +CONFIG_CLEAN_VPATH_FILES =
69 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
70 @@ -60,6 +63,9 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
71 ps-recursive uninstall-recursive
72 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
73 distclean-recursive maintainer-clean-recursive
74 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
75 + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
76 + distdir dist dist-all distcheck
79 DIST_SUBDIRS = $(SUBDIRS)
80 @@ -67,9 +73,34 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
81 distdir = $(PACKAGE)-$(VERSION)
82 top_distdir = $(distdir)
83 am__remove_distdir = \
84 - { test ! -d $(distdir) \
85 - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
86 - && rm -fr $(distdir); }; }
87 + { test ! -d "$(distdir)" \
88 + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
89 + && rm -fr "$(distdir)"; }; }
92 + sed_first='s,^\([^/]*\)/.*$$,\1,'; \
93 + sed_rest='s,^[^/]*/*,,'; \
94 + sed_last='s,^.*/\([^/]*\)$$,\1,'; \
95 + sed_butlast='s,/*[^/]*$$,,'; \
96 + while test -n "$$dir1"; do \
97 + first=`echo "$$dir1" | sed -e "$$sed_first"`; \
98 + if test "$$first" != "."; then \
99 + if test "$$first" = ".."; then \
100 + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
101 + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
103 + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
104 + if test "$$first2" = "$$first"; then \
105 + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
107 + dir2="../$$dir2"; \
109 + dir0="$$dir0"/"$$first"; \
112 + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
115 DIST_ARCHIVES = $(distdir).tar.gz
117 distuninstallcheck_listfiles = find . -type f -print
118 @@ -125,6 +156,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
119 PACKAGE_NAME = @PACKAGE_NAME@
120 PACKAGE_STRING = @PACKAGE_STRING@
121 PACKAGE_TARNAME = @PACKAGE_TARNAME@
122 +PACKAGE_URL = @PACKAGE_URL@
123 PACKAGE_VERSION = @PACKAGE_VERSION@
124 PATH_SEPARATOR = @PATH_SEPARATOR@
125 PKG_CONFIG = @PKG_CONFIG@
126 @@ -192,15 +224,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
128 case '$(am__configure_deps)' in \
130 - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
131 - cd $(srcdir) && $(AUTOMAKE) --foreign \
132 + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
133 + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
138 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
139 - cd $(top_srcdir) && \
140 - $(AUTOMAKE) --foreign Makefile
141 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
142 + $(am__cd) $(top_srcdir) && \
143 + $(AUTOMAKE) --foreign Makefile
145 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
147 @@ -216,9 +248,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
148 $(SHELL) ./config.status --recheck
150 $(top_srcdir)/configure: $(am__configure_deps)
151 - cd $(srcdir) && $(AUTOCONF)
152 + $(am__cd) $(srcdir) && $(AUTOCONF)
153 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
154 - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
155 + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
156 +$(am__aclocal_m4_deps):
159 @if test ! -f $@; then \
160 @@ -230,7 +263,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
162 cd $(top_builddir) && $(SHELL) ./config.status config.h
163 $(srcdir)/config.h.in: $(am__configure_deps)
164 - cd $(top_srcdir) && $(AUTOHEADER)
165 + ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
169 @@ -244,7 +277,7 @@ distclean-hdr:
170 # (which will cause the Makefiles to be regenerated when you run `make');
171 # (2) otherwise, pass the desired values on the `make' command line.
172 $(RECURSIVE_TARGETS):
173 - @failcom='exit 1'; \
174 + @fail= failcom='exit 1'; \
175 for f in x $$MAKEFLAGS; do \
178 @@ -261,7 +294,7 @@ $(RECURSIVE_TARGETS):
180 local_target="$$target"; \
182 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
183 + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
186 if test "$$dot_seen" = "no"; then \
187 @@ -269,7 +302,7 @@ $(RECURSIVE_TARGETS):
190 $(RECURSIVE_CLEAN_TARGETS):
191 - @failcom='exit 1'; \
192 + @fail= failcom='exit 1'; \
193 for f in x $$MAKEFLAGS; do \
196 @@ -295,16 +328,16 @@ $(RECURSIVE_CLEAN_TARGETS):
198 local_target="$$target"; \
200 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
201 + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
203 done && test -z "$$fail"
205 list='$(SUBDIRS)'; for subdir in $$list; do \
206 - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
207 + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
210 list='$(SUBDIRS)'; for subdir in $$list; do \
211 - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
212 + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
215 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
216 @@ -312,14 +345,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
217 unique=`for i in $$list; do \
218 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
220 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
221 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
222 END { if (nonempty) { for (i in files) print i; }; }'`; \
226 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
227 $(TAGS_FILES) $(LISP)
231 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
232 include_option=--etags-include; \
233 @@ -331,7 +364,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
234 list='$(SUBDIRS)'; for subdir in $$list; do \
235 if test "$$subdir" = .; then :; else \
236 test ! -f $$subdir/TAGS || \
237 - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
238 + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
241 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
242 @@ -340,36 +373,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
244 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
245 END { if (nonempty) { for (i in files) print i; }; }'`; \
246 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
248 + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
249 test -n "$$unique" || unique=$$empty_fix; \
250 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
252 + if test $$# -gt 0; then \
253 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
256 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
261 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
262 $(TAGS_FILES) $(LISP)
264 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
265 unique=`for i in $$list; do \
266 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
268 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
269 END { if (nonempty) { for (i in files) print i; }; }'`; \
270 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
271 + test -z "$(CTAGS_ARGS)$$unique" \
272 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
277 here=`$(am__cd) $(top_builddir) && pwd` \
278 - && cd $(top_srcdir) \
279 - && gtags -i $(GTAGS_ARGS) $$here
280 + && $(am__cd) $(top_srcdir) \
281 + && gtags -i $(GTAGS_ARGS) "$$here"
284 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
286 distdir: $(DISTFILES)
287 $(am__remove_distdir)
288 - test -d $(distdir) || mkdir $(distdir)
289 + test -d "$(distdir)" || mkdir "$(distdir)"
290 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
291 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
292 list='$(DISTFILES)'; \
293 @@ -385,38 +423,55 @@ distdir: $(DISTFILES)
294 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
295 if test -d $$d/$$file; then \
296 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
297 + if test -d "$(distdir)/$$file"; then \
298 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
300 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
301 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
302 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
303 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
305 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
306 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
308 - test -f $(distdir)/$$file \
309 - || cp -p $$d/$$file $(distdir)/$$file \
310 + test -f "$(distdir)/$$file" \
311 + || cp -p $$d/$$file "$(distdir)/$$file" \
315 - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
316 + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
317 if test "$$subdir" = .; then :; else \
318 test -d "$(distdir)/$$subdir" \
319 || $(MKDIR_P) "$(distdir)/$$subdir" \
321 - distdir=`$(am__cd) $(distdir) && pwd`; \
322 - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
326 + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
327 + if test "$$subdir" = .; then :; else \
328 + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
329 + $(am__relativize); \
330 + new_distdir=$$reldir; \
331 + dir1=$$subdir; dir2="$(top_distdir)"; \
332 + $(am__relativize); \
333 + new_top_distdir=$$reldir; \
334 + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
335 + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
336 + ($(am__cd) $$subdir && \
337 $(MAKE) $(AM_MAKEFLAGS) \
338 - top_distdir="$$top_distdir" \
339 - distdir="$$distdir/$$subdir" \
340 + top_distdir="$$new_top_distdir" \
341 + distdir="$$new_distdir" \
342 am__remove_distdir=: \
343 am__skip_length_check=: \
344 + am__skip_mode_fix=: \
349 - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
350 + -test -n "$(am__skip_mode_fix)" \
351 + || find "$(distdir)" -type d ! -perm -755 \
352 + -exec chmod u+rwx,go+rx {} \; -o \
353 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
354 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
355 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
356 - || chmod -R a+r $(distdir)
357 + || chmod -R a+r "$(distdir)"
359 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
360 $(am__remove_distdir)
361 @@ -429,6 +484,10 @@ dist-lzma: distdir
362 tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
363 $(am__remove_distdir)
366 + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
367 + $(am__remove_distdir)
370 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
371 $(am__remove_distdir)
372 @@ -452,15 +511,17 @@ dist dist-all: distdir
374 case '$(DIST_ARCHIVES)' in \
376 - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
377 + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
379 - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
380 + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
382 - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
383 + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
385 + xz -dc $(distdir).tar.xz | $(am__untar) ;;\
387 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
389 - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
390 + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
392 unzip $(distdir).zip ;;\
394 @@ -468,9 +529,11 @@ distcheck: dist
395 mkdir $(distdir)/_build
396 mkdir $(distdir)/_inst
398 + test -d $(distdir)/_build || exit 0; \
399 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
400 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
401 - && cd $(distdir)/_build \
403 + && $(am__cd) $(distdir)/_build \
404 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
405 $(DISTCHECK_CONFIGURE_FLAGS) \
406 && $(MAKE) $(AM_MAKEFLAGS) \
407 @@ -492,13 +555,15 @@ distcheck: dist
408 && rm -rf "$$dc_destdir" \
409 && $(MAKE) $(AM_MAKEFLAGS) dist \
410 && rm -rf $(DIST_ARCHIVES) \
411 - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
412 + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
413 + && cd "$$am__cwd" \
415 $(am__remove_distdir)
416 @(echo "$(distdir) archives ready for distribution: "; \
417 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
418 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
420 - @cd $(distuninstallcheck_dir) \
421 + @$(am__cd) '$(distuninstallcheck_dir)' \
422 && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
423 || { echo "ERROR: files left after uninstall:" ; \
424 if test -n "$(DESTDIR)"; then \
425 @@ -540,6 +605,7 @@ clean-generic:
428 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
429 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
431 maintainer-clean-generic:
432 @echo "This command is intended for maintainers to use"
433 @@ -559,6 +625,8 @@ dvi-am:
442 @@ -567,18 +635,28 @@ install-data-am:
444 install-dvi: install-dvi-recursive
450 install-html: install-html-recursive
454 install-info: install-info-recursive
460 install-pdf: install-pdf-recursive
464 install-ps: install-ps-recursive
470 maintainer-clean: maintainer-clean-recursive
471 @@ -601,24 +679,25 @@ ps-am:
475 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
477 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
478 + ctags-recursive install-am install-strip tags-recursive
480 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
481 all all-am am--refresh check check-am clean clean-generic \
482 ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
483 - dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
484 - distclean-generic distclean-hdr distclean-tags distcleancheck \
485 - distdir distuninstallcheck dvi dvi-am html html-am info \
486 - info-am install install-am install-data install-data-am \
487 - install-dvi install-dvi-am install-exec install-exec-am \
488 - install-html install-html-am install-info install-info-am \
489 - install-man install-pdf install-pdf-am install-ps \
490 - install-ps-am install-strip installcheck installcheck-am \
491 - installdirs installdirs-am maintainer-clean \
492 + dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
493 + distclean distclean-generic distclean-hdr distclean-tags \
494 + distcleancheck distdir distuninstallcheck dvi dvi-am html \
495 + html-am info info-am install install-am install-data \
496 + install-data-am install-dvi install-dvi-am install-exec \
497 + install-exec-am install-html install-html-am install-info \
498 + install-info-am install-man install-pdf install-pdf-am \
499 + install-ps install-ps-am install-strip installcheck \
500 + installcheck-am installdirs installdirs-am maintainer-clean \
501 maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
502 pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
505 # Tell versions [3.59,3.63) of GNU make to not export all variables.
506 # Otherwise a system limit (for SysV at least) may be exceeded.
508 diff --git a/NEWS b/NEWS
509 index 898a3da..e4692b1 100644
515 diff --git a/README b/README
516 index f681834..4f1f944 100644
519 @@ -4,19 +4,34 @@ FuseCompress (compressed filesystem in userspace)
520 We are not responsible for any badness that may happen to you during using
525 -This program is distributed under GNU/GPL version 2.
530 - File becames unreadable when it hits not enought space condition. So
531 - be careful to really have enought free space on the disk to store all data.
532 + File becames unreadable when it hits a not enough space condition. So
533 + be careful to really have enough free space on the disk to store all the data.
535 +This is more a feature than a bug:
537 + In CFile *FileManager::GetUnlocked(const char *name, bool create) FuseCompress
538 + uses the underlying filesystem inode number. This is a problem when you have
539 + multiple partitions underneath.
543 + /backups/.max (partition 1)
544 + /backups/.max/alex (partition 2)
545 + /backups/.max -> /backup/max (fusecompress)
547 + This would spoil the inode pool and potentially lead to conflicts, especially
551 + Do NOT compile FuseCompress with g++-4.3.3! Strange threading problems
552 + (broken locking) were detected (thank you Steve!) when using this version of
555 There is a memory leak (not too big, user detects it after milions of
556 - copyied files) in file utility, more exactly in it's magic library, see:
557 + copyied files) in 'file' package, more exactly in it's magic library, see:
559 http://mx.gw.com/pipermail/file/2009/000306.html
561 @@ -35,18 +50,26 @@ Problems:
562 ==13747== by 0x43BC77: Memory::merge(char const*) (Memory.cpp:53)
565 + This leak should be fixed with the newer 'file' package.
574 - liblzma = 4.999.5alpha (Download source from http://tukaani.org/lzma/)
575 + xz-4.999.9beta (lzma library from http://tukaani.org/xz/xz-4.999.9beta.tar.gz)
578 +Example (with apt-get):
580 + $ sudo apt-get install libboost-dev libz-dev liblzo2-dev libmagic-dev libfuse-dev -y
581 + (also install the xz-beta manually, above)
582 + Note that 32-bit users may need to recompile boost by hand for long file support (see below).
586 +Typically you only need to run ./configure && make && sudo make install
588 Boost's libraries may be stored in /usr/lib64 on 64bit systems,
589 configure script needs to be called with:
591 @@ -59,6 +82,20 @@ Compile:
593 FUSE_CFLAGS="-D_GNU_SOURCE -D_REENTRANT -D_POSIX_C_SOURCE=200112L -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -pedantic -Wno-long-long -Wall -fpermissive -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26" FUSE_LIBS="-lfuse" ./configure --with-boost=/usr/include/ --with-boost-libdir=/usr/lib64
595 + If your boost library was compiled for 32bit system without support for long files (bigger than 2GiB)
596 + configure script prints this error message:
597 + Boost library compiled for 32bit architecture without long file support!
599 + It means that any program using this library is limited to work with files smaller than 2GiB.
600 + You can either ignore this problem by passing --enable-crippled_boost to FuseCompress' configure script
601 + or compile boost with long file support. In both cases, try to report this problem to authors of your
602 + Linux distribution.
604 + There are switches you can use to build boost library with long file support:
606 + ./bjam "define=_FILE_OFFSET_BITS=64" release --toolset=gcc --build-type=minimal --layout=system --libdir=/usr/lib/ --prefix=/usr
607 + sudo ./bjam "define=_FILE_OFFSET_BITS=64" release --toolset=gcc --build-type=minimal --layout=system --libdir=/usr/lib/ --includedir=/usr/include/boost --prefix=/usr install
611 See man pages for fusecompress and fusecompress_offline.
612 diff --git a/aclocal.m4 b/aclocal.m4
613 index e19349e..9f02e6a 100644
617 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
618 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
620 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
621 -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
622 +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
623 # This file is free software; the Free Software Foundation
624 # gives unlimited permission to copy and/or distribute it,
625 # with or without modifications, as long as this notice is preserved.
628 m4_ifndef([AC_AUTOCONF_VERSION],
629 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
630 -m4_if(AC_AUTOCONF_VERSION, [2.63],,
631 -[m4_warning([this file was generated for autoconf 2.63.
632 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
633 +[m4_warning([this file was generated for autoconf 2.65.
634 You have another version of autoconf. It may work, but is not guaranteed to.
635 If you have problems, you may need to regenerate the build system entirely.
636 To do so, use the procedure documented by the package, typically `autoreconf'.])])
637 @@ -175,7 +175,7 @@ else
639 ])# PKG_CHECK_MODULES
641 -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
642 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
644 # This file is free software; the Free Software Foundation
645 # gives unlimited permission to copy and/or distribute it,
646 @@ -187,10 +187,10 @@ fi[]dnl
647 # generated from the m4 files accompanying Automake X.Y.
648 # (This private macro should not be called outside this file.)
649 AC_DEFUN([AM_AUTOMAKE_VERSION],
650 -[am__api_version='1.10'
651 +[am__api_version='1.11'
652 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
653 dnl require some minimum version. Point them to the right macro.
654 -m4_if([$1], [1.10.1], [],
655 +m4_if([$1], [1.11.1], [],
656 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
659 @@ -204,12 +204,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
660 # AM_SET_CURRENT_AUTOMAKE_VERSION
661 # -------------------------------
662 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
663 -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
664 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
665 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
666 -[AM_AUTOMAKE_VERSION([1.10.1])dnl
667 +[AM_AUTOMAKE_VERSION([1.11.1])dnl
668 m4_ifndef([AC_AUTOCONF_VERSION],
669 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
670 -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
671 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
673 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
675 @@ -266,14 +266,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
677 # AM_CONDITIONAL -*- Autoconf -*-
679 -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
680 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
681 # Free Software Foundation, Inc.
683 # This file is free software; the Free Software Foundation
684 # gives unlimited permission to copy and/or distribute it,
685 # with or without modifications, as long as this notice is preserved.
690 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
691 # -------------------------------------
692 @@ -286,6 +286,7 @@ AC_SUBST([$1_TRUE])dnl
693 AC_SUBST([$1_FALSE])dnl
694 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
695 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
696 +m4_define([_AM_COND_VALUE_$1], [$2])dnl
700 @@ -299,14 +300,14 @@ AC_CONFIG_COMMANDS_PRE(
701 Usually this means the macro was only invoked conditionally.]])
704 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
705 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
706 # Free Software Foundation, Inc.
708 # This file is free software; the Free Software Foundation
709 # gives unlimited permission to copy and/or distribute it,
710 # with or without modifications, as long as this notice is preserved.
715 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
716 # written in clear, in which case automake, when reading aclocal.m4,
717 @@ -363,6 +364,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
718 if test "$am_compiler_list" = ""; then
719 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
721 + am__universal=false
722 + m4_case([$1], [CC],
723 + [case " $depcc " in #(
724 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
727 + [case " $depcc " in #(
728 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
731 for depmode in $am_compiler_list; do
732 # Setup a source with many dependencies, because some compilers
733 # like to wrap large dependency lists on column 80 (with \), and
734 @@ -380,7 +391,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
736 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
738 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
739 + # mode. It turns out that the SunPro C++ compiler does not properly
740 + # handle `-M -o', and we need to detect this. Also, some Intel
741 + # versions had trouble with output in subdirs
742 + am__obj=sub/conftest.${OBJEXT-o}
743 + am__minus_obj="-o $am__obj"
746 + # This depmode causes a compiler race in universal mode.
747 + test "$am__universal" = false || continue
750 # after this tag, mechanisms are not by side-effect, so they'll
751 # only be used when explicitly requested
752 @@ -390,19 +411,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
756 + msvisualcpp | msvcmsys)
757 + # This compiler won't grok `-c -o', but also, the minuso test has
758 + # not run yet. These depmodes are late enough in the game, and
759 + # so weak that their functioning should not be impacted.
760 + am__obj=conftest.${OBJEXT-o}
765 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
766 - # mode. It turns out that the SunPro C++ compiler does not properly
767 - # handle `-M -o', and we need to detect this.
768 if depmode=$depmode \
769 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
770 + source=sub/conftest.c object=$am__obj \
771 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
772 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
773 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
774 >/dev/null 2>conftest.err &&
775 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
776 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
777 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
778 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
779 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
780 # icc doesn't choke on unknown options, it will just issue warnings
781 # or remarks (even with -Werror). So we grep stderr for any message
782 @@ -459,57 +484,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
784 # Generate code to set up dependency tracking. -*- Autoconf -*-
786 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
787 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
788 # Free Software Foundation, Inc.
790 # This file is free software; the Free Software Foundation
791 # gives unlimited permission to copy and/or distribute it,
792 # with or without modifications, as long as this notice is preserved.
797 # _AM_OUTPUT_DEPENDENCY_COMMANDS
798 # ------------------------------
799 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
800 -[for mf in $CONFIG_FILES; do
801 - # Strip MF so we end up with the name of the file.
802 - mf=`echo "$mf" | sed -e 's/:.*$//'`
803 - # Check whether this is an Automake generated Makefile or not.
804 - # We used to match only the files named `Makefile.in', but
805 - # some people rename them; so instead we look at the file content.
806 - # Grep'ing the first line is not enough: some people post-process
807 - # each Makefile.in and add a new line on top of each file to say so.
808 - # Grep'ing the whole file is not good either: AIX grep has a line
809 - # limit of 2048, but all sed's we know have understand at least 4000.
810 - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
811 - dirpart=`AS_DIRNAME("$mf")`
815 - # Extract the definition of DEPDIR, am__include, and am__quote
816 - # from the Makefile without running `make'.
817 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
818 - test -z "$DEPDIR" && continue
819 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
820 - test -z "am__include" && continue
821 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
822 - # When using ansi2knr, U may be empty or an underscore; expand it
823 - U=`sed -n 's/^U = //p' < "$mf"`
824 - # Find all dependency output files, they are included files with
825 - # $(DEPDIR) in their names. We invoke sed twice because it is the
826 - # simplest approach to changing $(DEPDIR) to its actual value in the
828 - for file in `sed -n "
829 - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
830 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
831 - # Make sure the directory exists.
832 - test -f "$dirpart/$file" && continue
833 - fdir=`AS_DIRNAME(["$file"])`
834 - AS_MKDIR_P([$dirpart/$fdir])
835 - # echo "creating $dirpart/$file"
836 - echo '# dummy' > "$dirpart/$file"
838 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
839 + # are listed without --file. Let's play safe and only enable the eval
840 + # if we detect the quoting.
841 + case $CONFIG_FILES in
842 + *\'*) eval set x "$CONFIG_FILES" ;;
843 + *) set x $CONFIG_FILES ;;
848 + # Strip MF so we end up with the name of the file.
849 + mf=`echo "$mf" | sed -e 's/:.*$//'`
850 + # Check whether this is an Automake generated Makefile or not.
851 + # We used to match only the files named `Makefile.in', but
852 + # some people rename them; so instead we look at the file content.
853 + # Grep'ing the first line is not enough: some people post-process
854 + # each Makefile.in and add a new line on top of each file to say so.
855 + # Grep'ing the whole file is not good either: AIX grep has a line
856 + # limit of 2048, but all sed's we know have understand at least 4000.
857 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
858 + dirpart=`AS_DIRNAME("$mf")`
862 + # Extract the definition of DEPDIR, am__include, and am__quote
863 + # from the Makefile without running `make'.
864 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
865 + test -z "$DEPDIR" && continue
866 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
867 + test -z "am__include" && continue
868 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
869 + # When using ansi2knr, U may be empty or an underscore; expand it
870 + U=`sed -n 's/^U = //p' < "$mf"`
871 + # Find all dependency output files, they are included files with
872 + # $(DEPDIR) in their names. We invoke sed twice because it is the
873 + # simplest approach to changing $(DEPDIR) to its actual value in the
875 + for file in `sed -n "
876 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
877 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
878 + # Make sure the directory exists.
879 + test -f "$dirpart/$file" && continue
880 + fdir=`AS_DIRNAME(["$file"])`
881 + AS_MKDIR_P([$dirpart/$fdir])
882 + # echo "creating $dirpart/$file"
883 + echo '# dummy' > "$dirpart/$file"
888 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
891 @@ -529,13 +565,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
892 # Do all the work for Automake. -*- Autoconf -*-
894 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
895 -# 2005, 2006, 2008 Free Software Foundation, Inc.
896 +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
898 # This file is free software; the Free Software Foundation
899 # gives unlimited permission to copy and/or distribute it,
900 # with or without modifications, as long as this notice is preserved.
905 # This macro actually does too much. Some checks are only needed if
906 # your package does certain things. But this isn't really a big deal.
907 @@ -552,7 +588,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
908 # arguments mandatory, and then we can depend on a new Autoconf
909 # release and drop the old call support.
910 AC_DEFUN([AM_INIT_AUTOMAKE],
911 -[AC_PREREQ([2.60])dnl
912 +[AC_PREREQ([2.62])dnl
913 dnl Autoconf wants to disallow AM_ names. We explicitly allow
914 dnl the ones we care about.
915 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
916 @@ -603,8 +639,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
917 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
918 AM_MISSING_PROG(AUTOHEADER, autoheader)
919 AM_MISSING_PROG(MAKEINFO, makeinfo)
921 -AM_PROG_INSTALL_STRIP
922 +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
923 +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
924 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
925 # We need awk for the "check" target. The system "awk" is bad on
927 @@ -612,24 +648,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
928 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
929 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
930 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
931 - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
932 - [_AM_PROG_TAR([v7])])])
933 + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
934 + [_AM_PROG_TAR([v7])])])
935 _AM_IF_OPTION([no-dependencies],,
936 [AC_PROVIDE_IFELSE([AC_PROG_CC],
937 - [_AM_DEPENDENCIES(CC)],
938 - [define([AC_PROG_CC],
939 - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
940 + [_AM_DEPENDENCIES(CC)],
941 + [define([AC_PROG_CC],
942 + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
943 AC_PROVIDE_IFELSE([AC_PROG_CXX],
944 - [_AM_DEPENDENCIES(CXX)],
945 - [define([AC_PROG_CXX],
946 - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
947 + [_AM_DEPENDENCIES(CXX)],
948 + [define([AC_PROG_CXX],
949 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
950 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
951 - [_AM_DEPENDENCIES(OBJC)],
952 - [define([AC_PROG_OBJC],
953 - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
954 + [_AM_DEPENDENCIES(OBJC)],
955 + [define([AC_PROG_OBJC],
956 + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
958 +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
959 +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
960 +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
961 +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
962 +AC_CONFIG_COMMANDS_PRE(dnl
963 +[m4_provide_if([_AM_COMPILER_EXEEXT],
964 + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
967 +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
968 +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
969 +dnl mangled by Autoconf and run in a shell conditional statement.
970 +m4_define([_AC_COMPILER_EXEEXT],
971 +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
974 # When config.status generates a header, we must update the stamp-h file.
975 # This file resides in the same directory as the config header
976 @@ -652,7 +701,7 @@ for _am_header in $config_headers :; do
978 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
980 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
981 +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
983 # This file is free software; the Free Software Foundation
984 # gives unlimited permission to copy and/or distribute it,
985 @@ -663,7 +712,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
986 # Define $install_sh.
987 AC_DEFUN([AM_PROG_INSTALL_SH],
988 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
989 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
990 +if test x"${install_sh}" != xset; then
991 + case $am_aux_dir in
993 + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
995 + install_sh="\${SHELL} $am_aux_dir/install-sh"
998 AC_SUBST(install_sh)])
1000 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
1001 @@ -689,13 +745,13 @@ AC_SUBST([am__leading_dot])])
1003 # Check to see how 'make' treats includes. -*- Autoconf -*-
1005 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
1006 +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
1008 # This file is free software; the Free Software Foundation
1009 # gives unlimited permission to copy and/or distribute it,
1010 # with or without modifications, as long as this notice is preserved.
1017 @@ -704,7 +760,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
1018 [am_make=${MAKE-make}
1019 cat > confinc << 'END'
1022 + @echo this is the am__doit target
1025 # If we don't find an include directive, just comment out the code.
1026 @@ -714,24 +770,24 @@ am__quote=
1028 # First try GNU make style include.
1029 echo "include confinc" > confmf
1030 -# We grep out `Entering directory' and `Leaving directory'
1031 -# messages which can occur if `w' ends up in MAKEFLAGS.
1032 -# In particular we don't look at `^make:' because GNU make might
1033 -# be invoked under some other name (usually "gmake"), in which
1034 -# case it prints its new name instead of `make'.
1035 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
1036 - am__include=include
1040 +# Ignore all kinds of additional output from `make'.
1041 +case `$am_make -s -f confmf 2> /dev/null` in #(
1042 +*the\ am__doit\ target*)
1043 + am__include=include
1048 # Now try BSD make style include.
1049 if test "$am__include" = "#"; then
1050 echo '.include "confinc"' > confmf
1051 - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
1052 - am__include=.include
1056 + case `$am_make -s -f confmf 2> /dev/null` in #(
1057 + *the\ am__doit\ target*)
1058 + am__include=.include
1064 AC_SUBST([am__include])
1065 AC_SUBST([am__quote])
1066 @@ -741,14 +797,14 @@ rm -f confinc confmf
1068 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
1070 -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
1071 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
1072 # Free Software Foundation, Inc.
1074 # This file is free software; the Free Software Foundation
1075 # gives unlimited permission to copy and/or distribute it,
1076 # with or without modifications, as long as this notice is preserved.
1081 # AM_MISSING_PROG(NAME, PROGRAM)
1082 # ------------------------------
1083 @@ -765,7 +821,14 @@ AC_SUBST($1)])
1084 AC_DEFUN([AM_MISSING_HAS_RUN],
1085 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1086 AC_REQUIRE_AUX_FILE([missing])dnl
1087 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
1088 +if test x"${MISSING+set}" != xset; then
1089 + case $am_aux_dir in
1091 + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
1093 + MISSING="\${SHELL} $am_aux_dir/missing" ;;
1096 # Use eval to expand $SHELL
1097 if eval "$MISSING --run true"; then
1098 am_missing_run="$MISSING --run "
1099 @@ -803,13 +866,13 @@ esac
1101 # Helper functions for option handling. -*- Autoconf -*-
1103 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
1104 +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
1106 # This file is free software; the Free Software Foundation
1107 # gives unlimited permission to copy and/or distribute it,
1108 # with or without modifications, as long as this notice is preserved.
1113 # _AM_MANGLE_OPTION(NAME)
1114 # -----------------------
1115 @@ -826,7 +889,7 @@ AC_DEFUN([_AM_SET_OPTION],
1116 # ----------------------------------
1117 # OPTIONS is a space-separated list of Automake options.
1118 AC_DEFUN([_AM_SET_OPTIONS],
1119 -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
1120 +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
1122 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
1123 # -------------------------------------------
1124 @@ -836,14 +899,14 @@ AC_DEFUN([_AM_IF_OPTION],
1126 # Check to make sure that the build environment is sane. -*- Autoconf -*-
1128 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
1129 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
1130 # Free Software Foundation, Inc.
1132 # This file is free software; the Free Software Foundation
1133 # gives unlimited permission to copy and/or distribute it,
1134 # with or without modifications, as long as this notice is preserved.
1141 @@ -852,16 +915,29 @@ AC_DEFUN([AM_SANITY_CHECK],
1144 echo timestamp > conftest.file
1145 +# Reject unsafe characters in $srcdir or the absolute working directory
1146 +# name. Accept space and tab only in the latter.
1150 + *[[\\\"\#\$\&\'\`$am_lf]]*)
1151 + AC_MSG_ERROR([unsafe absolute working directory name]);;
1154 + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
1155 + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
1158 # Do `set' in a subshell so we don't clobber the current shell's
1159 # arguments. Must try -L first in case configure is actually a
1160 # symlink; some systems play weird games with the mod time of symlinks
1161 # (eg FreeBSD returns the mod time of the symlink's containing
1164 - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
1165 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
1166 if test "$[*]" = "X"; then
1168 - set X `ls -t $srcdir/configure conftest.file`
1169 + set X `ls -t "$srcdir/configure" conftest.file`
1172 if test "$[*]" != "X $srcdir/configure conftest.file" \
1173 @@ -914,18 +990,25 @@ fi
1174 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1175 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1177 -# Copyright (C) 2006 Free Software Foundation, Inc.
1178 +# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
1180 # This file is free software; the Free Software Foundation
1181 # gives unlimited permission to copy and/or distribute it,
1182 # with or without modifications, as long as this notice is preserved.
1186 # _AM_SUBST_NOTMAKE(VARIABLE)
1187 # ---------------------------
1188 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
1189 # This macro is traced by Automake.
1190 AC_DEFUN([_AM_SUBST_NOTMAKE])
1192 +# AM_SUBST_NOTMAKE(VARIABLE)
1193 +# ---------------------------
1194 +# Public sister of _AM_SUBST_NOTMAKE.
1195 +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1197 # Check how to create a tarball. -*- Autoconf -*-
1199 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
1200 diff --git a/config.h.in b/config.h.in
1201 index d33e0d5..d373928 100644
1205 /* Define to the one symbol short name of this package. */
1206 #undef PACKAGE_TARNAME
1208 +/* Define to the home page for this package. */
1211 /* Define to the version of this package. */
1212 #undef PACKAGE_VERSION
1214 @@ -219,13 +222,14 @@
1215 nothing if this is not supported. Do not define if restrict is
1216 supported directly. */
1218 -/* Work around a bug in Sun C++: it does not support _Restrict, even
1219 - though the corresponding Sun C compiler does, which causes
1220 - "#define restrict _Restrict" in the previous line. Perhaps some future
1221 - version of Sun C++ will work with _Restrict; if so, it'll probably
1222 - define __RESTRICT, just as Sun C does. */
1223 +/* Work around a bug in Sun C++: it does not support _Restrict or
1224 + __restrict__, even though the corresponding Sun C compiler ends up with
1225 + "#define restrict _Restrict" or "#define restrict __restrict__" in the
1226 + previous line. Perhaps some future version of Sun C++ will work with
1227 + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
1228 #if defined __SUNPRO_CC && !defined __RESTRICT
1230 +# define __restrict__
1233 /* Define to `unsigned int' if <sys/types.h> does not define. */
1234 diff --git a/configure b/configure
1235 index 5a56534..058e00b 100755
1240 # Guess values for system-dependent variables and create Makefiles.
1241 -# Generated by GNU Autoconf 2.63 for FuseCompress 2.0.
1242 +# Generated by GNU Autoconf 2.65 for FuseCompress 2.0.
1244 # Report bugs to <milan.svoboda@centrum.cz>.
1247 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1248 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1249 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
1253 # This configure script is free software; the Free Software Foundation
1254 # gives unlimited permission to copy, distribute and modify it.
1255 -## --------------------- ##
1256 -## M4sh Initialization. ##
1257 -## --------------------- ##
1258 +## -------------------- ##
1259 +## M4sh Initialization. ##
1260 +## -------------------- ##
1262 # Be more Bourne compatible
1263 DUALCASE=1; export DUALCASE # for MKS sh
1264 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1265 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
1268 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1269 @@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1270 alias -g '${1+"$@"}'='"$@"'
1271 setopt NO_GLOB_SUBST
1273 - case `(set -o) 2>/dev/null` in
1274 - *posix*) set -o posix ;;
1275 + case `(set -o) 2>/dev/null` in #(
1277 + set -o posix ;; #(
1288 -# Avoid depending upon Character Ranges.
1289 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
1290 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
1291 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
1292 -as_cr_digits='0123456789'
1293 -as_cr_alnum=$as_cr_Letters$as_cr_digits
1298 @@ -46,7 +42,13 @@ export as_nl
1299 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1300 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
1301 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
1302 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
1303 +# Prefer a ksh shell builtin over an external printf program on Solaris,
1304 +# but without wasting forks for bash or zsh.
1305 +if test -z "$BASH_VERSION$ZSH_VERSION" \
1306 + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
1307 + as_echo='print -r --'
1308 + as_echo_n='print -rn --'
1309 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
1310 as_echo='printf %s\n'
1311 as_echo_n='printf %s'
1313 @@ -57,7 +59,7 @@ else
1314 as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
1315 as_echo_n_body='eval
1320 expr "X$arg" : "X\\(.*\\)$as_nl";
1321 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
1322 @@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
1326 -# Support unset when possible.
1327 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
1335 # We need space, tab and new line, in precisely that order. Quoting is
1336 @@ -96,15 +91,15 @@ fi
1339 # Find who we are. Look in the path if we contain no directory separator.
1342 *[\\/]* ) as_myself=$0 ;;
1343 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1347 test -z "$as_dir" && as_dir=.
1348 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
1350 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
1355 @@ -116,12 +111,16 @@ if test "x$as_myself" = x; then
1357 if test ! -f "$as_myself"; then
1358 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
1359 - { (exit 1); exit 1; }
1363 -# Work around bugs in pre-3.0 UWIN ksh.
1364 -for as_var in ENV MAIL MAILPATH
1365 -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1366 +# Unset variables that we do not need and which cause bugs (e.g. in
1367 +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
1368 +# suppresses any "Segmentation fault" message there. '((' could
1369 +# trigger a bug in pdksh 5.2.14.
1370 +for as_var in BASH_ENV ENV MAIL MAILPATH
1371 +do eval test x\${$as_var+set} = xset \
1372 + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
1376 @@ -133,7 +132,249 @@ export LC_ALL
1380 -# Required to use basename.
1382 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1384 +if test "x$CONFIG_SHELL" = x; then
1385 + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
1388 + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
1389 + # is contrary to our usage. Disable this feature.
1390 + alias -g '\${1+\"\$@\"}'='\"\$@\"'
1391 + setopt NO_GLOB_SUBST
1393 + case \`(set -o) 2>/dev/null\` in #(
1395 + set -o posix ;; #(
1401 + as_required="as_fn_return () { (exit \$1); }
1402 +as_fn_success () { as_fn_return 0; }
1403 +as_fn_failure () { as_fn_return 1; }
1404 +as_fn_ret_success () { return 0; }
1405 +as_fn_ret_failure () { return 1; }
1408 +as_fn_success || { exitcode=1; echo as_fn_success failed.; }
1409 +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
1410 +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
1411 +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
1412 +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
1415 + exitcode=1; echo positional parameters were not saved.
1417 +test x\$exitcode = x0 || exit 1"
1418 + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
1419 + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
1420 + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
1421 + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
1422 +test \$(( 1 + 1 )) = 2 || exit 1"
1423 + if (eval "$as_required") 2>/dev/null; then :
1424 + as_have_required=yes
1426 + as_have_required=no
1428 + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
1431 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1433 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
1436 + test -z "$as_dir" && as_dir=.
1438 + case $as_dir in #(
1440 + for as_base in sh bash ksh sh5; do
1441 + # Try only shells that exist, to save several forks.
1442 + as_shell=$as_dir/$as_base
1443 + if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
1444 + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
1445 + CONFIG_SHELL=$as_shell as_have_required=yes
1446 + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
1454 +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
1455 + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
1456 + CONFIG_SHELL=$SHELL as_have_required=yes
1461 + if test "x$CONFIG_SHELL" != x; then :
1462 + # We cannot yet assume a decent shell, so we have to provide a
1463 + # neutralization value for shells without unset; and this also
1464 + # works around shells that cannot unset nonexistent variables.
1465 + BASH_ENV=/dev/null
1467 + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
1468 + export CONFIG_SHELL
1469 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1472 + if test x$as_have_required = xno; then :
1473 + $as_echo "$0: This script requires a shell more modern than all"
1474 + $as_echo "$0: the shells that I found on your system."
1475 + if test x${ZSH_VERSION+set} = xset ; then
1476 + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
1477 + $as_echo "$0: be upgraded to zsh 4.3.4 or later."
1479 + $as_echo "$0: Please tell bug-autoconf@gnu.org and
1480 +$0: milan.svoboda@centrum.cz about your system, including
1481 +$0: any error possibly output before this message. Then
1482 +$0: install a modern shell, or manually run the script
1483 +$0: under such a shell if you do have one."
1489 +SHELL=${CONFIG_SHELL-/bin/sh}
1491 +# Unset more variables known to interfere with behavior of common tools.
1492 +CLICOLOR_FORCE= GREP_OPTIONS=
1493 +unset CLICOLOR_FORCE GREP_OPTIONS
1495 +## --------------------- ##
1496 +## M4sh Shell Functions. ##
1497 +## --------------------- ##
1500 +# Portably unset VAR.
1503 + { eval $1=; unset $1;}
1505 +as_unset=as_fn_unset
1507 +# as_fn_set_status STATUS
1508 +# -----------------------
1509 +# Set $? to STATUS, without forking.
1510 +as_fn_set_status ()
1513 +} # as_fn_set_status
1515 +# as_fn_exit STATUS
1516 +# -----------------
1517 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
1521 + as_fn_set_status $1
1527 +# Create "$as_dir" as a directory, including parents if necessary.
1531 + case $as_dir in #(
1532 + -*) as_dir=./$as_dir;;
1534 + test -d "$as_dir" || eval $as_mkdir_p || {
1537 + case $as_dir in #(
1538 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
1539 + *) as_qdir=$as_dir;;
1541 + as_dirs="'$as_qdir' $as_dirs"
1542 + as_dir=`$as_dirname -- "$as_dir" ||
1543 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1544 + X"$as_dir" : 'X\(//\)[^/]' \| \
1545 + X"$as_dir" : 'X\(//\)$' \| \
1546 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
1547 +$as_echo X"$as_dir" |
1548 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
1552 + /^X\(\/\/\)[^/].*/{
1565 + test -d "$as_dir" && break
1567 + test -z "$as_dirs" || eval "mkdir $as_dirs"
1568 + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
1572 +# as_fn_append VAR VALUE
1573 +# ----------------------
1574 +# Append the text in VALUE to the end of the definition contained in VAR. Take
1575 +# advantage of any shell optimizations that allow amortized linear growth over
1576 +# repeated appends, instead of the typical quadratic growth present in naive
1578 +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
1579 + eval 'as_fn_append ()
1590 +# as_fn_arith ARG...
1591 +# ------------------
1592 +# Perform arithmetic evaluation on the ARGs, and store the result in the
1593 +# global $as_val. Take advantage of shells that can avoid forks. The arguments
1594 +# must be portable across $(()) and expr.
1595 +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
1596 + eval 'as_fn_arith ()
1603 + as_val=`expr "$@" || test $? -eq 1`
1608 +# as_fn_error ERROR [LINENO LOG_FD]
1609 +# ---------------------------------
1610 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
1611 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
1612 +# script with status $?, using 1 if that was 0.
1615 + as_status=$?; test $as_status -eq 0 && as_status=1
1616 + if test "$3"; then
1617 + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1618 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
1620 + $as_echo "$as_me: error: $1" >&2
1621 + as_fn_exit $as_status
1624 if expr a : '\(a\)' >/dev/null 2>&1 &&
1625 test "X`expr 00001 : '.*\(...\)'`" = X001; then
1627 @@ -147,8 +388,12 @@ else
1631 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
1632 + as_dirname=dirname
1637 -# Name of the executable.
1638 as_me=`$as_basename -- "$0" ||
1639 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
1640 X"$0" : 'X\(//\)$' \| \
1641 @@ -168,412 +413,124 @@ $as_echo X/"$0" |
1647 +# Avoid depending upon Character Ranges.
1648 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
1649 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
1650 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
1651 +as_cr_digits='0123456789'
1652 +as_cr_alnum=$as_cr_Letters$as_cr_digits
1655 -if test "x$CONFIG_SHELL" = x; then
1656 - if (eval ":") 2>/dev/null; then
1657 - as_have_required=yes
1659 - as_have_required=no
1661 + as_lineno_1=$LINENO as_lineno_1a=$LINENO
1662 + as_lineno_2=$LINENO as_lineno_2a=$LINENO
1663 + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
1664 + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
1665 + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
1677 + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
1680 + ' >$as_me.lineno &&
1681 + chmod +x "$as_me.lineno" ||
1682 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
1684 - if test $as_have_required = yes && (eval ":
1685 -(as_func_return () {
1688 -as_func_success () {
1691 -as_func_failure () {
1694 -as_func_ret_success () {
1697 -as_func_ret_failure () {
1699 + # Don't try to exec as it changes $[0], causing all sort of problems
1700 + # (the dirname of $[0] is not the place where we might find the
1701 + # original and so on. Autoconf is especially sensitive to this).
1702 + . "./$as_me.lineno"
1703 + # Exit status is that of the last command.
1708 -if as_func_success; then
1712 - echo as_func_success failed.
1714 +ECHO_C= ECHO_N= ECHO_T=
1715 +case `echo -n x` in #(((((
1717 + case `echo 'xy\c'` in
1718 + *c*) ECHO_T=' ';; # ECHO_T is single tab character.
1720 + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
1727 -if as_func_failure; then
1729 - echo as_func_failure succeeded.
1730 +rm -f conf$$ conf$$.exe conf$$.file
1731 +if test -d conf$$.dir; then
1732 + rm -f conf$$.dir/conf$$.file
1735 + mkdir conf$$.dir 2>/dev/null
1738 -if as_func_ret_success; then
1740 +if (echo >conf$$.file) 2>/dev/null; then
1741 + if ln -s conf$$.file conf$$ 2>/dev/null; then
1743 + # ... but there are two gotchas:
1744 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1745 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
1746 + # In both cases, we have to default to `cp -p'.
1747 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
1749 + elif ln conf$$.file conf$$ 2>/dev/null; then
1756 - echo as_func_ret_success failed.
1759 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
1760 +rmdir conf$$.dir 2>/dev/null
1762 -if as_func_ret_failure; then
1764 - echo as_func_ret_failure succeeded.
1765 +if mkdir -p . 2>/dev/null; then
1766 + as_mkdir_p='mkdir -p "$as_dir"'
1768 + test -d ./-p && rmdir ./-p
1772 -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
1774 +if test -x / >/dev/null 2>&1; then
1775 + as_test_x='test -x'
1778 - echo positional parameters were not saved.
1779 + if ls -dL / >/dev/null 2>&1; then
1786 + if test -d "$1"; then
1792 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
1793 + ???[sx]*):;;*)false;;esac;fi
1797 +as_executable_p=$as_test_x
1799 -test \$exitcode = 0) || { (exit 1); exit 1; }
1800 +# Sed expression to map a string onto a valid CPP name.
1801 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
1804 - as_lineno_1=\$LINENO
1805 - as_lineno_2=\$LINENO
1806 - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
1807 - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
1808 -") 2> /dev/null; then
1811 - as_candidate_shells=
1812 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1813 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
1816 - test -z "$as_dir" && as_dir=.
1819 - for as_base in sh bash ksh sh5; do
1820 - as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
1825 +# Sed expression to map a string onto a valid variable name.
1826 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
1829 - for as_shell in $as_candidate_shells $SHELL; do
1830 - # Try only shells that exist, to save several forks.
1831 - if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
1832 - { ("$as_shell") 2> /dev/null <<\_ASEOF
1833 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1836 - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1837 - # is contrary to our usage. Disable this feature.
1838 - alias -g '${1+"$@"}'='"$@"'
1839 - setopt NO_GLOB_SUBST
1841 - case `(set -o) 2>/dev/null` in
1842 - *posix*) set -o posix ;;
1851 - CONFIG_SHELL=$as_shell
1852 - as_have_required=yes
1853 - if { "$as_shell" 2> /dev/null <<\_ASEOF
1854 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1857 - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1858 - # is contrary to our usage. Disable this feature.
1859 - alias -g '${1+"$@"}'='"$@"'
1860 - setopt NO_GLOB_SUBST
1862 - case `(set -o) 2>/dev/null` in
1863 - *posix*) set -o posix ;;
1870 -(as_func_return () {
1873 -as_func_success () {
1876 -as_func_failure () {
1879 -as_func_ret_success () {
1882 -as_func_ret_failure () {
1887 -if as_func_success; then
1891 - echo as_func_success failed.
1894 -if as_func_failure; then
1896 - echo as_func_failure succeeded.
1899 -if as_func_ret_success; then
1903 - echo as_func_ret_success failed.
1906 -if as_func_ret_failure; then
1908 - echo as_func_ret_failure succeeded.
1911 -if ( set x; as_func_ret_success y && test x = "$1" ); then
1915 - echo positional parameters were not saved.
1918 -test $exitcode = 0) || { (exit 1); exit 1; }
1921 - as_lineno_1=$LINENO
1922 - as_lineno_2=$LINENO
1923 - test "x$as_lineno_1" != "x$as_lineno_2" &&
1924 - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
1935 - if test "x$CONFIG_SHELL" != x; then
1936 - for as_var in BASH_ENV ENV
1937 - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1939 - export CONFIG_SHELL
1940 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1944 - if test $as_have_required = no; then
1945 - echo This script requires a shell more modern than all the
1946 - echo shells that I found on your system. Please install a
1947 - echo modern shell, or manually run the script under such a
1948 - echo shell if you do have one.
1949 - { (exit 1); exit 1; }
1959 -(eval "as_func_return () {
1962 -as_func_success () {
1965 -as_func_failure () {
1968 -as_func_ret_success () {
1971 -as_func_ret_failure () {
1976 -if as_func_success; then
1980 - echo as_func_success failed.
1983 -if as_func_failure; then
1985 - echo as_func_failure succeeded.
1988 -if as_func_ret_success; then
1992 - echo as_func_ret_success failed.
1995 -if as_func_ret_failure; then
1997 - echo as_func_ret_failure succeeded.
2000 -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
2004 - echo positional parameters were not saved.
2007 -test \$exitcode = 0") || {
2008 - echo No shell found that supports shell functions.
2009 - echo Please tell bug-autoconf@gnu.org about your system,
2010 - echo including any error possibly output before this message.
2011 - echo This can help us improve future autoconf versions.
2012 - echo Configuration will now proceed without shell functions.
2017 - as_lineno_1=$LINENO
2018 - as_lineno_2=$LINENO
2019 - test "x$as_lineno_1" != "x$as_lineno_2" &&
2020 - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
2022 - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
2023 - # uniformly replaced by the line number. The first 'sed' inserts a
2024 - # line-number line after each line using $LINENO; the second 'sed'
2025 - # does the real work. The second script uses 'N' to pair each
2026 - # line-number line with the line containing $LINENO, and appends
2027 - # trailing '-' during substitution so that $LINENO is not a special
2028 - # case at line end.
2029 - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
2030 - # scripts with optimization help from Paolo Bonzini. Blame Lee
2031 - # E. McMahon (1931-1989) for sed's syntax. :-)
2043 - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
2046 - ' >$as_me.lineno &&
2047 - chmod +x "$as_me.lineno" ||
2048 - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
2049 - { (exit 1); exit 1; }; }
2051 - # Don't try to exec as it changes $[0], causing all sort of problems
2052 - # (the dirname of $[0] is not the place where we might find the
2053 - # original and so on. Autoconf is especially sensitive to this).
2054 - . "./$as_me.lineno"
2055 - # Exit status is that of the last command.
2060 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
2061 - as_dirname=dirname
2066 -ECHO_C= ECHO_N= ECHO_T=
2067 -case `echo -n x` in
2069 - case `echo 'x\c'` in
2070 - *c*) ECHO_T=' ';; # ECHO_T is single tab character.
2076 -if expr a : '\(a\)' >/dev/null 2>&1 &&
2077 - test "X`expr 00001 : '.*\(...\)'`" = X001; then
2083 -rm -f conf$$ conf$$.exe conf$$.file
2084 -if test -d conf$$.dir; then
2085 - rm -f conf$$.dir/conf$$.file
2088 - mkdir conf$$.dir 2>/dev/null
2090 -if (echo >conf$$.file) 2>/dev/null; then
2091 - if ln -s conf$$.file conf$$ 2>/dev/null; then
2093 - # ... but there are two gotchas:
2094 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2095 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2096 - # In both cases, we have to default to `cp -p'.
2097 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2099 - elif ln conf$$.file conf$$ 2>/dev/null; then
2107 -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
2108 -rmdir conf$$.dir 2>/dev/null
2110 -if mkdir -p . 2>/dev/null; then
2113 - test -d ./-p && rmdir ./-p
2117 -if test -x / >/dev/null 2>&1; then
2118 - as_test_x='test -x'
2120 - if ls -dL / >/dev/null 2>&1; then
2127 - if test -d "$1"; then
2133 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
2134 - ???[sx]*):;;*)false;;esac;fi
2138 -as_executable_p=$as_test_x
2140 -# Sed expression to map a string onto a valid CPP name.
2141 -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
2143 -# Sed expression to map a string onto a valid variable name.
2144 -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
2148 -exec 7<&0 </dev/null 6>&1
2149 +test -n "$DJDIR" || exec 7<&0 </dev/null
2153 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
2154 @@ -591,7 +548,6 @@ cross_compiling=no
2158 -SHELL=${CONFIG_SHELL-/bin/sh}
2160 # Identity of this package.
2161 PACKAGE_NAME='FuseCompress'
2162 @@ -599,6 +555,7 @@ PACKAGE_TARNAME='fusecompress'
2163 PACKAGE_VERSION='2.0'
2164 PACKAGE_STRING='FuseCompress 2.0'
2165 PACKAGE_BUGREPORT='milan.svoboda@centrum.cz'
2169 ac_default_prefix=/usr/local
2170 @@ -639,7 +596,9 @@ ac_includes_default="\
2174 -ac_subst_vars='LTLIBOBJS
2175 +ac_subst_vars='am__EXEEXT_FALSE
2181 @@ -736,6 +695,7 @@ bindir
2182 program_transform_name
2189 @@ -754,6 +714,7 @@ with_boost_serialization
2190 with_boost_iostreams
2191 with_boost_program_options
2192 with_boost_filesystem
2193 +enable_crippled_boost
2197 @@ -885,8 +846,7 @@ do
2198 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
2199 # Reject names that are not valid shell variable names.
2200 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
2201 - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
2202 - { (exit 1); exit 1; }; }
2203 + as_fn_error "invalid feature name: $ac_useropt"
2204 ac_useropt_orig=$ac_useropt
2205 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
2206 case $ac_user_opts in
2207 @@ -912,8 +872,7 @@ do
2208 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
2209 # Reject names that are not valid shell variable names.
2210 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
2211 - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
2212 - { (exit 1); exit 1; }; }
2213 + as_fn_error "invalid feature name: $ac_useropt"
2214 ac_useropt_orig=$ac_useropt
2215 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
2216 case $ac_user_opts in
2217 @@ -1117,8 +1076,7 @@ do
2218 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
2219 # Reject names that are not valid shell variable names.
2220 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
2221 - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
2222 - { (exit 1); exit 1; }; }
2223 + as_fn_error "invalid package name: $ac_useropt"
2224 ac_useropt_orig=$ac_useropt
2225 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
2226 case $ac_user_opts in
2227 @@ -1134,8 +1092,7 @@ do
2228 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
2229 # Reject names that are not valid shell variable names.
2230 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
2231 - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
2232 - { (exit 1); exit 1; }; }
2233 + as_fn_error "invalid package name: $ac_useropt"
2234 ac_useropt_orig=$ac_useropt
2235 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
2236 case $ac_user_opts in
2237 @@ -1165,17 +1122,17 @@ do
2238 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
2239 x_libraries=$ac_optarg ;;
2241 - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
2242 -Try \`$0 --help' for more information." >&2
2243 - { (exit 1); exit 1; }; }
2244 + -*) as_fn_error "unrecognized option: \`$ac_option'
2245 +Try \`$0 --help' for more information."
2249 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
2250 # Reject names that are not valid shell variable names.
2251 - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
2252 - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
2253 - { (exit 1); exit 1; }; }
2254 + case $ac_envvar in #(
2255 + '' | [0-9]* | *[!_$as_cr_alnum]* )
2256 + as_fn_error "invalid variable name: \`$ac_envvar'" ;;
2258 eval $ac_envvar=\$ac_optarg
2259 export $ac_envvar ;;
2261 @@ -1192,15 +1149,13 @@ done
2263 if test -n "$ac_prev"; then
2264 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
2265 - { $as_echo "$as_me: error: missing argument to $ac_option" >&2
2266 - { (exit 1); exit 1; }; }
2267 + as_fn_error "missing argument to $ac_option"
2270 if test -n "$ac_unrecognized_opts"; then
2271 case $enable_option_checking in
2273 - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
2274 - { (exit 1); exit 1; }; } ;;
2275 + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
2276 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
2279 @@ -1223,8 +1178,7 @@ do
2280 [\\/$]* | ?:[\\/]* ) continue;;
2281 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
2283 - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
2284 - { (exit 1); exit 1; }; }
2285 + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
2288 # There might be people who depend on the old broken behavior: `$host'
2289 @@ -1254,11 +1208,9 @@ test "$silent" = yes && exec 6>/dev/null
2290 ac_pwd=`pwd` && test -n "$ac_pwd" &&
2291 ac_ls_di=`ls -di .` &&
2292 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
2293 - { $as_echo "$as_me: error: working directory cannot be determined" >&2
2294 - { (exit 1); exit 1; }; }
2295 + as_fn_error "working directory cannot be determined"
2296 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
2297 - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
2298 - { (exit 1); exit 1; }; }
2299 + as_fn_error "pwd does not report name of working directory"
2302 # Find the source files, if location was not specified.
2303 @@ -1297,13 +1249,11 @@ else
2305 if test ! -r "$srcdir/$ac_unique_file"; then
2306 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
2307 - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
2308 - { (exit 1); exit 1; }; }
2309 + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
2311 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
2313 - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
2314 - { (exit 1); exit 1; }; }
2315 + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
2317 # When building in place, set srcdir=.
2318 if test "$ac_abs_confdir" = "$ac_pwd"; then
2319 @@ -1408,6 +1358,9 @@ Optional Features:
2320 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
2321 --disable-dependency-tracking speeds up one-time build
2322 --enable-dependency-tracking do not reject slow dependency extractors
2323 + --enable-crippled_boost enables use of boost without long file support.
2324 + don't report bugs or ask for help if working with
2325 + files bigger than 1.5GiB
2326 --enable-profile collects profile for gprof
2327 --enable-debug creates debug build
2329 @@ -1460,7 +1413,7 @@ Some influential environment variables:
2330 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
2331 nonstandard directory <lib dir>
2332 LIBS libraries to pass to the linker, e.g. -l<library>
2333 - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
2334 + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
2335 you have headers in a nonstandard directory <include dir>
2336 CC C compiler command
2337 CFLAGS C compiler flags
2338 @@ -1537,58 +1490,544 @@ test -n "$ac_init_help" && exit $ac_status
2339 if $ac_init_version; then
2341 FuseCompress configure 2.0
2342 -generated by GNU Autoconf 2.63
2343 +generated by GNU Autoconf 2.65
2345 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2346 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2347 +Copyright (C) 2009 Free Software Foundation, Inc.
2348 This configure script is free software; the Free Software Foundation
2349 gives unlimited permission to copy, distribute and modify it.
2353 -cat >config.log <<_ACEOF
2354 -This file contains any messages produced by compilers while
2355 -running configure, to aid debugging if configure makes a mistake.
2357 -It was created by FuseCompress $as_me 2.0, which was
2358 -generated by GNU Autoconf 2.63. Invocation command line was
2361 +## ------------------------ ##
2362 +## Autoconf initialization. ##
2363 +## ------------------------ ##
2367 +# ac_fn_cxx_try_compile LINENO
2368 +# ----------------------------
2369 +# Try to compile conftest.$ac_ext, and return whether this succeeded.
2370 +ac_fn_cxx_try_compile ()
2376 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2377 + rm -f conftest.$ac_objext
2378 + if { { ac_try="$ac_compile"
2379 +case "(($ac_try" in
2380 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2381 + *) ac_try_echo=$ac_try;;
2383 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2384 +$as_echo "$ac_try_echo"; } >&5
2385 + (eval "$ac_compile") 2>conftest.err
2387 + if test -s conftest.err; then
2388 + grep -v '^ *+' conftest.err >conftest.er1
2389 + cat conftest.er1 >&5
2390 + mv -f conftest.er1 conftest.err
2392 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2393 + test $ac_status = 0; } && {
2394 + test -z "$ac_cxx_werror_flag" ||
2395 + test ! -s conftest.err
2396 + } && test -s conftest.$ac_objext; then :
2399 + $as_echo "$as_me: failed program was:" >&5
2400 +sed 's/^/| /' conftest.$ac_ext >&5
2402 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
2403 -uname -m = `(uname -m) 2>/dev/null || echo unknown`
2404 -uname -r = `(uname -r) 2>/dev/null || echo unknown`
2405 -uname -s = `(uname -s) 2>/dev/null || echo unknown`
2406 -uname -v = `(uname -v) 2>/dev/null || echo unknown`
2409 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2410 + as_fn_set_status $ac_retval
2412 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
2413 -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
2414 +} # ac_fn_cxx_try_compile
2416 -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
2417 -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
2418 -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
2419 -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
2420 -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
2421 -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
2422 -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
2423 +# ac_fn_c_try_compile LINENO
2424 +# --------------------------
2425 +# Try to compile conftest.$ac_ext, and return whether this succeeded.
2426 +ac_fn_c_try_compile ()
2428 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2429 + rm -f conftest.$ac_objext
2430 + if { { ac_try="$ac_compile"
2431 +case "(($ac_try" in
2432 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2433 + *) ac_try_echo=$ac_try;;
2435 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2436 +$as_echo "$ac_try_echo"; } >&5
2437 + (eval "$ac_compile") 2>conftest.err
2439 + if test -s conftest.err; then
2440 + grep -v '^ *+' conftest.err >conftest.er1
2441 + cat conftest.er1 >&5
2442 + mv -f conftest.er1 conftest.err
2444 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2445 + test $ac_status = 0; } && {
2446 + test -z "$ac_c_werror_flag" ||
2447 + test ! -s conftest.err
2448 + } && test -s conftest.$ac_objext; then :
2451 + $as_echo "$as_me: failed program was:" >&5
2452 +sed 's/^/| /' conftest.$ac_ext >&5
2457 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2458 + as_fn_set_status $ac_retval
2460 +} # ac_fn_c_try_compile
2462 +# ac_fn_c_try_cpp LINENO
2463 +# ----------------------
2464 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
2467 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2468 + if { { ac_try="$ac_cpp conftest.$ac_ext"
2469 +case "(($ac_try" in
2470 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2471 + *) ac_try_echo=$ac_try;;
2473 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2474 +$as_echo "$ac_try_echo"; } >&5
2475 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
2477 + if test -s conftest.err; then
2478 + grep -v '^ *+' conftest.err >conftest.er1
2479 + cat conftest.er1 >&5
2480 + mv -f conftest.er1 conftest.err
2482 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2483 + test $ac_status = 0; } >/dev/null && {
2484 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2485 + test ! -s conftest.err
2489 + $as_echo "$as_me: failed program was:" >&5
2490 +sed 's/^/| /' conftest.$ac_ext >&5
2494 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2495 + as_fn_set_status $ac_retval
2497 +} # ac_fn_c_try_cpp
2499 +# ac_fn_cxx_try_link LINENO
2500 +# -------------------------
2501 +# Try to link conftest.$ac_ext, and return whether this succeeded.
2502 +ac_fn_cxx_try_link ()
2504 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2505 + rm -f conftest.$ac_objext conftest$ac_exeext
2506 + if { { ac_try="$ac_link"
2507 +case "(($ac_try" in
2508 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2509 + *) ac_try_echo=$ac_try;;
2511 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2512 +$as_echo "$ac_try_echo"; } >&5
2513 + (eval "$ac_link") 2>conftest.err
2515 + if test -s conftest.err; then
2516 + grep -v '^ *+' conftest.err >conftest.er1
2517 + cat conftest.er1 >&5
2518 + mv -f conftest.er1 conftest.err
2520 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2521 + test $ac_status = 0; } && {
2522 + test -z "$ac_cxx_werror_flag" ||
2523 + test ! -s conftest.err
2524 + } && test -s conftest$ac_exeext && {
2525 + test "$cross_compiling" = yes ||
2526 + $as_test_x conftest$ac_exeext
2530 + $as_echo "$as_me: failed program was:" >&5
2531 +sed 's/^/| /' conftest.$ac_ext >&5
2535 + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
2536 + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
2537 + # interfere with the next link command; also delete a directory that is
2538 + # left behind by Apple's compiler. We do this before executing the actions.
2539 + rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2540 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2541 + as_fn_set_status $ac_retval
2543 +} # ac_fn_cxx_try_link
2545 +# ac_fn_cxx_try_run LINENO
2546 +# ------------------------
2547 +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
2548 +# that executables *can* be run.
2549 +ac_fn_cxx_try_run ()
2551 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2552 + if { { ac_try="$ac_link"
2553 +case "(($ac_try" in
2554 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2555 + *) ac_try_echo=$ac_try;;
2557 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2558 +$as_echo "$ac_try_echo"; } >&5
2559 + (eval "$ac_link") 2>&5
2561 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2562 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
2563 + { { case "(($ac_try" in
2564 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2565 + *) ac_try_echo=$ac_try;;
2567 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2568 +$as_echo "$ac_try_echo"; } >&5
2569 + (eval "$ac_try") 2>&5
2571 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2572 + test $ac_status = 0; }; }; then :
2575 + $as_echo "$as_me: program exited with status $ac_status" >&5
2576 + $as_echo "$as_me: failed program was:" >&5
2577 +sed 's/^/| /' conftest.$ac_ext >&5
2579 + ac_retval=$ac_status
2581 + rm -rf conftest.dSYM conftest_ipa8_conftest.oo
2582 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2583 + as_fn_set_status $ac_retval
2585 +} # ac_fn_cxx_try_run
2587 +# ac_fn_cxx_try_cpp LINENO
2588 +# ------------------------
2589 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
2590 +ac_fn_cxx_try_cpp ()
2592 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2593 + if { { ac_try="$ac_cpp conftest.$ac_ext"
2594 +case "(($ac_try" in
2595 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2596 + *) ac_try_echo=$ac_try;;
2598 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2599 +$as_echo "$ac_try_echo"; } >&5
2600 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
2602 + if test -s conftest.err; then
2603 + grep -v '^ *+' conftest.err >conftest.er1
2604 + cat conftest.er1 >&5
2605 + mv -f conftest.er1 conftest.err
2607 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2608 + test $ac_status = 0; } >/dev/null && {
2609 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
2610 + test ! -s conftest.err
2614 + $as_echo "$as_me: failed program was:" >&5
2615 +sed 's/^/| /' conftest.$ac_ext >&5
2619 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2620 + as_fn_set_status $ac_retval
2622 +} # ac_fn_cxx_try_cpp
2624 +# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
2625 +# ---------------------------------------------------------
2626 +# Tests whether HEADER exists, giving a warning if it cannot be compiled using
2627 +# the include files in INCLUDES and setting the cache variable VAR
2629 +ac_fn_cxx_check_header_mongrel ()
2631 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2632 + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2633 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2634 +$as_echo_n "checking for $2... " >&6; }
2635 +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2636 + $as_echo_n "(cached) " >&6
2639 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2640 +$as_echo "$ac_res" >&6; }
2642 + # Is the header compilable?
2643 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
2644 +$as_echo_n "checking $2 usability... " >&6; }
2645 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2646 +/* end confdefs.h. */
2650 +if ac_fn_cxx_try_compile "$LINENO"; then :
2651 + ac_header_compiler=yes
2653 + ac_header_compiler=no
2655 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2656 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
2657 +$as_echo "$ac_header_compiler" >&6; }
2659 +# Is the header present?
2660 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
2661 +$as_echo_n "checking $2 presence... " >&6; }
2662 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2663 +/* end confdefs.h. */
2666 +if ac_fn_cxx_try_cpp "$LINENO"; then :
2667 + ac_header_preproc=yes
2669 + ac_header_preproc=no
2671 +rm -f conftest.err conftest.$ac_ext
2672 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
2673 +$as_echo "$ac_header_preproc" >&6; }
2675 +# So? What about this header?
2676 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
2678 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
2679 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
2680 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2681 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2684 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
2685 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
2686 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
2687 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
2688 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
2689 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2690 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
2691 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
2692 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2693 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2695 +## --------------------------------------- ##
2696 +## Report this to milan.svoboda@centrum.cz ##
2697 +## --------------------------------------- ##
2699 + ) | sed "s/^/$as_me: WARNING: /" >&2
2702 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2703 +$as_echo_n "checking for $2... " >&6; }
2704 +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2705 + $as_echo_n "(cached) " >&6
2707 + eval "$3=\$ac_header_compiler"
2710 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2711 +$as_echo "$ac_res" >&6; }
2713 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2715 +} # ac_fn_cxx_check_header_mongrel
2717 +# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
2718 +# ---------------------------------------------------------
2719 +# Tests whether HEADER exists and can be compiled using the include files in
2720 +# INCLUDES, setting the cache variable VAR accordingly.
2721 +ac_fn_cxx_check_header_compile ()
2723 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2724 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2725 +$as_echo_n "checking for $2... " >&6; }
2726 +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2727 + $as_echo_n "(cached) " >&6
2729 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2730 +/* end confdefs.h. */
2734 +if ac_fn_cxx_try_compile "$LINENO"; then :
2739 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2742 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2743 +$as_echo "$ac_res" >&6; }
2744 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2746 +} # ac_fn_cxx_check_header_compile
2748 +# ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES
2749 +# ---------------------------------------------
2750 +# Tests whether TYPE exists after having included INCLUDES, setting cache
2751 +# variable VAR accordingly.
2752 +ac_fn_cxx_check_type ()
2754 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2755 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2756 +$as_echo_n "checking for $2... " >&6; }
2757 +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2758 + $as_echo_n "(cached) " >&6
2761 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2762 +/* end confdefs.h. */
2773 +if ac_fn_cxx_try_compile "$LINENO"; then :
2774 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2775 +/* end confdefs.h. */
2786 +if ac_fn_cxx_try_compile "$LINENO"; then :
2791 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2793 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2796 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2797 +$as_echo "$ac_res" >&6; }
2798 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2800 +} # ac_fn_cxx_check_type
2802 +# ac_fn_cxx_check_func LINENO FUNC VAR
2803 +# ------------------------------------
2804 +# Tests whether FUNC exists, setting the cache variable VAR accordingly
2805 +ac_fn_cxx_check_func ()
2807 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2808 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2809 +$as_echo_n "checking for $2... " >&6; }
2810 +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2811 + $as_echo_n "(cached) " >&6
2813 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2814 +/* end confdefs.h. */
2815 +/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
2816 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
2817 +#define $2 innocuous_$2
2819 +/* System header to define __stub macros and hopefully few prototypes,
2820 + which can conflict with char $2 (); below.
2821 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
2822 + <limits.h> exists even on freestanding compilers. */
2825 +# include <limits.h>
2827 +# include <assert.h>
2832 +/* Override any GCC internal prototype to avoid an error.
2833 + Use char because int might match the return type of a GCC
2834 + builtin and then its argument prototype would still apply. */
2839 +/* The GNU C library defines this for functions which it implements
2840 + to always fail with ENOSYS. Some functions are actually named
2841 + something starting with __ and the normal name is an alias. */
2842 +#if defined __stub_$2 || defined __stub___$2
2854 +if ac_fn_cxx_try_link "$LINENO"; then :
2859 +rm -f core conftest.err conftest.$ac_objext \
2860 + conftest$ac_exeext conftest.$ac_ext
2863 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2864 +$as_echo "$ac_res" >&6; }
2865 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
2867 +} # ac_fn_cxx_check_func
2868 +cat >config.log <<_ACEOF
2869 +This file contains any messages produced by compilers while
2870 +running configure, to aid debugging if configure makes a mistake.
2872 +It was created by FuseCompress $as_me 2.0, which was
2873 +generated by GNU Autoconf 2.65. Invocation command line was
2885 +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
2886 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
2887 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
2888 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
2889 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
2891 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
2892 +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
2894 +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
2895 +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
2896 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
2897 +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
2898 +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
2899 +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
2900 +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
2904 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2908 test -z "$as_dir" && as_dir=.
2909 - $as_echo "PATH: $as_dir"
2911 + $as_echo "PATH: $as_dir"
2916 @@ -1625,9 +2064,9 @@ do
2917 ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
2920 - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
2921 + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2923 - ac_configure_args1="$ac_configure_args1 '$ac_arg'"
2924 + as_fn_append ac_configure_args1 " '$ac_arg'"
2925 if test $ac_must_keep_next = true; then
2926 ac_must_keep_next=false # Got value, back to normal.
2928 @@ -1643,13 +2082,13 @@ do
2929 -* ) ac_must_keep_next=true ;;
2932 - ac_configure_args="$ac_configure_args '$ac_arg'"
2933 + as_fn_append ac_configure_args " '$ac_arg'"
2938 -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
2939 -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
2940 +{ ac_configure_args0=; unset ac_configure_args0;}
2941 +{ ac_configure_args1=; unset ac_configure_args1;}
2943 # When interrupted or exit'd, cleanup temporary files, and complete
2944 # config.log. We remove comments because anyway the quotes in there
2945 @@ -1674,13 +2113,13 @@ _ASBOX
2949 - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
2950 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
2951 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2954 _ | IFS | as_nl) ;; #(
2955 BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
2956 - *) $as_unset $ac_var ;;
2957 + *) { eval $ac_var=; unset $ac_var;} ;;
2961 @@ -1752,39 +2191,41 @@ _ASBOX
2964 for ac_signal in 1 2 13 15; do
2965 - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
2966 + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
2970 # confdefs.h avoids OS command line length limits that DEFS can exceed.
2971 rm -f -r conftest* confdefs.h
2973 +$as_echo "/* confdefs.h */" > confdefs.h
2975 # Predefined preprocessor variables.
2977 cat >>confdefs.h <<_ACEOF
2978 #define PACKAGE_NAME "$PACKAGE_NAME"
2982 cat >>confdefs.h <<_ACEOF
2983 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
2987 cat >>confdefs.h <<_ACEOF
2988 #define PACKAGE_VERSION "$PACKAGE_VERSION"
2992 cat >>confdefs.h <<_ACEOF
2993 #define PACKAGE_STRING "$PACKAGE_STRING"
2997 cat >>confdefs.h <<_ACEOF
2998 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
3001 +cat >>confdefs.h <<_ACEOF
3002 +#define PACKAGE_URL "$PACKAGE_URL"
3006 # Let the site file select an alternate cache file if it wants to.
3007 # Prefer an explicitly selected file to automatically selected ones.
3008 @@ -1802,8 +2243,8 @@ fi
3009 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
3011 test "x$ac_site_file" = xNONE && continue
3012 - if test -r "$ac_site_file"; then
3013 - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
3014 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
3015 + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
3016 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
3017 sed 's/^/| /' "$ac_site_file" >&5
3019 @@ -1811,10 +2252,10 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
3022 if test -r "$cache_file"; then
3023 - # Some versions of bash will fail to source /dev/null (special
3024 - # files actually), so we avoid doing that.
3025 - if test -f "$cache_file"; then
3026 - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
3027 + # Some versions of bash will fail to source /dev/null (special files
3028 + # actually), so we avoid doing that. DJGPP emulates it as a regular file.
3029 + if test /dev/null != "$cache_file" && test -f "$cache_file"; then
3030 + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
3031 $as_echo "$as_me: loading cache $cache_file" >&6;}
3033 [\\/]* | ?:[\\/]* ) . "$cache_file";;
3034 @@ -1822,12 +2263,12 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
3038 - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
3039 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
3040 $as_echo "$as_me: creating cache $cache_file" >&6;}
3044 -ac_header_list="$ac_header_list utime.h"
3045 +as_fn_append ac_header_list " utime.h"
3046 # Check that the precious variables saved in the cache have kept the same
3048 ac_cache_corrupted=false
3049 @@ -1838,11 +2279,11 @@ for ac_var in $ac_precious_vars; do
3050 eval ac_new_val=\$ac_env_${ac_var}_value
3051 case $ac_old_set,$ac_new_set in
3053 - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
3054 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
3055 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
3056 ac_cache_corrupted=: ;;
3058 - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
3059 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
3060 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
3061 ac_cache_corrupted=: ;;
3063 @@ -1852,17 +2293,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
3064 ac_old_val_w=`echo x $ac_old_val`
3065 ac_new_val_w=`echo x $ac_new_val`
3066 if test "$ac_old_val_w" != "$ac_new_val_w"; then
3067 - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
3068 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
3069 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
3070 ac_cache_corrupted=:
3072 - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
3073 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
3074 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
3075 eval $ac_var=\$ac_old_val
3077 - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
3078 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
3079 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
3080 - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
3081 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
3082 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
3085 @@ -1874,74 +2315,43 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
3087 case " $ac_configure_args " in
3088 *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
3089 - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
3090 + *) as_fn_append ac_configure_args " '$ac_arg'" ;;
3094 if $ac_cache_corrupted; then
3095 - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3096 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3097 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3098 - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
3099 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
3100 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
3101 - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
3102 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
3103 - { (exit 1); exit 1; }; }
3104 + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
3106 +## -------------------- ##
3107 +## Main body of script. ##
3108 +## -------------------- ##
3111 +ac_cpp='$CPP $CPPFLAGS'
3112 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3113 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3114 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
3117 +am__api_version='1.11'
3141 -ac_cpp='$CPP $CPPFLAGS'
3142 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3143 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3144 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
3147 -am__api_version='1.10'
3150 -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
3151 - if test -f "$ac_dir/install-sh"; then
3152 - ac_aux_dir=$ac_dir
3153 - ac_install_sh="$ac_aux_dir/install-sh -c"
3155 - elif test -f "$ac_dir/install.sh"; then
3156 - ac_aux_dir=$ac_dir
3157 - ac_install_sh="$ac_aux_dir/install.sh -c"
3159 - elif test -f "$ac_dir/shtool"; then
3160 - ac_aux_dir=$ac_dir
3161 - ac_install_sh="$ac_aux_dir/shtool install -c"
3165 -if test -z "$ac_aux_dir"; then
3166 - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
3167 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
3168 - { (exit 1); exit 1; }; }
3171 +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
3172 + for ac_t in install-sh install.sh shtool; do
3173 + if test -f "$ac_dir/$ac_t"; then
3174 + ac_aux_dir=$ac_dir
3175 + ac_install_sh="$ac_aux_dir/$ac_t -c"
3180 +if test -z "$ac_aux_dir"; then
3181 + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
3184 # These three variables are undocumented and unsupported,
3185 # and are intended to be withdrawn in a future Autoconf release.
3186 @@ -1966,10 +2376,10 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
3187 # OS/2's system install, which has a completely different semantic
3188 # ./install, which can be erroneously created by make from ./install.sh.
3189 # Reject install programs that cannot install multiple files.
3190 -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
3191 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
3192 $as_echo_n "checking for a BSD-compatible install... " >&6; }
3193 if test -z "$INSTALL"; then
3194 -if test "${ac_cv_path_install+set}" = set; then
3195 +if test "${ac_cv_path_install+set}" = set; then :
3196 $as_echo_n "(cached) " >&6
3198 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3199 @@ -1977,11 +2387,11 @@ for as_dir in $PATH
3202 test -z "$as_dir" && as_dir=.
3203 - # Account for people who put trailing slashes in PATH elements.
3205 - ./ | .// | /cC/* | \
3206 + # Account for people who put trailing slashes in PATH elements.
3207 +case $as_dir/ in #((
3208 + ./ | .// | /[cC]/* | \
3209 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
3210 - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
3211 + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
3214 # OSF1 and SCO ODT 3.0 have their own names for install.
3215 @@ -2018,7 +2428,7 @@ case $as_dir/ in
3223 rm -rf conftest.one conftest.two conftest.dir
3224 @@ -2034,7 +2444,7 @@ fi
3225 INSTALL=$ac_install_sh
3228 -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
3229 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
3230 $as_echo "$INSTALL" >&6; }
3232 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
3233 @@ -2045,21 +2455,34 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
3235 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
3237 -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
3238 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
3239 $as_echo_n "checking whether build environment is sane... " >&6; }
3242 echo timestamp > conftest.file
3243 +# Reject unsafe characters in $srcdir or the absolute working directory
3244 +# name. Accept space and tab only in the latter.
3248 + *[\\\"\#\$\&\'\`$am_lf]*)
3249 + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
3252 + *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
3253 + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
3256 # Do `set' in a subshell so we don't clobber the current shell's
3257 # arguments. Must try -L first in case configure is actually a
3258 # symlink; some systems play weird games with the mod time of symlinks
3259 # (eg FreeBSD returns the mod time of the symlink's containing
3262 - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
3263 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3264 if test "$*" = "X"; then
3266 - set X `ls -t $srcdir/configure conftest.file`
3267 + set X `ls -t "$srcdir/configure" conftest.file`
3270 if test "$*" != "X $srcdir/configure conftest.file" \
3271 @@ -2069,11 +2492,8 @@ if (
3272 # if, for instance, CONFIG_SHELL is bash and it inherits a
3273 # broken ls alias from the environment. This has actually
3274 # happened. Such a system could not be considered "sane".
3275 - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
3276 -alias in your environment" >&5
3277 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
3278 -alias in your environment" >&2;}
3279 - { (exit 1); exit 1; }; }
3280 + as_fn_error "ls -t appears to fail. Make sure there is not a broken
3281 +alias in your environment" "$LINENO" 5
3284 test "$2" = conftest.file
3285 @@ -2082,13 +2502,10 @@ then
3289 - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
3290 -Check your system clock" >&5
3291 -$as_echo "$as_me: error: newly created file is older than distributed files!
3292 -Check your system clock" >&2;}
3293 - { (exit 1); exit 1; }; }
3294 + as_fn_error "newly created file is older than distributed files!
3295 +Check your system clock" "$LINENO" 5
3297 -{ $as_echo "$as_me:$LINENO: result: yes" >&5
3298 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3299 $as_echo "yes" >&6; }
3300 test "$program_prefix" != NONE &&
3301 program_transform_name="s&^&$program_prefix&;$program_transform_name"
3302 @@ -2103,20 +2520,136 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
3303 # expand $ac_aux_dir to an absolute path
3304 am_aux_dir=`cd $ac_aux_dir && pwd`
3306 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
3307 +if test x"${MISSING+set}" != xset; then
3308 + case $am_aux_dir in
3310 + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
3312 + MISSING="\${SHELL} $am_aux_dir/missing" ;;
3315 # Use eval to expand $SHELL
3316 if eval "$MISSING --run true"; then
3317 am_missing_run="$MISSING --run "
3320 - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
3321 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
3322 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
3325 -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
3326 +if test x"${install_sh}" != xset; then
3327 + case $am_aux_dir in
3329 + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
3331 + install_sh="\${SHELL} $am_aux_dir/install-sh"
3335 +# Installed binaries are usually stripped using `strip' when the user
3336 +# run `make install-strip'. However `strip' might not be the right
3337 +# tool to use in cross-compilation environments, therefore Automake
3338 +# will honor the `STRIP' environment variable to overrule this program.
3339 +if test "$cross_compiling" != no; then
3340 + if test -n "$ac_tool_prefix"; then
3341 + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
3342 +set dummy ${ac_tool_prefix}strip; ac_word=$2
3343 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3344 +$as_echo_n "checking for $ac_word... " >&6; }
3345 +if test "${ac_cv_prog_STRIP+set}" = set; then :
3346 + $as_echo_n "(cached) " >&6
3348 + if test -n "$STRIP"; then
3349 + ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
3351 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3352 +for as_dir in $PATH
3355 + test -z "$as_dir" && as_dir=.
3356 + for ac_exec_ext in '' $ac_executable_extensions; do
3357 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3358 + ac_cv_prog_STRIP="${ac_tool_prefix}strip"
3359 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3368 +STRIP=$ac_cv_prog_STRIP
3369 +if test -n "$STRIP"; then
3370 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
3371 +$as_echo "$STRIP" >&6; }
3373 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3374 +$as_echo "no" >&6; }
3379 +if test -z "$ac_cv_prog_STRIP"; then
3380 + ac_ct_STRIP=$STRIP
3381 + # Extract the first word of "strip", so it can be a program name with args.
3382 +set dummy strip; ac_word=$2
3383 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3384 +$as_echo_n "checking for $ac_word... " >&6; }
3385 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
3386 + $as_echo_n "(cached) " >&6
3388 + if test -n "$ac_ct_STRIP"; then
3389 + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
3391 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3392 +for as_dir in $PATH
3395 + test -z "$as_dir" && as_dir=.
3396 + for ac_exec_ext in '' $ac_executable_extensions; do
3397 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3398 + ac_cv_prog_ac_ct_STRIP="strip"
3399 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3408 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
3409 +if test -n "$ac_ct_STRIP"; then
3410 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
3411 +$as_echo "$ac_ct_STRIP" >&6; }
3413 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3414 +$as_echo "no" >&6; }
3417 + if test "x$ac_ct_STRIP" = x; then
3420 + case $cross_compiling:$ac_tool_warned in
3422 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3423 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3424 +ac_tool_warned=yes ;;
3426 + STRIP=$ac_ct_STRIP
3429 + STRIP="$ac_cv_prog_STRIP"
3433 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
3435 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
3436 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
3437 if test -z "$MKDIR_P"; then
3438 - if test "${ac_cv_path_mkdir+set}" = set; then
3439 + if test "${ac_cv_path_mkdir+set}" = set; then :
3440 $as_echo_n "(cached) " >&6
3442 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3443 @@ -2124,7 +2657,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
3446 test -z "$as_dir" && as_dir=.
3447 - for ac_prog in mkdir gmkdir; do
3448 + for ac_prog in mkdir gmkdir; do
3449 for ac_exec_ext in '' $ac_executable_extensions; do
3450 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
3451 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
3452 @@ -2136,11 +2669,12 @@ do
3462 + test -d ./--version && rmdir ./--version
3463 if test "${ac_cv_path_mkdir+set}" = set; then
3464 MKDIR_P="$ac_cv_path_mkdir -p"
3466 @@ -2148,11 +2682,10 @@ fi
3467 # value for MKDIR_P within a source directory, because that will
3468 # break other packages using the cache if that directory is
3469 # removed, or if the value is a relative name.
3470 - test -d ./--version && rmdir ./--version
3471 MKDIR_P="$ac_install_sh -d"
3474 -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
3475 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
3476 $as_echo "$MKDIR_P" >&6; }
3479 @@ -2165,9 +2698,9 @@ for ac_prog in gawk mawk nawk awk
3481 # Extract the first word of "$ac_prog", so it can be a program name with args.
3482 set dummy $ac_prog; ac_word=$2
3483 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3484 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3485 $as_echo_n "checking for $ac_word... " >&6; }
3486 -if test "${ac_cv_prog_AWK+set}" = set; then
3487 +if test "${ac_cv_prog_AWK+set}" = set; then :
3488 $as_echo_n "(cached) " >&6
3490 if test -n "$AWK"; then
3491 @@ -2178,24 +2711,24 @@ for as_dir in $PATH
3494 test -z "$as_dir" && as_dir=.
3495 - for ac_exec_ext in '' $ac_executable_extensions; do
3496 + for ac_exec_ext in '' $ac_executable_extensions; do
3497 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3498 ac_cv_prog_AWK="$ac_prog"
3499 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3500 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3511 if test -n "$AWK"; then
3512 - { $as_echo "$as_me:$LINENO: result: $AWK" >&5
3513 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
3514 $as_echo "$AWK" >&6; }
3516 - { $as_echo "$as_me:$LINENO: result: no" >&5
3517 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3518 $as_echo "no" >&6; }
3521 @@ -2203,11 +2736,11 @@ fi
3522 test -n "$AWK" && break
3525 -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
3526 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
3527 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
3529 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
3530 -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
3531 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
3532 $as_echo_n "(cached) " >&6
3534 cat >conftest.make <<\_ACEOF
3535 @@ -2225,11 +2758,11 @@ esac
3538 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
3539 - { $as_echo "$as_me:$LINENO: result: yes" >&5
3540 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3541 $as_echo "yes" >&6; }
3544 - { $as_echo "$as_me:$LINENO: result: no" >&5
3545 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3546 $as_echo "no" >&6; }
3547 SET_MAKE="MAKE=${MAKE-make}"
3549 @@ -2249,9 +2782,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
3550 am__isrc=' -I$(srcdir)'
3551 # test to see if srcdir already configured
3552 if test -f $srcdir/config.status; then
3553 - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
3554 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
3555 - { (exit 1); exit 1; }; }
3556 + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
3560 @@ -2295,108 +2826,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
3562 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3564 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
3566 -# Installed binaries are usually stripped using `strip' when the user
3567 -# run `make install-strip'. However `strip' might not be the right
3568 -# tool to use in cross-compilation environments, therefore Automake
3569 -# will honor the `STRIP' environment variable to overrule this program.
3570 -if test "$cross_compiling" != no; then
3571 - if test -n "$ac_tool_prefix"; then
3572 - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
3573 -set dummy ${ac_tool_prefix}strip; ac_word=$2
3574 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3575 -$as_echo_n "checking for $ac_word... " >&6; }
3576 -if test "${ac_cv_prog_STRIP+set}" = set; then
3577 - $as_echo_n "(cached) " >&6
3579 - if test -n "$STRIP"; then
3580 - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
3582 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3583 -for as_dir in $PATH
3586 - test -z "$as_dir" && as_dir=.
3587 - for ac_exec_ext in '' $ac_executable_extensions; do
3588 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3589 - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
3590 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3599 -STRIP=$ac_cv_prog_STRIP
3600 -if test -n "$STRIP"; then
3601 - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
3602 -$as_echo "$STRIP" >&6; }
3604 - { $as_echo "$as_me:$LINENO: result: no" >&5
3605 -$as_echo "no" >&6; }
3610 -if test -z "$ac_cv_prog_STRIP"; then
3611 - ac_ct_STRIP=$STRIP
3612 - # Extract the first word of "strip", so it can be a program name with args.
3613 -set dummy strip; ac_word=$2
3614 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3615 -$as_echo_n "checking for $ac_word... " >&6; }
3616 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
3617 - $as_echo_n "(cached) " >&6
3619 - if test -n "$ac_ct_STRIP"; then
3620 - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
3622 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3623 -for as_dir in $PATH
3626 - test -z "$as_dir" && as_dir=.
3627 - for ac_exec_ext in '' $ac_executable_extensions; do
3628 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3629 - ac_cv_prog_ac_ct_STRIP="strip"
3630 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3639 -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
3640 -if test -n "$ac_ct_STRIP"; then
3641 - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
3642 -$as_echo "$ac_ct_STRIP" >&6; }
3644 - { $as_echo "$as_me:$LINENO: result: no" >&5
3645 -$as_echo "no" >&6; }
3648 - if test "x$ac_ct_STRIP" = x; then
3651 - case $cross_compiling:$ac_tool_warned in
3653 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3654 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3655 -ac_tool_warned=yes ;;
3657 - STRIP=$ac_ct_STRIP
3660 - STRIP="$ac_cv_prog_STRIP"
3664 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
3666 # We need awk for the "check" target. The system "awk" is bad on
3668 # Always define AMTAR for backward compatibility.
3669 @@ -2436,9 +2865,9 @@ if test -z "$CXX"; then
3671 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3672 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3673 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3674 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3675 $as_echo_n "checking for $ac_word... " >&6; }
3676 -if test "${ac_cv_prog_CXX+set}" = set; then
3677 +if test "${ac_cv_prog_CXX+set}" = set; then :
3678 $as_echo_n "(cached) " >&6
3680 if test -n "$CXX"; then
3681 @@ -2449,24 +2878,24 @@ for as_dir in $PATH
3684 test -z "$as_dir" && as_dir=.
3685 - for ac_exec_ext in '' $ac_executable_extensions; do
3686 + for ac_exec_ext in '' $ac_executable_extensions; do
3687 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3688 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
3689 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3690 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3701 if test -n "$CXX"; then
3702 - { $as_echo "$as_me:$LINENO: result: $CXX" >&5
3703 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
3704 $as_echo "$CXX" >&6; }
3706 - { $as_echo "$as_me:$LINENO: result: no" >&5
3707 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3708 $as_echo "no" >&6; }
3711 @@ -2480,9 +2909,9 @@ if test -z "$CXX"; then
3713 # Extract the first word of "$ac_prog", so it can be a program name with args.
3714 set dummy $ac_prog; ac_word=$2
3715 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
3716 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3717 $as_echo_n "checking for $ac_word... " >&6; }
3718 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
3719 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
3720 $as_echo_n "(cached) " >&6
3722 if test -n "$ac_ct_CXX"; then
3723 @@ -2493,24 +2922,24 @@ for as_dir in $PATH
3726 test -z "$as_dir" && as_dir=.
3727 - for ac_exec_ext in '' $ac_executable_extensions; do
3728 + for ac_exec_ext in '' $ac_executable_extensions; do
3729 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3730 ac_cv_prog_ac_ct_CXX="$ac_prog"
3731 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3732 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3742 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
3743 if test -n "$ac_ct_CXX"; then
3744 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
3745 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
3746 $as_echo "$ac_ct_CXX" >&6; }
3748 - { $as_echo "$as_me:$LINENO: result: no" >&5
3749 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3750 $as_echo "no" >&6; }
3753 @@ -2523,7 +2952,7 @@ done
3755 case $cross_compiling:$ac_tool_warned in
3757 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
3758 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3759 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3760 ac_tool_warned=yes ;;
3762 @@ -2534,48 +2963,31 @@ fi
3765 # Provide some information about the compiler.
3766 -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
3767 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
3770 -{ (ac_try="$ac_compiler --version >&5"
3771 -case "(($ac_try" in
3772 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3773 - *) ac_try_echo=$ac_try;;
3775 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3776 -$as_echo "$ac_try_echo") >&5
3777 - (eval "$ac_compiler --version >&5") 2>&5
3779 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3780 - (exit $ac_status); }
3781 -{ (ac_try="$ac_compiler -v >&5"
3782 -case "(($ac_try" in
3783 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3784 - *) ac_try_echo=$ac_try;;
3786 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3787 -$as_echo "$ac_try_echo") >&5
3788 - (eval "$ac_compiler -v >&5") 2>&5
3790 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3791 - (exit $ac_status); }
3792 -{ (ac_try="$ac_compiler -V >&5"
3793 +for ac_option in --version -v -V -qversion; do
3794 + { { ac_try="$ac_compiler $ac_option >&5"
3796 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3797 *) ac_try_echo=$ac_try;;
3799 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3800 -$as_echo "$ac_try_echo") >&5
3801 - (eval "$ac_compiler -V >&5") 2>&5
3802 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3803 +$as_echo "$ac_try_echo"; } >&5
3804 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err
3806 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3807 - (exit $ac_status); }
3808 + if test -s conftest.err; then
3810 +... rest of stderr output deleted ...
3811 + 10q' conftest.err >conftest.er1
3812 + cat conftest.er1 >&5
3814 + rm -f conftest.er1 conftest.err
3815 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3816 + test $ac_status = 0; }
3819 -cat >conftest.$ac_ext <<_ACEOF
3822 -cat confdefs.h >>conftest.$ac_ext
3823 -cat >>conftest.$ac_ext <<_ACEOF
3824 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3825 /* end confdefs.h. */
3828 @@ -2591,8 +3003,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
3829 # Try to create an executable without -o first, disregard a.out.
3830 # It will help us diagnose broken compilers, and finding out an intuition
3832 -{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
3833 -$as_echo_n "checking for C++ compiler default output file name... " >&6; }
3834 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
3835 +$as_echo_n "checking whether the C++ compiler works... " >&6; }
3836 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
3838 # The possible output files:
3839 @@ -2608,17 +3020,17 @@ do
3843 -if { (ac_try="$ac_link_default"
3844 +if { { ac_try="$ac_link_default"
3846 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3847 *) ac_try_echo=$ac_try;;
3849 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3850 -$as_echo "$ac_try_echo") >&5
3851 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3852 +$as_echo "$ac_try_echo"; } >&5
3853 (eval "$ac_link_default") 2>&5
3855 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3856 - (exit $ac_status); }; then
3857 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3858 + test $ac_status = 0; }; then :
3859 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
3860 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
3861 # in a Makefile. We should not override ac_cv_exeext if it was cached,
3862 @@ -2635,7 +3047,7 @@ do
3866 - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
3867 + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
3869 ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
3871 @@ -2654,84 +3066,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
3875 +if test -z "$ac_file"; then :
3876 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3877 +$as_echo "no" >&6; }
3878 +$as_echo "$as_me: failed program was:" >&5
3879 +sed 's/^/| /' conftest.$ac_ext >&5
3881 -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
3882 -$as_echo "$ac_file" >&6; }
3883 -if test -z "$ac_file"; then
3884 - $as_echo "$as_me: failed program was:" >&5
3885 -sed 's/^/| /' conftest.$ac_ext >&5
3887 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3888 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3889 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3890 -{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
3891 -See \`config.log' for more details." >&5
3892 -$as_echo "$as_me: error: C++ compiler cannot create executables
3893 -See \`config.log' for more details." >&2;}
3894 - { (exit 77); exit 77; }; }; }
3895 +{ as_fn_set_status 77
3896 +as_fn_error "C++ compiler cannot create executables
3897 +See \`config.log' for more details." "$LINENO" 5; }; }
3899 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3900 +$as_echo "yes" >&6; }
3903 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
3904 +$as_echo_n "checking for C++ compiler default output file name... " >&6; }
3905 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
3906 +$as_echo "$ac_file" >&6; }
3907 ac_exeext=$ac_cv_exeext
3909 -# Check that the compiler produces executables we can run. If not, either
3910 -# the compiler is broken, or we cross compile.
3911 -{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
3912 -$as_echo_n "checking whether the C++ compiler works... " >&6; }
3913 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
3914 -# If not cross compiling, check that we can run a simple program.
3915 -if test "$cross_compiling" != yes; then
3916 - if { ac_try='./$ac_file'
3917 - { (case "(($ac_try" in
3918 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3919 - *) ac_try_echo=$ac_try;;
3921 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3922 -$as_echo "$ac_try_echo") >&5
3923 - (eval "$ac_try") 2>&5
3925 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3926 - (exit $ac_status); }; }; then
3927 - cross_compiling=no
3929 - if test "$cross_compiling" = maybe; then
3930 - cross_compiling=yes
3932 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3933 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3934 -{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
3935 -If you meant to cross compile, use \`--host'.
3936 -See \`config.log' for more details." >&5
3937 -$as_echo "$as_me: error: cannot run C++ compiled programs.
3938 -If you meant to cross compile, use \`--host'.
3939 -See \`config.log' for more details." >&2;}
3940 - { (exit 1); exit 1; }; }; }
3944 -{ $as_echo "$as_me:$LINENO: result: yes" >&5
3945 -$as_echo "yes" >&6; }
3947 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
3948 ac_clean_files=$ac_clean_files_save
3949 -# Check that the compiler produces executables we can run. If not, either
3950 -# the compiler is broken, or we cross compile.
3951 -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
3952 -$as_echo_n "checking whether we are cross compiling... " >&6; }
3953 -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
3954 -$as_echo "$cross_compiling" >&6; }
3956 -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
3957 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
3958 $as_echo_n "checking for suffix of executables... " >&6; }
3959 -if { (ac_try="$ac_link"
3960 +if { { ac_try="$ac_link"
3962 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3963 *) ac_try_echo=$ac_try;;
3965 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3966 -$as_echo "$ac_try_echo") >&5
3967 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3968 +$as_echo "$ac_try_echo"; } >&5
3969 (eval "$ac_link") 2>&5
3971 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3972 - (exit $ac_status); }; then
3973 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3974 + test $ac_status = 0; }; then :
3975 # If both `conftest.exe' and `conftest' are `present' (well, observable)
3976 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
3977 # work properly (i.e., refer to `conftest.exe'), while it won't with
3978 @@ -2746,32 +3116,83 @@ for ac_file in conftest.exe conftest conftest.*; do
3982 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3983 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3984 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3985 -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
3986 -See \`config.log' for more details." >&5
3987 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
3988 -See \`config.log' for more details." >&2;}
3989 - { (exit 1); exit 1; }; }; }
3990 +as_fn_error "cannot compute suffix of executables: cannot compile and link
3991 +See \`config.log' for more details." "$LINENO" 5; }
3994 -rm -f conftest$ac_cv_exeext
3995 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
3996 +rm -f conftest conftest$ac_cv_exeext
3997 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
3998 $as_echo "$ac_cv_exeext" >&6; }
4000 rm -f conftest.$ac_ext
4001 EXEEXT=$ac_cv_exeext
4003 -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
4004 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4005 +/* end confdefs.h. */
4010 +FILE *f = fopen ("conftest.out", "w");
4011 + return ferror (f) || fclose (f) != 0;
4017 +ac_clean_files="$ac_clean_files conftest.out"
4018 +# Check that the compiler produces executables we can run. If not, either
4019 +# the compiler is broken, or we cross compile.
4020 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
4021 +$as_echo_n "checking whether we are cross compiling... " >&6; }
4022 +if test "$cross_compiling" != yes; then
4023 + { { ac_try="$ac_link"
4024 +case "(($ac_try" in
4025 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4026 + *) ac_try_echo=$ac_try;;
4028 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4029 +$as_echo "$ac_try_echo"; } >&5
4030 + (eval "$ac_link") 2>&5
4032 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4033 + test $ac_status = 0; }
4034 + if { ac_try='./conftest$ac_cv_exeext'
4035 + { { case "(($ac_try" in
4036 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4037 + *) ac_try_echo=$ac_try;;
4039 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4040 +$as_echo "$ac_try_echo"; } >&5
4041 + (eval "$ac_try") 2>&5
4043 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4044 + test $ac_status = 0; }; }; then
4045 + cross_compiling=no
4047 + if test "$cross_compiling" = maybe; then
4048 + cross_compiling=yes
4050 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4051 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4052 +as_fn_error "cannot run C++ compiled programs.
4053 +If you meant to cross compile, use \`--host'.
4054 +See \`config.log' for more details." "$LINENO" 5; }
4058 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
4059 +$as_echo "$cross_compiling" >&6; }
4061 +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
4062 +ac_clean_files=$ac_clean_files_save
4063 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
4064 $as_echo_n "checking for suffix of object files... " >&6; }
4065 -if test "${ac_cv_objext+set}" = set; then
4066 +if test "${ac_cv_objext+set}" = set; then :
4067 $as_echo_n "(cached) " >&6
4069 - cat >conftest.$ac_ext <<_ACEOF
4072 -cat confdefs.h >>conftest.$ac_ext
4073 -cat >>conftest.$ac_ext <<_ACEOF
4074 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4075 /* end confdefs.h. */
4078 @@ -2783,17 +3204,17 @@ main ()
4081 rm -f conftest.o conftest.obj
4082 -if { (ac_try="$ac_compile"
4083 +if { { ac_try="$ac_compile"
4085 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4086 *) ac_try_echo=$ac_try;;
4088 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4089 -$as_echo "$ac_try_echo") >&5
4090 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4091 +$as_echo "$ac_try_echo"; } >&5
4092 (eval "$ac_compile") 2>&5
4094 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4095 - (exit $ac_status); }; then
4096 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4097 + test $ac_status = 0; }; then :
4098 for ac_file in conftest.o conftest.obj conftest.*; do
4099 test -f "$ac_file" || continue;
4101 @@ -2806,31 +3227,23 @@ else
4102 $as_echo "$as_me: failed program was:" >&5
4103 sed 's/^/| /' conftest.$ac_ext >&5
4105 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
4106 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4107 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4108 -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
4109 -See \`config.log' for more details." >&5
4110 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
4111 -See \`config.log' for more details." >&2;}
4112 - { (exit 1); exit 1; }; }; }
4113 +as_fn_error "cannot compute suffix of object files: cannot compile
4114 +See \`config.log' for more details." "$LINENO" 5; }
4117 rm -f conftest.$ac_cv_objext conftest.$ac_ext
4119 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
4120 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
4121 $as_echo "$ac_cv_objext" >&6; }
4122 OBJEXT=$ac_cv_objext
4124 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
4125 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
4126 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
4127 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
4128 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
4129 $as_echo_n "(cached) " >&6
4131 - cat >conftest.$ac_ext <<_ACEOF
4134 -cat confdefs.h >>conftest.$ac_ext
4135 -cat >>conftest.$ac_ext <<_ACEOF
4136 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4137 /* end confdefs.h. */
4140 @@ -2844,37 +3257,16 @@ main ()
4144 -rm -f conftest.$ac_objext
4145 -if { (ac_try="$ac_compile"
4146 -case "(($ac_try" in
4147 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4148 - *) ac_try_echo=$ac_try;;
4150 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4151 -$as_echo "$ac_try_echo") >&5
4152 - (eval "$ac_compile") 2>conftest.er1
4154 - grep -v '^ *+' conftest.er1 >conftest.err
4155 - rm -f conftest.er1
4156 - cat conftest.err >&5
4157 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4158 - (exit $ac_status); } && {
4159 - test -z "$ac_cxx_werror_flag" ||
4160 - test ! -s conftest.err
4161 - } && test -s conftest.$ac_objext; then
4162 +if ac_fn_cxx_try_compile "$LINENO"; then :
4165 - $as_echo "$as_me: failed program was:" >&5
4166 -sed 's/^/| /' conftest.$ac_ext >&5
4168 - ac_compiler_gnu=no
4169 + ac_compiler_gnu=no
4172 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4173 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
4176 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
4177 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
4178 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
4179 if test $ac_compiler_gnu = yes; then
4181 @@ -2883,20 +3275,16 @@ else
4183 ac_test_CXXFLAGS=${CXXFLAGS+set}
4184 ac_save_CXXFLAGS=$CXXFLAGS
4185 -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
4186 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
4187 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
4188 -if test "${ac_cv_prog_cxx_g+set}" = set; then
4189 +if test "${ac_cv_prog_cxx_g+set}" = set; then :
4190 $as_echo_n "(cached) " >&6
4192 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
4193 ac_cxx_werror_flag=yes
4196 - cat >conftest.$ac_ext <<_ACEOF
4199 -cat confdefs.h >>conftest.$ac_ext
4200 -cat >>conftest.$ac_ext <<_ACEOF
4201 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4202 /* end confdefs.h. */
4205 @@ -2907,35 +3295,11 @@ main ()
4209 -rm -f conftest.$ac_objext
4210 -if { (ac_try="$ac_compile"
4211 -case "(($ac_try" in
4212 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4213 - *) ac_try_echo=$ac_try;;
4215 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4216 -$as_echo "$ac_try_echo") >&5
4217 - (eval "$ac_compile") 2>conftest.er1
4219 - grep -v '^ *+' conftest.er1 >conftest.err
4220 - rm -f conftest.er1
4221 - cat conftest.err >&5
4222 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4223 - (exit $ac_status); } && {
4224 - test -z "$ac_cxx_werror_flag" ||
4225 - test ! -s conftest.err
4226 - } && test -s conftest.$ac_objext; then
4227 +if ac_fn_cxx_try_compile "$LINENO"; then :
4228 ac_cv_prog_cxx_g=yes
4230 - $as_echo "$as_me: failed program was:" >&5
4231 -sed 's/^/| /' conftest.$ac_ext >&5
4234 - cat >conftest.$ac_ext <<_ACEOF
4237 -cat confdefs.h >>conftest.$ac_ext
4238 -cat >>conftest.$ac_ext <<_ACEOF
4240 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4241 /* end confdefs.h. */
4244 @@ -2946,36 +3310,12 @@ main ()
4248 -rm -f conftest.$ac_objext
4249 -if { (ac_try="$ac_compile"
4250 -case "(($ac_try" in
4251 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4252 - *) ac_try_echo=$ac_try;;
4254 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4255 -$as_echo "$ac_try_echo") >&5
4256 - (eval "$ac_compile") 2>conftest.er1
4258 - grep -v '^ *+' conftest.er1 >conftest.err
4259 - rm -f conftest.er1
4260 - cat conftest.err >&5
4261 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4262 - (exit $ac_status); } && {
4263 - test -z "$ac_cxx_werror_flag" ||
4264 - test ! -s conftest.err
4265 - } && test -s conftest.$ac_objext; then
4268 - $as_echo "$as_me: failed program was:" >&5
4269 -sed 's/^/| /' conftest.$ac_ext >&5
4270 +if ac_fn_cxx_try_compile "$LINENO"; then :
4272 - ac_cxx_werror_flag=$ac_save_cxx_werror_flag
4274 + ac_cxx_werror_flag=$ac_save_cxx_werror_flag
4276 - cat >conftest.$ac_ext <<_ACEOF
4279 -cat confdefs.h >>conftest.$ac_ext
4280 -cat >>conftest.$ac_ext <<_ACEOF
4281 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4282 /* end confdefs.h. */
4285 @@ -2986,42 +3326,17 @@ main ()
4289 -rm -f conftest.$ac_objext
4290 -if { (ac_try="$ac_compile"
4291 -case "(($ac_try" in
4292 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4293 - *) ac_try_echo=$ac_try;;
4295 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4296 -$as_echo "$ac_try_echo") >&5
4297 - (eval "$ac_compile") 2>conftest.er1
4299 - grep -v '^ *+' conftest.er1 >conftest.err
4300 - rm -f conftest.er1
4301 - cat conftest.err >&5
4302 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4303 - (exit $ac_status); } && {
4304 - test -z "$ac_cxx_werror_flag" ||
4305 - test ! -s conftest.err
4306 - } && test -s conftest.$ac_objext; then
4307 +if ac_fn_cxx_try_compile "$LINENO"; then :
4308 ac_cv_prog_cxx_g=yes
4310 - $as_echo "$as_me: failed program was:" >&5
4311 -sed 's/^/| /' conftest.$ac_ext >&5
4316 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4319 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4322 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4323 ac_cxx_werror_flag=$ac_save_cxx_werror_flag
4325 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
4326 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
4327 $as_echo "$ac_cv_prog_cxx_g" >&6; }
4328 if test "$ac_test_CXXFLAGS" = set; then
4329 CXXFLAGS=$ac_save_CXXFLAGS
4330 @@ -3051,44 +3366,44 @@ ac_config_commands="$ac_config_commands depfiles"
4331 am_make=${MAKE-make}
4332 cat > confinc << 'END'
4335 + @echo this is the am__doit target
4338 # If we don't find an include directive, just comment out the code.
4339 -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
4340 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
4341 $as_echo_n "checking for style of include used by $am_make... " >&6; }
4345 # First try GNU make style include.
4346 echo "include confinc" > confmf
4347 -# We grep out `Entering directory' and `Leaving directory'
4348 -# messages which can occur if `w' ends up in MAKEFLAGS.
4349 -# In particular we don't look at `^make:' because GNU make might
4350 -# be invoked under some other name (usually "gmake"), in which
4351 -# case it prints its new name instead of `make'.
4352 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
4353 - am__include=include
4357 +# Ignore all kinds of additional output from `make'.
4358 +case `$am_make -s -f confmf 2> /dev/null` in #(
4359 +*the\ am__doit\ target*)
4360 + am__include=include
4365 # Now try BSD make style include.
4366 if test "$am__include" = "#"; then
4367 echo '.include "confinc"' > confmf
4368 - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
4369 - am__include=.include
4373 + case `$am_make -s -f confmf 2> /dev/null` in #(
4374 + *the\ am__doit\ target*)
4375 + am__include=.include
4383 -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
4384 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
4385 $as_echo "$_am_result" >&6; }
4386 rm -f confinc confmf
4388 # Check whether --enable-dependency-tracking was given.
4389 -if test "${enable_dependency_tracking+set}" = set; then
4390 +if test "${enable_dependency_tracking+set}" = set; then :
4391 enableval=$enable_dependency_tracking;
4394 @@ -3108,9 +3423,9 @@ fi
4396 depcc="$CXX" am_compiler_list=
4398 -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
4399 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
4400 $as_echo_n "checking dependency style of $depcc... " >&6; }
4401 -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
4402 +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
4403 $as_echo_n "(cached) " >&6
4405 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
4406 @@ -3136,6 +3451,11 @@ else
4407 if test "$am_compiler_list" = ""; then
4408 am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
4410 + am__universal=false
4411 + case " $depcc " in #(
4412 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
4415 for depmode in $am_compiler_list; do
4416 # Setup a source with many dependencies, because some compilers
4417 # like to wrap large dependency lists on column 80 (with \), and
4418 @@ -3153,7 +3473,17 @@ else
4420 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
4422 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
4423 + # mode. It turns out that the SunPro C++ compiler does not properly
4424 + # handle `-M -o', and we need to detect this. Also, some Intel
4425 + # versions had trouble with output in subdirs
4426 + am__obj=sub/conftest.${OBJEXT-o}
4427 + am__minus_obj="-o $am__obj"
4430 + # This depmode causes a compiler race in universal mode.
4431 + test "$am__universal" = false || continue
4434 # after this tag, mechanisms are not by side-effect, so they'll
4435 # only be used when explicitly requested
4436 @@ -3163,19 +3493,23 @@ else
4440 + msvisualcpp | msvcmsys)
4441 + # This compiler won't grok `-c -o', but also, the minuso test has
4442 + # not run yet. These depmodes are late enough in the game, and
4443 + # so weak that their functioning should not be impacted.
4444 + am__obj=conftest.${OBJEXT-o}
4449 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
4450 - # mode. It turns out that the SunPro C++ compiler does not properly
4451 - # handle `-M -o', and we need to detect this.
4452 if depmode=$depmode \
4453 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
4454 + source=sub/conftest.c object=$am__obj \
4455 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
4456 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
4457 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
4458 >/dev/null 2>conftest.err &&
4459 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
4460 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
4461 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
4462 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
4463 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
4464 # icc doesn't choke on unknown options, it will just issue warnings
4465 # or remarks (even with -Werror). So we grep stderr for any message
4466 @@ -3199,7 +3533,7 @@ else
4470 -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
4471 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
4472 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
4473 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
4475 @@ -3222,9 +3556,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
4476 if test -n "$ac_tool_prefix"; then
4477 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
4478 set dummy ${ac_tool_prefix}gcc; ac_word=$2
4479 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4480 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4481 $as_echo_n "checking for $ac_word... " >&6; }
4482 -if test "${ac_cv_prog_CC+set}" = set; then
4483 +if test "${ac_cv_prog_CC+set}" = set; then :
4484 $as_echo_n "(cached) " >&6
4486 if test -n "$CC"; then
4487 @@ -3235,24 +3569,24 @@ for as_dir in $PATH
4490 test -z "$as_dir" && as_dir=.
4491 - for ac_exec_ext in '' $ac_executable_extensions; do
4492 + for ac_exec_ext in '' $ac_executable_extensions; do
4493 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4494 ac_cv_prog_CC="${ac_tool_prefix}gcc"
4495 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4496 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4507 if test -n "$CC"; then
4508 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
4509 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4510 $as_echo "$CC" >&6; }
4512 - { $as_echo "$as_me:$LINENO: result: no" >&5
4513 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4514 $as_echo "no" >&6; }
4517 @@ -3262,9 +3596,9 @@ if test -z "$ac_cv_prog_CC"; then
4519 # Extract the first word of "gcc", so it can be a program name with args.
4520 set dummy gcc; ac_word=$2
4521 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4522 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4523 $as_echo_n "checking for $ac_word... " >&6; }
4524 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
4525 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
4526 $as_echo_n "(cached) " >&6
4528 if test -n "$ac_ct_CC"; then
4529 @@ -3275,24 +3609,24 @@ for as_dir in $PATH
4532 test -z "$as_dir" && as_dir=.
4533 - for ac_exec_ext in '' $ac_executable_extensions; do
4534 + for ac_exec_ext in '' $ac_executable_extensions; do
4535 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4536 ac_cv_prog_ac_ct_CC="gcc"
4537 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4538 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4548 ac_ct_CC=$ac_cv_prog_ac_ct_CC
4549 if test -n "$ac_ct_CC"; then
4550 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
4551 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4552 $as_echo "$ac_ct_CC" >&6; }
4554 - { $as_echo "$as_me:$LINENO: result: no" >&5
4555 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4556 $as_echo "no" >&6; }
4559 @@ -3301,7 +3635,7 @@ fi
4561 case $cross_compiling:$ac_tool_warned in
4563 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4564 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4565 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4566 ac_tool_warned=yes ;;
4568 @@ -3315,9 +3649,9 @@ if test -z "$CC"; then
4569 if test -n "$ac_tool_prefix"; then
4570 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
4571 set dummy ${ac_tool_prefix}cc; ac_word=$2
4572 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4573 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4574 $as_echo_n "checking for $ac_word... " >&6; }
4575 -if test "${ac_cv_prog_CC+set}" = set; then
4576 +if test "${ac_cv_prog_CC+set}" = set; then :
4577 $as_echo_n "(cached) " >&6
4579 if test -n "$CC"; then
4580 @@ -3328,24 +3662,24 @@ for as_dir in $PATH
4583 test -z "$as_dir" && as_dir=.
4584 - for ac_exec_ext in '' $ac_executable_extensions; do
4585 + for ac_exec_ext in '' $ac_executable_extensions; do
4586 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4587 ac_cv_prog_CC="${ac_tool_prefix}cc"
4588 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4589 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4600 if test -n "$CC"; then
4601 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
4602 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4603 $as_echo "$CC" >&6; }
4605 - { $as_echo "$as_me:$LINENO: result: no" >&5
4606 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4607 $as_echo "no" >&6; }
4610 @@ -3355,9 +3689,9 @@ fi
4611 if test -z "$CC"; then
4612 # Extract the first word of "cc", so it can be a program name with args.
4613 set dummy cc; ac_word=$2
4614 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4615 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4616 $as_echo_n "checking for $ac_word... " >&6; }
4617 -if test "${ac_cv_prog_CC+set}" = set; then
4618 +if test "${ac_cv_prog_CC+set}" = set; then :
4619 $as_echo_n "(cached) " >&6
4621 if test -n "$CC"; then
4622 @@ -3369,18 +3703,18 @@ for as_dir in $PATH
4625 test -z "$as_dir" && as_dir=.
4626 - for ac_exec_ext in '' $ac_executable_extensions; do
4627 + for ac_exec_ext in '' $ac_executable_extensions; do
4628 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4629 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
4630 ac_prog_rejected=yes
4634 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4635 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4643 if test $ac_prog_rejected = yes; then
4644 @@ -3399,10 +3733,10 @@ fi
4647 if test -n "$CC"; then
4648 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
4649 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4650 $as_echo "$CC" >&6; }
4652 - { $as_echo "$as_me:$LINENO: result: no" >&5
4653 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4654 $as_echo "no" >&6; }
4657 @@ -3414,9 +3748,9 @@ if test -z "$CC"; then
4659 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4660 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4661 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4662 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4663 $as_echo_n "checking for $ac_word... " >&6; }
4664 -if test "${ac_cv_prog_CC+set}" = set; then
4665 +if test "${ac_cv_prog_CC+set}" = set; then :
4666 $as_echo_n "(cached) " >&6
4668 if test -n "$CC"; then
4669 @@ -3427,24 +3761,24 @@ for as_dir in $PATH
4672 test -z "$as_dir" && as_dir=.
4673 - for ac_exec_ext in '' $ac_executable_extensions; do
4674 + for ac_exec_ext in '' $ac_executable_extensions; do
4675 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4676 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
4677 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4678 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4689 if test -n "$CC"; then
4690 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
4691 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4692 $as_echo "$CC" >&6; }
4694 - { $as_echo "$as_me:$LINENO: result: no" >&5
4695 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4696 $as_echo "no" >&6; }
4699 @@ -3458,9 +3792,9 @@ if test -z "$CC"; then
4701 # Extract the first word of "$ac_prog", so it can be a program name with args.
4702 set dummy $ac_prog; ac_word=$2
4703 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
4704 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4705 $as_echo_n "checking for $ac_word... " >&6; }
4706 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
4707 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
4708 $as_echo_n "(cached) " >&6
4710 if test -n "$ac_ct_CC"; then
4711 @@ -3471,24 +3805,24 @@ for as_dir in $PATH
4714 test -z "$as_dir" && as_dir=.
4715 - for ac_exec_ext in '' $ac_executable_extensions; do
4716 + for ac_exec_ext in '' $ac_executable_extensions; do
4717 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4718 ac_cv_prog_ac_ct_CC="$ac_prog"
4719 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4720 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4730 ac_ct_CC=$ac_cv_prog_ac_ct_CC
4731 if test -n "$ac_ct_CC"; then
4732 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
4733 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4734 $as_echo "$ac_ct_CC" >&6; }
4736 - { $as_echo "$as_me:$LINENO: result: no" >&5
4737 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4738 $as_echo "no" >&6; }
4741 @@ -3501,7 +3835,7 @@ done
4743 case $cross_compiling:$ac_tool_warned in
4745 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
4746 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4747 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4748 ac_tool_warned=yes ;;
4750 @@ -3512,62 +3846,42 @@ fi
4754 -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
4755 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4756 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4757 -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
4758 -See \`config.log' for more details." >&5
4759 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
4760 -See \`config.log' for more details." >&2;}
4761 - { (exit 1); exit 1; }; }; }
4762 +as_fn_error "no acceptable C compiler found in \$PATH
4763 +See \`config.log' for more details." "$LINENO" 5; }
4765 # Provide some information about the compiler.
4766 -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
4767 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
4770 -{ (ac_try="$ac_compiler --version >&5"
4771 +for ac_option in --version -v -V -qversion; do
4772 + { { ac_try="$ac_compiler $ac_option >&5"
4774 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4775 *) ac_try_echo=$ac_try;;
4777 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4778 -$as_echo "$ac_try_echo") >&5
4779 - (eval "$ac_compiler --version >&5") 2>&5
4780 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4781 +$as_echo "$ac_try_echo"; } >&5
4782 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err
4784 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4785 - (exit $ac_status); }
4786 -{ (ac_try="$ac_compiler -v >&5"
4787 -case "(($ac_try" in
4788 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4789 - *) ac_try_echo=$ac_try;;
4791 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4792 -$as_echo "$ac_try_echo") >&5
4793 - (eval "$ac_compiler -v >&5") 2>&5
4795 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4796 - (exit $ac_status); }
4797 -{ (ac_try="$ac_compiler -V >&5"
4798 -case "(($ac_try" in
4799 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4800 - *) ac_try_echo=$ac_try;;
4802 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4803 -$as_echo "$ac_try_echo") >&5
4804 - (eval "$ac_compiler -V >&5") 2>&5
4806 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4807 - (exit $ac_status); }
4808 + if test -s conftest.err; then
4810 +... rest of stderr output deleted ...
4811 + 10q' conftest.err >conftest.er1
4812 + cat conftest.er1 >&5
4814 + rm -f conftest.er1 conftest.err
4815 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4816 + test $ac_status = 0; }
4819 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
4820 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
4821 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
4822 -if test "${ac_cv_c_compiler_gnu+set}" = set; then
4823 +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
4824 $as_echo_n "(cached) " >&6
4826 - cat >conftest.$ac_ext <<_ACEOF
4829 -cat confdefs.h >>conftest.$ac_ext
4830 -cat >>conftest.$ac_ext <<_ACEOF
4831 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4832 /* end confdefs.h. */
4835 @@ -3581,37 +3895,16 @@ main ()
4839 -rm -f conftest.$ac_objext
4840 -if { (ac_try="$ac_compile"
4841 -case "(($ac_try" in
4842 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4843 - *) ac_try_echo=$ac_try;;
4845 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4846 -$as_echo "$ac_try_echo") >&5
4847 - (eval "$ac_compile") 2>conftest.er1
4849 - grep -v '^ *+' conftest.er1 >conftest.err
4850 - rm -f conftest.er1
4851 - cat conftest.err >&5
4852 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4853 - (exit $ac_status); } && {
4854 - test -z "$ac_c_werror_flag" ||
4855 - test ! -s conftest.err
4856 - } && test -s conftest.$ac_objext; then
4857 +if ac_fn_c_try_compile "$LINENO"; then :
4860 - $as_echo "$as_me: failed program was:" >&5
4861 -sed 's/^/| /' conftest.$ac_ext >&5
4863 - ac_compiler_gnu=no
4864 + ac_compiler_gnu=no
4867 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4868 ac_cv_c_compiler_gnu=$ac_compiler_gnu
4871 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
4872 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
4873 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
4874 if test $ac_compiler_gnu = yes; then
4876 @@ -3620,20 +3913,16 @@ else
4878 ac_test_CFLAGS=${CFLAGS+set}
4879 ac_save_CFLAGS=$CFLAGS
4880 -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
4881 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
4882 $as_echo_n "checking whether $CC accepts -g... " >&6; }
4883 -if test "${ac_cv_prog_cc_g+set}" = set; then
4884 +if test "${ac_cv_prog_cc_g+set}" = set; then :
4885 $as_echo_n "(cached) " >&6
4887 ac_save_c_werror_flag=$ac_c_werror_flag
4888 ac_c_werror_flag=yes
4891 - cat >conftest.$ac_ext <<_ACEOF
4894 -cat confdefs.h >>conftest.$ac_ext
4895 -cat >>conftest.$ac_ext <<_ACEOF
4896 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4897 /* end confdefs.h. */
4900 @@ -3644,35 +3933,11 @@ main ()
4904 -rm -f conftest.$ac_objext
4905 -if { (ac_try="$ac_compile"
4906 -case "(($ac_try" in
4907 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4908 - *) ac_try_echo=$ac_try;;
4910 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4911 -$as_echo "$ac_try_echo") >&5
4912 - (eval "$ac_compile") 2>conftest.er1
4914 - grep -v '^ *+' conftest.er1 >conftest.err
4915 - rm -f conftest.er1
4916 - cat conftest.err >&5
4917 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4918 - (exit $ac_status); } && {
4919 - test -z "$ac_c_werror_flag" ||
4920 - test ! -s conftest.err
4921 - } && test -s conftest.$ac_objext; then
4922 +if ac_fn_c_try_compile "$LINENO"; then :
4925 - $as_echo "$as_me: failed program was:" >&5
4926 -sed 's/^/| /' conftest.$ac_ext >&5
4929 - cat >conftest.$ac_ext <<_ACEOF
4932 -cat confdefs.h >>conftest.$ac_ext
4933 -cat >>conftest.$ac_ext <<_ACEOF
4935 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4936 /* end confdefs.h. */
4939 @@ -3683,36 +3948,12 @@ main ()
4943 -rm -f conftest.$ac_objext
4944 -if { (ac_try="$ac_compile"
4945 -case "(($ac_try" in
4946 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4947 - *) ac_try_echo=$ac_try;;
4949 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4950 -$as_echo "$ac_try_echo") >&5
4951 - (eval "$ac_compile") 2>conftest.er1
4953 - grep -v '^ *+' conftest.er1 >conftest.err
4954 - rm -f conftest.er1
4955 - cat conftest.err >&5
4956 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4957 - (exit $ac_status); } && {
4958 - test -z "$ac_c_werror_flag" ||
4959 - test ! -s conftest.err
4960 - } && test -s conftest.$ac_objext; then
4963 - $as_echo "$as_me: failed program was:" >&5
4964 -sed 's/^/| /' conftest.$ac_ext >&5
4965 +if ac_fn_c_try_compile "$LINENO"; then :
4967 - ac_c_werror_flag=$ac_save_c_werror_flag
4969 + ac_c_werror_flag=$ac_save_c_werror_flag
4971 - cat >conftest.$ac_ext <<_ACEOF
4974 -cat confdefs.h >>conftest.$ac_ext
4975 -cat >>conftest.$ac_ext <<_ACEOF
4976 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4977 /* end confdefs.h. */
4980 @@ -3723,42 +3964,17 @@ main ()
4984 -rm -f conftest.$ac_objext
4985 -if { (ac_try="$ac_compile"
4986 -case "(($ac_try" in
4987 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4988 - *) ac_try_echo=$ac_try;;
4990 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4991 -$as_echo "$ac_try_echo") >&5
4992 - (eval "$ac_compile") 2>conftest.er1
4994 - grep -v '^ *+' conftest.er1 >conftest.err
4995 - rm -f conftest.er1
4996 - cat conftest.err >&5
4997 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4998 - (exit $ac_status); } && {
4999 - test -z "$ac_c_werror_flag" ||
5000 - test ! -s conftest.err
5001 - } && test -s conftest.$ac_objext; then
5002 +if ac_fn_c_try_compile "$LINENO"; then :
5005 - $as_echo "$as_me: failed program was:" >&5
5006 -sed 's/^/| /' conftest.$ac_ext >&5
5011 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5014 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5017 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5018 ac_c_werror_flag=$ac_save_c_werror_flag
5020 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
5021 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
5022 $as_echo "$ac_cv_prog_cc_g" >&6; }
5023 if test "$ac_test_CFLAGS" = set; then
5024 CFLAGS=$ac_save_CFLAGS
5025 @@ -3775,18 +3991,14 @@ else
5029 -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
5030 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
5031 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
5032 -if test "${ac_cv_prog_cc_c89+set}" = set; then
5033 +if test "${ac_cv_prog_cc_c89+set}" = set; then :
5034 $as_echo_n "(cached) " >&6
5036 ac_cv_prog_cc_c89=no
5038 -cat >conftest.$ac_ext <<_ACEOF
5041 -cat confdefs.h >>conftest.$ac_ext
5042 -cat >>conftest.$ac_ext <<_ACEOF
5043 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5044 /* end confdefs.h. */
5047 @@ -3843,32 +4055,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
5048 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
5050 CC="$ac_save_CC $ac_arg"
5051 - rm -f conftest.$ac_objext
5052 -if { (ac_try="$ac_compile"
5053 -case "(($ac_try" in
5054 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5055 - *) ac_try_echo=$ac_try;;
5057 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5058 -$as_echo "$ac_try_echo") >&5
5059 - (eval "$ac_compile") 2>conftest.er1
5061 - grep -v '^ *+' conftest.er1 >conftest.err
5062 - rm -f conftest.er1
5063 - cat conftest.err >&5
5064 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5065 - (exit $ac_status); } && {
5066 - test -z "$ac_c_werror_flag" ||
5067 - test ! -s conftest.err
5068 - } && test -s conftest.$ac_objext; then
5069 + if ac_fn_c_try_compile "$LINENO"; then :
5070 ac_cv_prog_cc_c89=$ac_arg
5072 - $as_echo "$as_me: failed program was:" >&5
5073 -sed 's/^/| /' conftest.$ac_ext >&5
5078 rm -f core conftest.err conftest.$ac_objext
5079 test "x$ac_cv_prog_cc_c89" != "xno" && break
5081 @@ -3879,17 +4068,19 @@ fi
5083 case "x$ac_cv_prog_cc_c89" in
5085 - { $as_echo "$as_me:$LINENO: result: none needed" >&5
5086 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
5087 $as_echo "none needed" >&6; } ;;
5089 - { $as_echo "$as_me:$LINENO: result: unsupported" >&5
5090 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
5091 $as_echo "unsupported" >&6; } ;;
5093 CC="$CC $ac_cv_prog_cc_c89"
5094 - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
5095 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
5096 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
5098 +if test "x$ac_cv_prog_cc_c89" != xno; then :
5103 ac_cpp='$CXXCPP $CPPFLAGS'
5104 @@ -3899,9 +4090,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5106 depcc="$CC" am_compiler_list=
5108 -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
5109 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
5110 $as_echo_n "checking dependency style of $depcc... " >&6; }
5111 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
5112 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
5113 $as_echo_n "(cached) " >&6
5115 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
5116 @@ -3927,6 +4118,11 @@ else
5117 if test "$am_compiler_list" = ""; then
5118 am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
5120 + am__universal=false
5121 + case " $depcc " in #(
5122 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
5125 for depmode in $am_compiler_list; do
5126 # Setup a source with many dependencies, because some compilers
5127 # like to wrap large dependency lists on column 80 (with \), and
5128 @@ -3944,7 +4140,17 @@ else
5130 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
5132 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
5133 + # mode. It turns out that the SunPro C++ compiler does not properly
5134 + # handle `-M -o', and we need to detect this. Also, some Intel
5135 + # versions had trouble with output in subdirs
5136 + am__obj=sub/conftest.${OBJEXT-o}
5137 + am__minus_obj="-o $am__obj"
5140 + # This depmode causes a compiler race in universal mode.
5141 + test "$am__universal" = false || continue
5144 # after this tag, mechanisms are not by side-effect, so they'll
5145 # only be used when explicitly requested
5146 @@ -3954,19 +4160,23 @@ else
5150 + msvisualcpp | msvcmsys)
5151 + # This compiler won't grok `-c -o', but also, the minuso test has
5152 + # not run yet. These depmodes are late enough in the game, and
5153 + # so weak that their functioning should not be impacted.
5154 + am__obj=conftest.${OBJEXT-o}
5159 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
5160 - # mode. It turns out that the SunPro C++ compiler does not properly
5161 - # handle `-M -o', and we need to detect this.
5162 if depmode=$depmode \
5163 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
5164 + source=sub/conftest.c object=$am__obj \
5165 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
5166 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
5167 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
5168 >/dev/null 2>conftest.err &&
5169 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
5170 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
5171 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
5172 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
5173 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
5174 # icc doesn't choke on unknown options, it will just issue warnings
5175 # or remarks (even with -Werror). So we grep stderr for any message
5176 @@ -3990,7 +4200,7 @@ else
5180 -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
5181 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
5182 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
5183 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
5185 @@ -4010,14 +4220,14 @@ ac_cpp='$CPP $CPPFLAGS'
5186 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5187 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5188 ac_compiler_gnu=$ac_cv_c_compiler_gnu
5189 -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
5190 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
5191 $as_echo_n "checking how to run the C preprocessor... " >&6; }
5192 # On Suns, sometimes $CPP names a directory.
5193 if test -n "$CPP" && test -d "$CPP"; then
5196 if test -z "$CPP"; then
5197 - if test "${ac_cv_prog_CPP+set}" = set; then
5198 + if test "${ac_cv_prog_CPP+set}" = set; then :
5199 $as_echo_n "(cached) " >&6
5201 # Double quotes because CPP needs to be expanded
5202 @@ -4032,11 +4242,7 @@ do
5203 # <limits.h> exists even on freestanding compilers.
5204 # On the NeXT, cc -E runs the code through the compiler's parser,
5205 # not just through cpp. "Syntax error" is here to catch this case.
5206 - cat >conftest.$ac_ext <<_ACEOF
5209 -cat confdefs.h >>conftest.$ac_ext
5210 -cat >>conftest.$ac_ext <<_ACEOF
5211 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5212 /* end confdefs.h. */
5214 # include <limits.h>
5215 @@ -4045,78 +4251,34 @@ cat >>conftest.$ac_ext <<_ACEOF
5219 -if { (ac_try="$ac_cpp conftest.$ac_ext"
5220 -case "(($ac_try" in
5221 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5222 - *) ac_try_echo=$ac_try;;
5224 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5225 -$as_echo "$ac_try_echo") >&5
5226 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5228 - grep -v '^ *+' conftest.er1 >conftest.err
5229 - rm -f conftest.er1
5230 - cat conftest.err >&5
5231 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5232 - (exit $ac_status); } >/dev/null && {
5233 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5234 - test ! -s conftest.err
5238 - $as_echo "$as_me: failed program was:" >&5
5239 -sed 's/^/| /' conftest.$ac_ext >&5
5240 +if ac_fn_c_try_cpp "$LINENO"; then :
5243 # Broken: fails on valid input.
5247 rm -f conftest.err conftest.$ac_ext
5249 # OK, works on sane cases. Now check whether nonexistent headers
5250 # can be detected and how.
5251 - cat >conftest.$ac_ext <<_ACEOF
5254 -cat confdefs.h >>conftest.$ac_ext
5255 -cat >>conftest.$ac_ext <<_ACEOF
5256 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5257 /* end confdefs.h. */
5258 #include <ac_nonexistent.h>
5260 -if { (ac_try="$ac_cpp conftest.$ac_ext"
5261 -case "(($ac_try" in
5262 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5263 - *) ac_try_echo=$ac_try;;
5265 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5266 -$as_echo "$ac_try_echo") >&5
5267 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5269 - grep -v '^ *+' conftest.er1 >conftest.err
5270 - rm -f conftest.er1
5271 - cat conftest.err >&5
5272 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5273 - (exit $ac_status); } >/dev/null && {
5274 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5275 - test ! -s conftest.err
5277 +if ac_fn_c_try_cpp "$LINENO"; then :
5278 # Broken: success on invalid input.
5281 - $as_echo "$as_me: failed program was:" >&5
5282 -sed 's/^/| /' conftest.$ac_ext >&5
5284 # Passes both tests.
5289 rm -f conftest.err conftest.$ac_ext
5292 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5293 rm -f conftest.err conftest.$ac_ext
5294 -if $ac_preproc_ok; then
5295 +if $ac_preproc_ok; then :
5299 @@ -4128,7 +4290,7 @@ fi
5303 -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
5304 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
5305 $as_echo "$CPP" >&6; }
5307 for ac_c_preproc_warn_flag in '' yes
5308 @@ -4139,11 +4301,7 @@ do
5309 # <limits.h> exists even on freestanding compilers.
5310 # On the NeXT, cc -E runs the code through the compiler's parser,
5311 # not just through cpp. "Syntax error" is here to catch this case.
5312 - cat >conftest.$ac_ext <<_ACEOF
5315 -cat confdefs.h >>conftest.$ac_ext
5316 -cat >>conftest.$ac_ext <<_ACEOF
5317 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5318 /* end confdefs.h. */
5320 # include <limits.h>
5321 @@ -4152,87 +4310,40 @@ cat >>conftest.$ac_ext <<_ACEOF
5325 -if { (ac_try="$ac_cpp conftest.$ac_ext"
5326 -case "(($ac_try" in
5327 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5328 - *) ac_try_echo=$ac_try;;
5330 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5331 -$as_echo "$ac_try_echo") >&5
5332 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5334 - grep -v '^ *+' conftest.er1 >conftest.err
5335 - rm -f conftest.er1
5336 - cat conftest.err >&5
5337 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5338 - (exit $ac_status); } >/dev/null && {
5339 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5340 - test ! -s conftest.err
5344 - $as_echo "$as_me: failed program was:" >&5
5345 -sed 's/^/| /' conftest.$ac_ext >&5
5346 +if ac_fn_c_try_cpp "$LINENO"; then :
5349 # Broken: fails on valid input.
5353 rm -f conftest.err conftest.$ac_ext
5355 # OK, works on sane cases. Now check whether nonexistent headers
5356 # can be detected and how.
5357 - cat >conftest.$ac_ext <<_ACEOF
5360 -cat confdefs.h >>conftest.$ac_ext
5361 -cat >>conftest.$ac_ext <<_ACEOF
5362 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5363 /* end confdefs.h. */
5364 #include <ac_nonexistent.h>
5366 -if { (ac_try="$ac_cpp conftest.$ac_ext"
5367 -case "(($ac_try" in
5368 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5369 - *) ac_try_echo=$ac_try;;
5371 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5372 -$as_echo "$ac_try_echo") >&5
5373 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
5375 - grep -v '^ *+' conftest.er1 >conftest.err
5376 - rm -f conftest.er1
5377 - cat conftest.err >&5
5378 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5379 - (exit $ac_status); } >/dev/null && {
5380 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5381 - test ! -s conftest.err
5383 +if ac_fn_c_try_cpp "$LINENO"; then :
5384 # Broken: success on invalid input.
5387 - $as_echo "$as_me: failed program was:" >&5
5388 -sed 's/^/| /' conftest.$ac_ext >&5
5390 # Passes both tests.
5395 rm -f conftest.err conftest.$ac_ext
5398 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5399 rm -f conftest.err conftest.$ac_ext
5400 -if $ac_preproc_ok; then
5402 +if $ac_preproc_ok; then :
5405 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
5406 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5407 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5408 -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
5409 -See \`config.log' for more details." >&5
5410 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
5411 -See \`config.log' for more details." >&2;}
5412 - { (exit 1); exit 1; }; }; }
5413 +as_fn_error "C preprocessor \"$CPP\" fails sanity check
5414 +See \`config.log' for more details." "$LINENO" 5; }
5418 @@ -4241,14 +4352,14 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5419 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5420 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5422 -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
5423 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
5424 $as_echo_n "checking whether ln -s works... " >&6; }
5426 if test "$LN_S" = "ln -s"; then
5427 - { $as_echo "$as_me:$LINENO: result: yes" >&5
5428 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5429 $as_echo "yes" >&6; }
5431 - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
5432 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
5433 $as_echo "no, using $LN_S" >&6; }
5436 @@ -4264,7 +4375,7 @@ LDFLAGS="$LDFLAGS $PTHREAD_LIBS $USER_LDFLAGS"
5439 # Check whether --with-boost was given.
5440 -if test "${with_boost+set}" = set; then
5441 +if test "${with_boost+set}" = set; then :
5442 withval=$with_boost;
5443 if test "$withval" = "no"; then
5445 @@ -4284,15 +4395,13 @@ fi
5448 # Check whether --with-boost-libdir was given.
5449 -if test "${with_boost_libdir+set}" = set; then
5450 +if test "${with_boost_libdir+set}" = set; then :
5451 withval=$with_boost_libdir;
5454 ac_boost_lib_path="$withval"
5456 - { { $as_echo "$as_me:$LINENO: error: --with-boost-libdir expected directory name" >&5
5457 -$as_echo "$as_me: error: --with-boost-libdir expected directory name" >&2;}
5458 - { (exit 1); exit 1; }; }
5459 + as_fn_error "--with-boost-libdir expected directory name" "$LINENO" 5
5463 @@ -4311,7 +4420,7 @@ if test "x$want_boost" = "xyes"; then
5464 boost_lib_version_req_sub_minor="0"
5466 WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
5467 - { $as_echo "$as_me:$LINENO: checking for boostlib >= $boost_lib_version_req" >&5
5468 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= $boost_lib_version_req" >&5
5469 $as_echo_n "checking for boostlib >= $boost_lib_version_req... " >&6; }
5472 @@ -4346,11 +4455,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5473 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5474 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5476 - cat >conftest.$ac_ext <<_ACEOF
5479 -cat confdefs.h >>conftest.$ac_ext
5480 -cat >>conftest.$ac_ext <<_ACEOF
5481 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5482 /* end confdefs.h. */
5484 #include <boost/version.hpp>
5485 @@ -4369,38 +4474,14 @@ main ()
5489 -rm -f conftest.$ac_objext
5490 -if { (ac_try="$ac_compile"
5491 -case "(($ac_try" in
5492 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5493 - *) ac_try_echo=$ac_try;;
5495 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5496 -$as_echo "$ac_try_echo") >&5
5497 - (eval "$ac_compile") 2>conftest.er1
5499 - grep -v '^ *+' conftest.er1 >conftest.err
5500 - rm -f conftest.er1
5501 - cat conftest.err >&5
5502 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5503 - (exit $ac_status); } && {
5504 - test -z "$ac_cxx_werror_flag" ||
5505 - test ! -s conftest.err
5506 - } && test -s conftest.$ac_objext; then
5507 +if ac_fn_cxx_try_compile "$LINENO"; then :
5509 - { $as_echo "$as_me:$LINENO: result: yes" >&5
5510 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5511 $as_echo "yes" >&6; }
5516 - $as_echo "$as_me: failed program was:" >&5
5517 -sed 's/^/| /' conftest.$ac_ext >&5
5523 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5525 ac_cpp='$CXXCPP $CPPFLAGS'
5526 @@ -4453,7 +4534,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5527 stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'`
5528 V_CHECK=`expr $stage_version_shorten \>\= $_version`
5529 if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
5530 - { $as_echo "$as_me:$LINENO: We will use a staged boost library from $BOOST_ROOT" >&5
5531 + { $as_echo "$as_me:${as_lineno-$LINENO}: We will use a staged boost library from $BOOST_ROOT" >&5
5532 $as_echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;}
5533 BOOST_CPPFLAGS="-I$BOOST_ROOT"
5534 BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
5535 @@ -4473,11 +4554,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5536 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5537 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5539 - cat >conftest.$ac_ext <<_ACEOF
5542 -cat confdefs.h >>conftest.$ac_ext
5543 -cat >>conftest.$ac_ext <<_ACEOF
5544 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5545 /* end confdefs.h. */
5547 #include <boost/version.hpp>
5548 @@ -4496,38 +4573,14 @@ main ()
5552 -rm -f conftest.$ac_objext
5553 -if { (ac_try="$ac_compile"
5554 -case "(($ac_try" in
5555 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5556 - *) ac_try_echo=$ac_try;;
5558 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5559 -$as_echo "$ac_try_echo") >&5
5560 - (eval "$ac_compile") 2>conftest.er1
5562 - grep -v '^ *+' conftest.er1 >conftest.err
5563 - rm -f conftest.er1
5564 - cat conftest.err >&5
5565 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5566 - (exit $ac_status); } && {
5567 - test -z "$ac_cxx_werror_flag" ||
5568 - test ! -s conftest.err
5569 - } && test -s conftest.$ac_objext; then
5570 +if ac_fn_cxx_try_compile "$LINENO"; then :
5572 - { $as_echo "$as_me:$LINENO: result: yes" >&5
5573 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5574 $as_echo "yes" >&6; }
5579 - $as_echo "$as_me: failed program was:" >&5
5580 -sed 's/^/| /' conftest.$ac_ext >&5
5586 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5588 ac_cpp='$CXXCPP $CPPFLAGS'
5589 @@ -4539,20 +4592,16 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5591 if test "$succeeded" != "yes" ; then
5592 if test "$_version" = "0" ; then
5593 - { { $as_echo "$as_me:$LINENO: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&5
5594 -$as_echo "$as_me: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&2;}
5595 - { (exit 1); exit 1; }; }
5596 + as_fn_error "We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." "$LINENO" 5
5598 - { $as_echo "$as_me:$LINENO: Your boost libraries seems to old (version $_version)." >&5
5599 + { $as_echo "$as_me:${as_lineno-$LINENO}: Your boost libraries seems to old (version $_version)." >&5
5600 $as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;}
5606 -cat >>confdefs.h <<\_ACEOF
5607 -#define HAVE_BOOST /**/
5609 +$as_echo "#define HAVE_BOOST /**/" >>confdefs.h
5613 @@ -4563,35 +4612,27 @@ fi
5615 # Make sure we can run config.sub.
5616 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
5617 - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
5618 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
5619 - { (exit 1); exit 1; }; }
5620 + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
5622 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5
5623 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
5624 $as_echo_n "checking build system type... " >&6; }
5625 -if test "${ac_cv_build+set}" = set; then
5626 +if test "${ac_cv_build+set}" = set; then :
5627 $as_echo_n "(cached) " >&6
5629 ac_build_alias=$build_alias
5630 test "x$ac_build_alias" = x &&
5631 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
5632 test "x$ac_build_alias" = x &&
5633 - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
5634 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
5635 - { (exit 1); exit 1; }; }
5636 + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
5637 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
5638 - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
5639 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
5640 - { (exit 1); exit 1; }; }
5641 + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
5644 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
5645 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
5646 $as_echo "$ac_cv_build" >&6; }
5647 case $ac_cv_build in
5649 -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
5650 -$as_echo "$as_me: error: invalid value of canonical build" >&2;}
5651 - { (exit 1); exit 1; }; };;
5652 +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
5655 ac_save_IFS=$IFS; IFS='-'
5656 @@ -4610,7 +4651,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
5659 # Check whether --with-boost-system was given.
5660 -if test "${with_boost_system+set}" = set; then
5661 +if test "${with_boost_system+set}" = set; then :
5662 withval=$with_boost_system;
5663 if test "$withval" = "no"; then
5665 @@ -4639,9 +4680,9 @@ fi
5666 LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
5669 - { $as_echo "$as_me:$LINENO: checking whether the Boost::System library is available" >&5
5670 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5
5671 $as_echo_n "checking whether the Boost::System library is available... " >&6; }
5672 -if test "${ax_cv_boost_system+set}" = set; then
5673 +if test "${ax_cv_boost_system+set}" = set; then :
5674 $as_echo_n "(cached) " >&6
5677 @@ -4652,11 +4693,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5679 CXXFLAGS_SAVE=$CXXFLAGS
5681 - cat >conftest.$ac_ext <<_ACEOF
5684 -cat confdefs.h >>conftest.$ac_ext
5685 -cat >>conftest.$ac_ext <<_ACEOF
5686 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5687 /* end confdefs.h. */
5688 #include <boost/system/error_code.hpp>
5690 @@ -4667,32 +4704,11 @@ boost::system::system_category
5694 -rm -f conftest.$ac_objext
5695 -if { (ac_try="$ac_compile"
5696 -case "(($ac_try" in
5697 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5698 - *) ac_try_echo=$ac_try;;
5700 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5701 -$as_echo "$ac_try_echo") >&5
5702 - (eval "$ac_compile") 2>conftest.er1
5704 - grep -v '^ *+' conftest.er1 >conftest.err
5705 - rm -f conftest.er1
5706 - cat conftest.err >&5
5707 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5708 - (exit $ac_status); } && {
5709 - test -z "$ac_cxx_werror_flag" ||
5710 - test ! -s conftest.err
5711 - } && test -s conftest.$ac_objext; then
5712 +if ac_fn_cxx_try_compile "$LINENO"; then :
5713 ax_cv_boost_system=yes
5715 - $as_echo "$as_me: failed program was:" >&5
5716 -sed 's/^/| /' conftest.$ac_ext >&5
5718 - ax_cv_boost_system=no
5719 + ax_cv_boost_system=no
5722 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5723 CXXFLAGS=$CXXFLAGS_SAVE
5725 @@ -4703,15 +4719,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5729 -{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_system" >&5
5730 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_system" >&5
5731 $as_echo "$ax_cv_boost_system" >&6; }
5732 if test "x$ax_cv_boost_system" = "xyes"; then
5736 -cat >>confdefs.h <<\_ACEOF
5737 -#define HAVE_BOOST_SYSTEM /**/
5739 +$as_echo "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h
5741 BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
5743 @@ -4720,18 +4734,14 @@ _ACEOF
5744 for libextension in `ls $BOOSTLIBDIR/libboost_system*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do
5745 ax_lib=${libextension}
5746 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
5747 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
5748 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
5749 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
5750 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
5751 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
5752 $as_echo_n "(cached) " >&6
5754 ac_check_lib_save_LIBS=$LIBS
5755 LIBS="-l$ax_lib $LIBS"
5756 -cat >conftest.$ac_ext <<_ACEOF
5759 -cat confdefs.h >>conftest.$ac_ext
5760 -cat >>conftest.$ac_ext <<_ACEOF
5761 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5762 /* end confdefs.h. */
5764 /* Override any GCC internal prototype to avoid an error.
5765 @@ -4749,47 +4759,20 @@ return exit ();
5769 -rm -f conftest.$ac_objext conftest$ac_exeext
5770 -if { (ac_try="$ac_link"
5771 -case "(($ac_try" in
5772 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5773 - *) ac_try_echo=$ac_try;;
5775 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5776 -$as_echo "$ac_try_echo") >&5
5777 - (eval "$ac_link") 2>conftest.er1
5779 - grep -v '^ *+' conftest.er1 >conftest.err
5780 - rm -f conftest.er1
5781 - cat conftest.err >&5
5782 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5783 - (exit $ac_status); } && {
5784 - test -z "$ac_cxx_werror_flag" ||
5785 - test ! -s conftest.err
5786 - } && test -s conftest$ac_exeext && {
5787 - test "$cross_compiling" = yes ||
5788 - $as_test_x conftest$ac_exeext
5790 +if ac_fn_cxx_try_link "$LINENO"; then :
5791 eval "$as_ac_Lib=yes"
5793 - $as_echo "$as_me: failed program was:" >&5
5794 -sed 's/^/| /' conftest.$ac_ext >&5
5796 - eval "$as_ac_Lib=no"
5797 + eval "$as_ac_Lib=no"
5800 -rm -rf conftest.dSYM
5801 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5802 - conftest$ac_exeext conftest.$ac_ext
5803 +rm -f core conftest.err conftest.$ac_objext \
5804 + conftest$ac_exeext conftest.$ac_ext
5805 LIBS=$ac_check_lib_save_LIBS
5807 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
5808 - $as_echo "$as_val"'`
5809 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
5810 +eval ac_res=\$$as_ac_Lib
5811 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
5812 $as_echo "$ac_res" >&6; }
5813 -as_val=`eval 'as_val=${'$as_ac_Lib'}
5814 - $as_echo "$as_val"'`
5815 - if test "x$as_val" = x""yes; then
5816 +eval as_val=\$$as_ac_Lib
5817 + if test "x$as_val" = x""yes; then :
5818 BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
5821 @@ -4800,18 +4783,14 @@ fi
5822 for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
5823 ax_lib=${libextension}
5824 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
5825 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
5826 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
5827 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
5828 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
5829 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
5830 $as_echo_n "(cached) " >&6
5832 ac_check_lib_save_LIBS=$LIBS
5833 LIBS="-l$ax_lib $LIBS"
5834 -cat >conftest.$ac_ext <<_ACEOF
5837 -cat confdefs.h >>conftest.$ac_ext
5838 -cat >>conftest.$ac_ext <<_ACEOF
5839 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5840 /* end confdefs.h. */
5842 /* Override any GCC internal prototype to avoid an error.
5843 @@ -4829,47 +4808,20 @@ return exit ();
5847 -rm -f conftest.$ac_objext conftest$ac_exeext
5848 -if { (ac_try="$ac_link"
5849 -case "(($ac_try" in
5850 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5851 - *) ac_try_echo=$ac_try;;
5853 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5854 -$as_echo "$ac_try_echo") >&5
5855 - (eval "$ac_link") 2>conftest.er1
5857 - grep -v '^ *+' conftest.er1 >conftest.err
5858 - rm -f conftest.er1
5859 - cat conftest.err >&5
5860 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5861 - (exit $ac_status); } && {
5862 - test -z "$ac_cxx_werror_flag" ||
5863 - test ! -s conftest.err
5864 - } && test -s conftest$ac_exeext && {
5865 - test "$cross_compiling" = yes ||
5866 - $as_test_x conftest$ac_exeext
5868 +if ac_fn_cxx_try_link "$LINENO"; then :
5869 eval "$as_ac_Lib=yes"
5871 - $as_echo "$as_me: failed program was:" >&5
5872 -sed 's/^/| /' conftest.$ac_ext >&5
5874 - eval "$as_ac_Lib=no"
5875 + eval "$as_ac_Lib=no"
5878 -rm -rf conftest.dSYM
5879 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5880 - conftest$ac_exeext conftest.$ac_ext
5881 +rm -f core conftest.err conftest.$ac_objext \
5882 + conftest$ac_exeext conftest.$ac_ext
5883 LIBS=$ac_check_lib_save_LIBS
5885 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
5886 - $as_echo "$as_val"'`
5887 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
5888 +eval ac_res=\$$as_ac_Lib
5889 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
5890 $as_echo "$ac_res" >&6; }
5891 -as_val=`eval 'as_val=${'$as_ac_Lib'}
5892 - $as_echo "$as_val"'`
5893 - if test "x$as_val" = x""yes; then
5894 +eval as_val=\$$as_ac_Lib
5895 + if test "x$as_val" = x""yes; then :
5896 BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
5899 @@ -4881,18 +4833,14 @@ fi
5901 for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
5902 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
5903 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
5904 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
5905 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
5906 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
5907 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
5908 $as_echo_n "(cached) " >&6
5910 ac_check_lib_save_LIBS=$LIBS
5911 LIBS="-l$ax_lib $LIBS"
5912 -cat >conftest.$ac_ext <<_ACEOF
5915 -cat confdefs.h >>conftest.$ac_ext
5916 -cat >>conftest.$ac_ext <<_ACEOF
5917 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5918 /* end confdefs.h. */
5920 /* Override any GCC internal prototype to avoid an error.
5921 @@ -4910,47 +4858,20 @@ return exit ();
5925 -rm -f conftest.$ac_objext conftest$ac_exeext
5926 -if { (ac_try="$ac_link"
5927 -case "(($ac_try" in
5928 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5929 - *) ac_try_echo=$ac_try;;
5931 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
5932 -$as_echo "$ac_try_echo") >&5
5933 - (eval "$ac_link") 2>conftest.er1
5935 - grep -v '^ *+' conftest.er1 >conftest.err
5936 - rm -f conftest.er1
5937 - cat conftest.err >&5
5938 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
5939 - (exit $ac_status); } && {
5940 - test -z "$ac_cxx_werror_flag" ||
5941 - test ! -s conftest.err
5942 - } && test -s conftest$ac_exeext && {
5943 - test "$cross_compiling" = yes ||
5944 - $as_test_x conftest$ac_exeext
5946 +if ac_fn_cxx_try_link "$LINENO"; then :
5947 eval "$as_ac_Lib=yes"
5949 - $as_echo "$as_me: failed program was:" >&5
5950 -sed 's/^/| /' conftest.$ac_ext >&5
5952 - eval "$as_ac_Lib=no"
5953 + eval "$as_ac_Lib=no"
5956 -rm -rf conftest.dSYM
5957 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
5958 - conftest$ac_exeext conftest.$ac_ext
5959 +rm -f core conftest.err conftest.$ac_objext \
5960 + conftest$ac_exeext conftest.$ac_ext
5961 LIBS=$ac_check_lib_save_LIBS
5963 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
5964 - $as_echo "$as_val"'`
5965 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
5966 +eval ac_res=\$$as_ac_Lib
5967 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
5968 $as_echo "$ac_res" >&6; }
5969 -as_val=`eval 'as_val=${'$as_ac_Lib'}
5970 - $as_echo "$as_val"'`
5971 - if test "x$as_val" = x""yes; then
5972 +eval as_val=\$$as_ac_Lib
5973 + if test "x$as_val" = x""yes; then :
5974 BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
5977 @@ -4960,9 +4881,7 @@ fi
5980 if test "x$link_system" = "xno"; then
5981 - { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5
5982 -$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
5983 - { (exit 1); exit 1; }; }
5984 + as_fn_error "Could not link against $ax_lib !" "$LINENO" 5
5988 @@ -4973,7 +4892,7 @@ $as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
5991 # Check whether --with-boost-serialization was given.
5992 -if test "${with_boost_serialization+set}" = set; then
5993 +if test "${with_boost_serialization+set}" = set; then :
5994 withval=$with_boost_serialization;
5995 if test "$withval" = "no"; then
5997 @@ -4995,7 +4914,7 @@ fi
5999 CPPFLAGS_SAVED="$CPPFLAGS"
6000 CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
6001 - { $as_echo "$as_me:$LINENO: WARNING: BOOST_CPPFLAGS $BOOST_CPPFLAGS" >&5
6002 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: BOOST_CPPFLAGS $BOOST_CPPFLAGS" >&5
6003 $as_echo "$as_me: WARNING: BOOST_CPPFLAGS $BOOST_CPPFLAGS" >&2;}
6006 @@ -5003,9 +4922,9 @@ $as_echo "$as_me: WARNING: BOOST_CPPFLAGS $BOOST_CPPFLAGS" >&2;}
6007 LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
6010 - { $as_echo "$as_me:$LINENO: checking whether the Boost::Serialization library is available" >&5
6011 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Serialization library is available" >&5
6012 $as_echo_n "checking whether the Boost::Serialization library is available... " >&6; }
6013 -if test "${ax_cv_boost_serialization+set}" = set; then
6014 +if test "${ax_cv_boost_serialization+set}" = set; then :
6015 $as_echo_n "(cached) " >&6
6018 @@ -5014,11 +4933,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6019 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6020 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
6022 - cat >conftest.$ac_ext <<_ACEOF
6025 -cat confdefs.h >>conftest.$ac_ext
6026 -cat >>conftest.$ac_ext <<_ACEOF
6027 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6028 /* end confdefs.h. */
6030 #include <boost/archive/text_oarchive.hpp>
6031 @@ -5035,32 +4950,11 @@ std::ofstream ofs("filename");
6035 -rm -f conftest.$ac_objext
6036 -if { (ac_try="$ac_compile"
6037 -case "(($ac_try" in
6038 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6039 - *) ac_try_echo=$ac_try;;
6041 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6042 -$as_echo "$ac_try_echo") >&5
6043 - (eval "$ac_compile") 2>conftest.er1
6045 - grep -v '^ *+' conftest.er1 >conftest.err
6046 - rm -f conftest.er1
6047 - cat conftest.err >&5
6048 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6049 - (exit $ac_status); } && {
6050 - test -z "$ac_cxx_werror_flag" ||
6051 - test ! -s conftest.err
6052 - } && test -s conftest.$ac_objext; then
6053 +if ac_fn_cxx_try_compile "$LINENO"; then :
6054 ax_cv_boost_serialization=yes
6056 - $as_echo "$as_me: failed program was:" >&5
6057 -sed 's/^/| /' conftest.$ac_ext >&5
6059 - ax_cv_boost_serialization=no
6060 + ax_cv_boost_serialization=no
6063 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6065 ac_cpp='$CXXCPP $CPPFLAGS'
6066 @@ -5070,31 +4964,25 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
6070 -{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_serialization" >&5
6071 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_serialization" >&5
6072 $as_echo "$ax_cv_boost_serialization" >&6; }
6073 if test "x$ax_cv_boost_serialization" = "xyes"; then
6075 -cat >>confdefs.h <<\_ACEOF
6076 -#define HAVE_BOOST_SERIALIZATION /**/
6078 +$as_echo "#define HAVE_BOOST_SERIALIZATION /**/" >>confdefs.h
6080 BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
6081 if test "x$ax_boost_user_serialization_lib" = "x"; then
6082 for libextension in `ls $BOOSTLIBDIR/libboost_serialization*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_serialization.*\)\.so.*$;\1;' -e 's;^lib\(boost_serialization.*\)\.a*$;\1;'` ; do
6083 ax_lib=${libextension}
6084 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
6085 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
6086 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
6087 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
6088 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
6089 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
6090 $as_echo_n "(cached) " >&6
6092 ac_check_lib_save_LIBS=$LIBS
6093 LIBS="-l$ax_lib $LIBS"
6094 -cat >conftest.$ac_ext <<_ACEOF
6097 -cat confdefs.h >>conftest.$ac_ext
6098 -cat >>conftest.$ac_ext <<_ACEOF
6099 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6100 /* end confdefs.h. */
6102 /* Override any GCC internal prototype to avoid an error.
6103 @@ -5112,47 +5000,20 @@ return exit ();
6107 -rm -f conftest.$ac_objext conftest$ac_exeext
6108 -if { (ac_try="$ac_link"
6109 -case "(($ac_try" in
6110 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6111 - *) ac_try_echo=$ac_try;;
6113 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6114 -$as_echo "$ac_try_echo") >&5
6115 - (eval "$ac_link") 2>conftest.er1
6117 - grep -v '^ *+' conftest.er1 >conftest.err
6118 - rm -f conftest.er1
6119 - cat conftest.err >&5
6120 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6121 - (exit $ac_status); } && {
6122 - test -z "$ac_cxx_werror_flag" ||
6123 - test ! -s conftest.err
6124 - } && test -s conftest$ac_exeext && {
6125 - test "$cross_compiling" = yes ||
6126 - $as_test_x conftest$ac_exeext
6128 +if ac_fn_cxx_try_link "$LINENO"; then :
6129 eval "$as_ac_Lib=yes"
6131 - $as_echo "$as_me: failed program was:" >&5
6132 -sed 's/^/| /' conftest.$ac_ext >&5
6134 - eval "$as_ac_Lib=no"
6135 + eval "$as_ac_Lib=no"
6138 -rm -rf conftest.dSYM
6139 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6140 - conftest$ac_exeext conftest.$ac_ext
6141 +rm -f core conftest.err conftest.$ac_objext \
6142 + conftest$ac_exeext conftest.$ac_ext
6143 LIBS=$ac_check_lib_save_LIBS
6145 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
6146 - $as_echo "$as_val"'`
6147 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6148 +eval ac_res=\$$as_ac_Lib
6149 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6150 $as_echo "$ac_res" >&6; }
6151 -as_val=`eval 'as_val=${'$as_ac_Lib'}
6152 - $as_echo "$as_val"'`
6153 - if test "x$as_val" = x""yes; then
6154 +eval as_val=\$$as_ac_Lib
6155 + if test "x$as_val" = x""yes; then :
6156 BOOST_SERIALIZATION_LIB="-l$ax_lib"; link_serialization="yes"; break
6158 link_serialization="no"
6159 @@ -5163,18 +5024,14 @@ fi
6160 for libextension in `ls $BOOSTLIBDIR/boost_serialization*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_serialization.*\)\.dll.*$;\1;' -e 's;^\(boost_serialization.*\)\.a*$;\1;'` ; do
6161 ax_lib=${libextension}
6162 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
6163 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
6164 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
6165 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
6166 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
6167 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
6168 $as_echo_n "(cached) " >&6
6170 ac_check_lib_save_LIBS=$LIBS
6171 LIBS="-l$ax_lib $LIBS"
6172 -cat >conftest.$ac_ext <<_ACEOF
6175 -cat confdefs.h >>conftest.$ac_ext
6176 -cat >>conftest.$ac_ext <<_ACEOF
6177 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6178 /* end confdefs.h. */
6180 /* Override any GCC internal prototype to avoid an error.
6181 @@ -5192,47 +5049,20 @@ return exit ();
6185 -rm -f conftest.$ac_objext conftest$ac_exeext
6186 -if { (ac_try="$ac_link"
6187 -case "(($ac_try" in
6188 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6189 - *) ac_try_echo=$ac_try;;
6191 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6192 -$as_echo "$ac_try_echo") >&5
6193 - (eval "$ac_link") 2>conftest.er1
6195 - grep -v '^ *+' conftest.er1 >conftest.err
6196 - rm -f conftest.er1
6197 - cat conftest.err >&5
6198 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6199 - (exit $ac_status); } && {
6200 - test -z "$ac_cxx_werror_flag" ||
6201 - test ! -s conftest.err
6202 - } && test -s conftest$ac_exeext && {
6203 - test "$cross_compiling" = yes ||
6204 - $as_test_x conftest$ac_exeext
6206 +if ac_fn_cxx_try_link "$LINENO"; then :
6207 eval "$as_ac_Lib=yes"
6209 - $as_echo "$as_me: failed program was:" >&5
6210 -sed 's/^/| /' conftest.$ac_ext >&5
6212 - eval "$as_ac_Lib=no"
6213 + eval "$as_ac_Lib=no"
6216 -rm -rf conftest.dSYM
6217 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6218 - conftest$ac_exeext conftest.$ac_ext
6219 +rm -f core conftest.err conftest.$ac_objext \
6220 + conftest$ac_exeext conftest.$ac_ext
6221 LIBS=$ac_check_lib_save_LIBS
6223 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
6224 - $as_echo "$as_val"'`
6225 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6226 +eval ac_res=\$$as_ac_Lib
6227 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6228 $as_echo "$ac_res" >&6; }
6229 -as_val=`eval 'as_val=${'$as_ac_Lib'}
6230 - $as_echo "$as_val"'`
6231 - if test "x$as_val" = x""yes; then
6232 +eval as_val=\$$as_ac_Lib
6233 + if test "x$as_val" = x""yes; then :
6234 BOOST_SERIALIZATION_LIB="-l$ax_lib"; link_serialization="yes"; break
6236 link_serialization="no"
6237 @@ -5244,18 +5074,14 @@ fi
6239 for ax_lib in $ax_boost_user_serialization_lib boost_serialization-$ax_boost_user_serialization_lib; do
6240 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh`
6241 -{ $as_echo "$as_me:$LINENO: checking for main in -l$ax_lib" >&5
6242 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5
6243 $as_echo_n "checking for main in -l$ax_lib... " >&6; }
6244 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
6245 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
6246 $as_echo_n "(cached) " >&6
6248 ac_check_lib_save_LIBS=$LIBS
6249 LIBS="-l$ax_lib $LIBS"
6250 -cat >conftest.$ac_ext <<_ACEOF
6253 -cat confdefs.h >>conftest.$ac_ext
6254 -cat >>conftest.$ac_ext <<_ACEOF
6255 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6256 /* end confdefs.h. */
6259 @@ -5267,47 +5093,20 @@ return main ();
6263 -rm -f conftest.$ac_objext conftest$ac_exeext
6264 -if { (ac_try="$ac_link"
6265 -case "(($ac_try" in
6266 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6267 - *) ac_try_echo=$ac_try;;
6269 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6270 -$as_echo "$ac_try_echo") >&5
6271 - (eval "$ac_link") 2>conftest.er1
6273 - grep -v '^ *+' conftest.er1 >conftest.err
6274 - rm -f conftest.er1
6275 - cat conftest.err >&5
6276 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6277 - (exit $ac_status); } && {
6278 - test -z "$ac_cxx_werror_flag" ||
6279 - test ! -s conftest.err
6280 - } && test -s conftest$ac_exeext && {
6281 - test "$cross_compiling" = yes ||
6282 - $as_test_x conftest$ac_exeext
6284 +if ac_fn_cxx_try_link "$LINENO"; then :
6285 eval "$as_ac_Lib=yes"
6287 - $as_echo "$as_me: failed program was:" >&5
6288 -sed 's/^/| /' conftest.$ac_ext >&5
6290 - eval "$as_ac_Lib=no"
6291 + eval "$as_ac_Lib=no"
6294 -rm -rf conftest.dSYM
6295 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6296 - conftest$ac_exeext conftest.$ac_ext
6297 +rm -f core conftest.err conftest.$ac_objext \
6298 + conftest$ac_exeext conftest.$ac_ext
6299 LIBS=$ac_check_lib_save_LIBS
6301 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
6302 - $as_echo "$as_val"'`
6303 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6304 +eval ac_res=\$$as_ac_Lib
6305 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6306 $as_echo "$ac_res" >&6; }
6307 -as_val=`eval 'as_val=${'$as_ac_Lib'}
6308 - $as_echo "$as_val"'`
6309 - if test "x$as_val" = x""yes; then
6310 +eval as_val=\$$as_ac_Lib
6311 + if test "x$as_val" = x""yes; then :
6312 BOOST_SERIALIZATION_LIB="-l$ax_lib"; link_serialization="yes"; break
6314 link_serialization="no"
6315 @@ -5317,9 +5116,7 @@ fi
6318 if test "x$link_serialization" != "xyes"; then
6319 - { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5
6320 -$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
6321 - { (exit 1); exit 1; }; }
6322 + as_fn_error "Could not link against $ax_lib !" "$LINENO" 5
6326 @@ -5330,7 +5127,7 @@ $as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
6329 # Check whether --with-boost-iostreams was given.
6330 -if test "${with_boost_iostreams+set}" = set; then
6331 +if test "${with_boost_iostreams+set}" = set; then :
6332 withval=$with_boost_iostreams;
6333 if test "$withval" = "no"; then
6335 @@ -5358,9 +5155,9 @@ fi
6336 LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
6339 - { $as_echo "$as_me:$LINENO: checking whether the Boost::IOStreams library is available" >&5
6340 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::IOStreams library is available" >&5
6341 $as_echo_n "checking whether the Boost::IOStreams library is available... " >&6; }
6342 -if test "${ax_cv_boost_iostreams+set}" = set; then
6343 +if test "${ax_cv_boost_iostreams+set}" = set; then :
6344 $as_echo_n "(cached) " >&6
6347 @@ -5369,11 +5166,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6348 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6349 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
6351 - cat >conftest.$ac_ext <<_ACEOF
6354 -cat confdefs.h >>conftest.$ac_ext
6355 -cat >>conftest.$ac_ext <<_ACEOF
6356 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6357 /* end confdefs.h. */
6358 #include <boost/iostreams/filtering_stream.hpp>
6359 #include <boost/range/iterator_range.hpp>
6360 @@ -5390,32 +5183,11 @@ std::string input = "Hello World!";
6364 -rm -f conftest.$ac_objext
6365 -if { (ac_try="$ac_compile"
6366 -case "(($ac_try" in
6367 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6368 - *) ac_try_echo=$ac_try;;
6370 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6371 -$as_echo "$ac_try_echo") >&5
6372 - (eval "$ac_compile") 2>conftest.er1
6374 - grep -v '^ *+' conftest.er1 >conftest.err
6375 - rm -f conftest.er1
6376 - cat conftest.err >&5
6377 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6378 - (exit $ac_status); } && {
6379 - test -z "$ac_cxx_werror_flag" ||
6380 - test ! -s conftest.err
6381 - } && test -s conftest.$ac_objext; then
6382 +if ac_fn_cxx_try_compile "$LINENO"; then :
6383 ax_cv_boost_iostreams=yes
6385 - $as_echo "$as_me: failed program was:" >&5
6386 -sed 's/^/| /' conftest.$ac_ext >&5
6388 - ax_cv_boost_iostreams=no
6389 + ax_cv_boost_iostreams=no
6392 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6394 ac_cpp='$CXXCPP $CPPFLAGS'
6395 @@ -5425,31 +5197,25 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
6399 -{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_iostreams" >&5
6400 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_iostreams" >&5
6401 $as_echo "$ax_cv_boost_iostreams" >&6; }
6402 if test "x$ax_cv_boost_iostreams" = "xyes"; then
6404 -cat >>confdefs.h <<\_ACEOF
6405 -#define HAVE_BOOST_IOSTREAMS /**/
6407 +$as_echo "#define HAVE_BOOST_IOSTREAMS /**/" >>confdefs.h
6409 BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
6410 if test "x$ax_boost_user_iostreams_lib" = "x"; then
6411 for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_iostreams.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostreams.*\)\.a*$;\1;'` ; do
6412 ax_lib=${libextension}
6413 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
6414 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
6415 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
6416 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
6417 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
6418 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
6419 $as_echo_n "(cached) " >&6
6421 ac_check_lib_save_LIBS=$LIBS
6422 LIBS="-l$ax_lib $LIBS"
6423 -cat >conftest.$ac_ext <<_ACEOF
6426 -cat confdefs.h >>conftest.$ac_ext
6427 -cat >>conftest.$ac_ext <<_ACEOF
6428 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6429 /* end confdefs.h. */
6431 /* Override any GCC internal prototype to avoid an error.
6432 @@ -5467,47 +5233,20 @@ return exit ();
6436 -rm -f conftest.$ac_objext conftest$ac_exeext
6437 -if { (ac_try="$ac_link"
6438 -case "(($ac_try" in
6439 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6440 - *) ac_try_echo=$ac_try;;
6442 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6443 -$as_echo "$ac_try_echo") >&5
6444 - (eval "$ac_link") 2>conftest.er1
6446 - grep -v '^ *+' conftest.er1 >conftest.err
6447 - rm -f conftest.er1
6448 - cat conftest.err >&5
6449 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6450 - (exit $ac_status); } && {
6451 - test -z "$ac_cxx_werror_flag" ||
6452 - test ! -s conftest.err
6453 - } && test -s conftest$ac_exeext && {
6454 - test "$cross_compiling" = yes ||
6455 - $as_test_x conftest$ac_exeext
6457 +if ac_fn_cxx_try_link "$LINENO"; then :
6458 eval "$as_ac_Lib=yes"
6460 - $as_echo "$as_me: failed program was:" >&5
6461 -sed 's/^/| /' conftest.$ac_ext >&5
6463 - eval "$as_ac_Lib=no"
6464 + eval "$as_ac_Lib=no"
6467 -rm -rf conftest.dSYM
6468 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6469 - conftest$ac_exeext conftest.$ac_ext
6470 +rm -f core conftest.err conftest.$ac_objext \
6471 + conftest$ac_exeext conftest.$ac_ext
6472 LIBS=$ac_check_lib_save_LIBS
6474 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
6475 - $as_echo "$as_val"'`
6476 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6477 +eval ac_res=\$$as_ac_Lib
6478 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6479 $as_echo "$ac_res" >&6; }
6480 -as_val=`eval 'as_val=${'$as_ac_Lib'}
6481 - $as_echo "$as_val"'`
6482 - if test "x$as_val" = x""yes; then
6483 +eval as_val=\$$as_ac_Lib
6484 + if test "x$as_val" = x""yes; then :
6485 BOOST_IOSTREAMS_LIB="-l$ax_lib"; link_iostreams="yes"; break
6488 @@ -5518,18 +5257,14 @@ fi
6489 for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e 's;^\(boost_iostreams.*\)\.a*$;\1;'` ; do
6490 ax_lib=${libextension}
6491 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
6492 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
6493 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
6494 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
6495 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
6496 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
6497 $as_echo_n "(cached) " >&6
6499 ac_check_lib_save_LIBS=$LIBS
6500 LIBS="-l$ax_lib $LIBS"
6501 -cat >conftest.$ac_ext <<_ACEOF
6504 -cat confdefs.h >>conftest.$ac_ext
6505 -cat >>conftest.$ac_ext <<_ACEOF
6506 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6507 /* end confdefs.h. */
6509 /* Override any GCC internal prototype to avoid an error.
6510 @@ -5547,47 +5282,20 @@ return exit ();
6514 -rm -f conftest.$ac_objext conftest$ac_exeext
6515 -if { (ac_try="$ac_link"
6516 -case "(($ac_try" in
6517 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6518 - *) ac_try_echo=$ac_try;;
6520 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6521 -$as_echo "$ac_try_echo") >&5
6522 - (eval "$ac_link") 2>conftest.er1
6524 - grep -v '^ *+' conftest.er1 >conftest.err
6525 - rm -f conftest.er1
6526 - cat conftest.err >&5
6527 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6528 - (exit $ac_status); } && {
6529 - test -z "$ac_cxx_werror_flag" ||
6530 - test ! -s conftest.err
6531 - } && test -s conftest$ac_exeext && {
6532 - test "$cross_compiling" = yes ||
6533 - $as_test_x conftest$ac_exeext
6535 +if ac_fn_cxx_try_link "$LINENO"; then :
6536 eval "$as_ac_Lib=yes"
6538 - $as_echo "$as_me: failed program was:" >&5
6539 -sed 's/^/| /' conftest.$ac_ext >&5
6541 - eval "$as_ac_Lib=no"
6542 + eval "$as_ac_Lib=no"
6545 -rm -rf conftest.dSYM
6546 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6547 - conftest$ac_exeext conftest.$ac_ext
6548 +rm -f core conftest.err conftest.$ac_objext \
6549 + conftest$ac_exeext conftest.$ac_ext
6550 LIBS=$ac_check_lib_save_LIBS
6552 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
6553 - $as_echo "$as_val"'`
6554 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6555 +eval ac_res=\$$as_ac_Lib
6556 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6557 $as_echo "$ac_res" >&6; }
6558 -as_val=`eval 'as_val=${'$as_ac_Lib'}
6559 - $as_echo "$as_val"'`
6560 - if test "x$as_val" = x""yes; then
6561 +eval as_val=\$$as_ac_Lib
6562 + if test "x$as_val" = x""yes; then :
6563 BOOST_IOSTREAMS_LIB="-l$ax_lib"; link_iostreams="yes"; break
6566 @@ -5599,18 +5307,14 @@ fi
6568 for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do
6569 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh`
6570 -{ $as_echo "$as_me:$LINENO: checking for main in -l$ax_lib" >&5
6571 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5
6572 $as_echo_n "checking for main in -l$ax_lib... " >&6; }
6573 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
6574 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
6575 $as_echo_n "(cached) " >&6
6577 ac_check_lib_save_LIBS=$LIBS
6578 LIBS="-l$ax_lib $LIBS"
6579 -cat >conftest.$ac_ext <<_ACEOF
6582 -cat confdefs.h >>conftest.$ac_ext
6583 -cat >>conftest.$ac_ext <<_ACEOF
6584 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6585 /* end confdefs.h. */
6588 @@ -5622,47 +5326,20 @@ return main ();
6592 -rm -f conftest.$ac_objext conftest$ac_exeext
6593 -if { (ac_try="$ac_link"
6594 -case "(($ac_try" in
6595 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6596 - *) ac_try_echo=$ac_try;;
6598 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6599 -$as_echo "$ac_try_echo") >&5
6600 - (eval "$ac_link") 2>conftest.er1
6602 - grep -v '^ *+' conftest.er1 >conftest.err
6603 - rm -f conftest.er1
6604 - cat conftest.err >&5
6605 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6606 - (exit $ac_status); } && {
6607 - test -z "$ac_cxx_werror_flag" ||
6608 - test ! -s conftest.err
6609 - } && test -s conftest$ac_exeext && {
6610 - test "$cross_compiling" = yes ||
6611 - $as_test_x conftest$ac_exeext
6613 +if ac_fn_cxx_try_link "$LINENO"; then :
6614 eval "$as_ac_Lib=yes"
6616 - $as_echo "$as_me: failed program was:" >&5
6617 -sed 's/^/| /' conftest.$ac_ext >&5
6619 - eval "$as_ac_Lib=no"
6620 + eval "$as_ac_Lib=no"
6623 -rm -rf conftest.dSYM
6624 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6625 - conftest$ac_exeext conftest.$ac_ext
6626 +rm -f core conftest.err conftest.$ac_objext \
6627 + conftest$ac_exeext conftest.$ac_ext
6628 LIBS=$ac_check_lib_save_LIBS
6630 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
6631 - $as_echo "$as_val"'`
6632 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6633 +eval ac_res=\$$as_ac_Lib
6634 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6635 $as_echo "$ac_res" >&6; }
6636 -as_val=`eval 'as_val=${'$as_ac_Lib'}
6637 - $as_echo "$as_val"'`
6638 - if test "x$as_val" = x""yes; then
6639 +eval as_val=\$$as_ac_Lib
6640 + if test "x$as_val" = x""yes; then :
6641 BOOST_IOSTREAMS_LIB="-l$ax_lib"; link_iostreams="yes"; break
6644 @@ -5672,9 +5349,7 @@ fi
6647 if test "x$link_iostreams" != "xyes"; then
6648 - { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5
6649 -$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
6650 - { (exit 1); exit 1; }; }
6651 + as_fn_error "Could not link against $ax_lib !" "$LINENO" 5
6655 @@ -5685,7 +5360,7 @@ $as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
6658 # Check whether --with-boost-program-options was given.
6659 -if test "${with_boost_program_options+set}" = set; then
6660 +if test "${with_boost_program_options+set}" = set; then :
6661 withval=$with_boost_program_options;
6662 if test "$withval" = "no"; then
6664 @@ -5712,9 +5387,9 @@ fi
6665 LDFLAGS_SAVED="$LDFLAGS"
6666 LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
6668 - { $as_echo "$as_me:$LINENO: checking whether the Boost::Program_Options library is available" >&5
6669 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Program_Options library is available" >&5
6670 $as_echo_n "checking whether the Boost::Program_Options library is available... " >&6; }
6671 -if test "${ax_cv_boost_program_options+set}" = set; then
6672 +if test "${ax_cv_boost_program_options+set}" = set; then :
6673 $as_echo_n "(cached) " >&6
6676 @@ -5723,11 +5398,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6677 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6678 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
6680 - cat >conftest.$ac_ext <<_ACEOF
6683 -cat confdefs.h >>conftest.$ac_ext
6684 -cat >>conftest.$ac_ext <<_ACEOF
6685 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6686 /* end confdefs.h. */
6687 #include <boost/program_options.hpp>
6689 @@ -5740,32 +5411,11 @@ boost::program_options::options_description generic("Generic options");
6693 -rm -f conftest.$ac_objext
6694 -if { (ac_try="$ac_compile"
6695 -case "(($ac_try" in
6696 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6697 - *) ac_try_echo=$ac_try;;
6699 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6700 -$as_echo "$ac_try_echo") >&5
6701 - (eval "$ac_compile") 2>conftest.er1
6703 - grep -v '^ *+' conftest.er1 >conftest.err
6704 - rm -f conftest.er1
6705 - cat conftest.err >&5
6706 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6707 - (exit $ac_status); } && {
6708 - test -z "$ac_cxx_werror_flag" ||
6709 - test ! -s conftest.err
6710 - } && test -s conftest.$ac_objext; then
6711 +if ac_fn_cxx_try_compile "$LINENO"; then :
6712 ax_cv_boost_program_options=yes
6714 - $as_echo "$as_me: failed program was:" >&5
6715 -sed 's/^/| /' conftest.$ac_ext >&5
6717 - ax_cv_boost_program_options=no
6718 + ax_cv_boost_program_options=no
6721 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6723 ac_cpp='$CXXCPP $CPPFLAGS'
6724 @@ -5775,31 +5425,25 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
6728 -{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_program_options" >&5
6729 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_program_options" >&5
6730 $as_echo "$ax_cv_boost_program_options" >&6; }
6731 if test "$ax_cv_boost_program_options" = yes; then
6733 -cat >>confdefs.h <<\_ACEOF
6734 -#define HAVE_BOOST_PROGRAM_OPTIONS /**/
6736 +$as_echo "#define HAVE_BOOST_PROGRAM_OPTIONS /**/" >>confdefs.h
6738 BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
6739 if test "x$ax_boost_user_program_options_lib" = "x"; then
6740 for libextension in `ls $BOOSTLIBDIR/libboost_program_options*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;' -e 's;^lib\(boost_program_options.*\)\.a*$;\1;'` ; do
6741 ax_lib=${libextension}
6742 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
6743 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
6744 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
6745 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
6746 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
6747 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
6748 $as_echo_n "(cached) " >&6
6750 ac_check_lib_save_LIBS=$LIBS
6751 LIBS="-l$ax_lib $LIBS"
6752 -cat >conftest.$ac_ext <<_ACEOF
6755 -cat confdefs.h >>conftest.$ac_ext
6756 -cat >>conftest.$ac_ext <<_ACEOF
6757 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6758 /* end confdefs.h. */
6760 /* Override any GCC internal prototype to avoid an error.
6761 @@ -5817,47 +5461,20 @@ return exit ();
6765 -rm -f conftest.$ac_objext conftest$ac_exeext
6766 -if { (ac_try="$ac_link"
6767 -case "(($ac_try" in
6768 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6769 - *) ac_try_echo=$ac_try;;
6771 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6772 -$as_echo "$ac_try_echo") >&5
6773 - (eval "$ac_link") 2>conftest.er1
6775 - grep -v '^ *+' conftest.er1 >conftest.err
6776 - rm -f conftest.er1
6777 - cat conftest.err >&5
6778 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6779 - (exit $ac_status); } && {
6780 - test -z "$ac_cxx_werror_flag" ||
6781 - test ! -s conftest.err
6782 - } && test -s conftest$ac_exeext && {
6783 - test "$cross_compiling" = yes ||
6784 - $as_test_x conftest$ac_exeext
6786 +if ac_fn_cxx_try_link "$LINENO"; then :
6787 eval "$as_ac_Lib=yes"
6789 - $as_echo "$as_me: failed program was:" >&5
6790 -sed 's/^/| /' conftest.$ac_ext >&5
6792 - eval "$as_ac_Lib=no"
6793 + eval "$as_ac_Lib=no"
6796 -rm -rf conftest.dSYM
6797 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6798 - conftest$ac_exeext conftest.$ac_ext
6799 +rm -f core conftest.err conftest.$ac_objext \
6800 + conftest$ac_exeext conftest.$ac_ext
6801 LIBS=$ac_check_lib_save_LIBS
6803 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
6804 - $as_echo "$as_val"'`
6805 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6806 +eval ac_res=\$$as_ac_Lib
6807 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6808 $as_echo "$ac_res" >&6; }
6809 -as_val=`eval 'as_val=${'$as_ac_Lib'}
6810 - $as_echo "$as_val"'`
6811 - if test "x$as_val" = x""yes; then
6812 +eval as_val=\$$as_ac_Lib
6813 + if test "x$as_val" = x""yes; then :
6814 BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_program_options="yes"; break
6816 link_program_options="no"
6817 @@ -5868,18 +5485,14 @@ fi
6818 for libextension in `ls $BOOSTLIBDIR/boost_program_options*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.dll.*$;\1;' -e 's;^\(boost_program_options.*\)\.a*$;\1;'` ; do
6819 ax_lib=${libextension}
6820 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
6821 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
6822 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
6823 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
6824 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
6825 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
6826 $as_echo_n "(cached) " >&6
6828 ac_check_lib_save_LIBS=$LIBS
6829 LIBS="-l$ax_lib $LIBS"
6830 -cat >conftest.$ac_ext <<_ACEOF
6833 -cat confdefs.h >>conftest.$ac_ext
6834 -cat >>conftest.$ac_ext <<_ACEOF
6835 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6836 /* end confdefs.h. */
6838 /* Override any GCC internal prototype to avoid an error.
6839 @@ -5897,47 +5510,20 @@ return exit ();
6843 -rm -f conftest.$ac_objext conftest$ac_exeext
6844 -if { (ac_try="$ac_link"
6845 -case "(($ac_try" in
6846 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6847 - *) ac_try_echo=$ac_try;;
6849 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6850 -$as_echo "$ac_try_echo") >&5
6851 - (eval "$ac_link") 2>conftest.er1
6853 - grep -v '^ *+' conftest.er1 >conftest.err
6854 - rm -f conftest.er1
6855 - cat conftest.err >&5
6856 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6857 - (exit $ac_status); } && {
6858 - test -z "$ac_cxx_werror_flag" ||
6859 - test ! -s conftest.err
6860 - } && test -s conftest$ac_exeext && {
6861 - test "$cross_compiling" = yes ||
6862 - $as_test_x conftest$ac_exeext
6864 +if ac_fn_cxx_try_link "$LINENO"; then :
6865 eval "$as_ac_Lib=yes"
6867 - $as_echo "$as_me: failed program was:" >&5
6868 -sed 's/^/| /' conftest.$ac_ext >&5
6870 - eval "$as_ac_Lib=no"
6871 + eval "$as_ac_Lib=no"
6874 -rm -rf conftest.dSYM
6875 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6876 - conftest$ac_exeext conftest.$ac_ext
6877 +rm -f core conftest.err conftest.$ac_objext \
6878 + conftest$ac_exeext conftest.$ac_ext
6879 LIBS=$ac_check_lib_save_LIBS
6881 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
6882 - $as_echo "$as_val"'`
6883 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6884 +eval ac_res=\$$as_ac_Lib
6885 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6886 $as_echo "$ac_res" >&6; }
6887 -as_val=`eval 'as_val=${'$as_ac_Lib'}
6888 - $as_echo "$as_val"'`
6889 - if test "x$as_val" = x""yes; then
6890 +eval as_val=\$$as_ac_Lib
6891 + if test "x$as_val" = x""yes; then :
6892 BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_program_options="yes"; break
6894 link_program_options="no"
6895 @@ -5948,18 +5534,14 @@ fi
6897 for ax_lib in $ax_boost_user_program_options_lib boost_program_options-$ax_boost_user_program_options_lib; do
6898 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh`
6899 -{ $as_echo "$as_me:$LINENO: checking for main in -l$ax_lib" >&5
6900 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5
6901 $as_echo_n "checking for main in -l$ax_lib... " >&6; }
6902 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
6903 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
6904 $as_echo_n "(cached) " >&6
6906 ac_check_lib_save_LIBS=$LIBS
6907 LIBS="-l$ax_lib $LIBS"
6908 -cat >conftest.$ac_ext <<_ACEOF
6911 -cat confdefs.h >>conftest.$ac_ext
6912 -cat >>conftest.$ac_ext <<_ACEOF
6913 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6914 /* end confdefs.h. */
6917 @@ -5971,47 +5553,20 @@ return main ();
6921 -rm -f conftest.$ac_objext conftest$ac_exeext
6922 -if { (ac_try="$ac_link"
6923 -case "(($ac_try" in
6924 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6925 - *) ac_try_echo=$ac_try;;
6927 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6928 -$as_echo "$ac_try_echo") >&5
6929 - (eval "$ac_link") 2>conftest.er1
6931 - grep -v '^ *+' conftest.er1 >conftest.err
6932 - rm -f conftest.er1
6933 - cat conftest.err >&5
6934 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6935 - (exit $ac_status); } && {
6936 - test -z "$ac_cxx_werror_flag" ||
6937 - test ! -s conftest.err
6938 - } && test -s conftest$ac_exeext && {
6939 - test "$cross_compiling" = yes ||
6940 - $as_test_x conftest$ac_exeext
6942 +if ac_fn_cxx_try_link "$LINENO"; then :
6943 eval "$as_ac_Lib=yes"
6945 - $as_echo "$as_me: failed program was:" >&5
6946 -sed 's/^/| /' conftest.$ac_ext >&5
6948 - eval "$as_ac_Lib=no"
6949 + eval "$as_ac_Lib=no"
6952 -rm -rf conftest.dSYM
6953 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6954 - conftest$ac_exeext conftest.$ac_ext
6955 +rm -f core conftest.err conftest.$ac_objext \
6956 + conftest$ac_exeext conftest.$ac_ext
6957 LIBS=$ac_check_lib_save_LIBS
6959 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
6960 - $as_echo "$as_val"'`
6961 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
6962 +eval ac_res=\$$as_ac_Lib
6963 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6964 $as_echo "$ac_res" >&6; }
6965 -as_val=`eval 'as_val=${'$as_ac_Lib'}
6966 - $as_echo "$as_val"'`
6967 - if test "x$as_val" = x""yes; then
6968 +eval as_val=\$$as_ac_Lib
6969 + if test "x$as_val" = x""yes; then :
6970 BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; link_program_options="yes"; break
6972 link_program_options="no"
6973 @@ -6020,9 +5575,7 @@ fi
6976 if test "x$link_program_options" != "xyes"; then
6977 - { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5
6978 -$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
6979 - { (exit 1); exit 1; }; }
6980 + as_fn_error "Could not link against $ax_lib !" "$LINENO" 5
6983 CPPFLAGS="$CPPFLAGS_SAVED"
6984 @@ -6032,7 +5585,7 @@ $as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
6987 # Check whether --with-boost-filesystem was given.
6988 -if test "${with_boost_filesystem+set}" = set; then
6989 +if test "${with_boost_filesystem+set}" = set; then :
6990 withval=$with_boost_filesystem;
6991 if test "$withval" = "no"; then
6993 @@ -6060,9 +5613,9 @@ fi
6994 LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
6997 - { $as_echo "$as_me:$LINENO: checking whether the Boost::Filesystem library is available" >&5
6998 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Filesystem library is available" >&5
6999 $as_echo_n "checking whether the Boost::Filesystem library is available... " >&6; }
7000 -if test "${ax_cv_boost_filesystem+set}" = set; then
7001 +if test "${ax_cv_boost_filesystem+set}" = set; then :
7002 $as_echo_n "(cached) " >&6
7005 @@ -6071,11 +5624,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7006 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7007 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7009 - cat >conftest.$ac_ext <<_ACEOF
7012 -cat confdefs.h >>conftest.$ac_ext
7013 -cat >>conftest.$ac_ext <<_ACEOF
7014 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7015 /* end confdefs.h. */
7016 #include <boost/filesystem/path.hpp>
7018 @@ -6088,32 +5637,11 @@ using namespace boost::filesystem;
7022 -rm -f conftest.$ac_objext
7023 -if { (ac_try="$ac_compile"
7024 -case "(($ac_try" in
7025 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7026 - *) ac_try_echo=$ac_try;;
7028 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7029 -$as_echo "$ac_try_echo") >&5
7030 - (eval "$ac_compile") 2>conftest.er1
7032 - grep -v '^ *+' conftest.er1 >conftest.err
7033 - rm -f conftest.er1
7034 - cat conftest.err >&5
7035 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7036 - (exit $ac_status); } && {
7037 - test -z "$ac_cxx_werror_flag" ||
7038 - test ! -s conftest.err
7039 - } && test -s conftest.$ac_objext; then
7040 +if ac_fn_cxx_try_compile "$LINENO"; then :
7041 ax_cv_boost_filesystem=yes
7043 - $as_echo "$as_me: failed program was:" >&5
7044 -sed 's/^/| /' conftest.$ac_ext >&5
7046 - ax_cv_boost_filesystem=no
7047 + ax_cv_boost_filesystem=no
7050 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7052 ac_cpp='$CXXCPP $CPPFLAGS'
7053 @@ -6123,31 +5651,25 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7057 -{ $as_echo "$as_me:$LINENO: result: $ax_cv_boost_filesystem" >&5
7058 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_filesystem" >&5
7059 $as_echo "$ax_cv_boost_filesystem" >&6; }
7060 if test "x$ax_cv_boost_filesystem" = "xyes"; then
7062 -cat >>confdefs.h <<\_ACEOF
7063 -#define HAVE_BOOST_FILESYSTEM /**/
7065 +$as_echo "#define HAVE_BOOST_FILESYSTEM /**/" >>confdefs.h
7067 BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
7068 if test "x$ax_boost_user_filesystem_lib" = "x"; then
7069 for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.so.*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.a*$;\1;'` ; do
7070 ax_lib=${libextension}
7071 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
7072 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
7073 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
7074 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
7075 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
7076 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
7077 $as_echo_n "(cached) " >&6
7079 ac_check_lib_save_LIBS=$LIBS
7080 LIBS="-l$ax_lib $LIBS"
7081 -cat >conftest.$ac_ext <<_ACEOF
7084 -cat confdefs.h >>conftest.$ac_ext
7085 -cat >>conftest.$ac_ext <<_ACEOF
7086 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7087 /* end confdefs.h. */
7089 /* Override any GCC internal prototype to avoid an error.
7090 @@ -6165,47 +5687,20 @@ return exit ();
7094 -rm -f conftest.$ac_objext conftest$ac_exeext
7095 -if { (ac_try="$ac_link"
7096 -case "(($ac_try" in
7097 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7098 - *) ac_try_echo=$ac_try;;
7100 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7101 -$as_echo "$ac_try_echo") >&5
7102 - (eval "$ac_link") 2>conftest.er1
7104 - grep -v '^ *+' conftest.er1 >conftest.err
7105 - rm -f conftest.er1
7106 - cat conftest.err >&5
7107 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7108 - (exit $ac_status); } && {
7109 - test -z "$ac_cxx_werror_flag" ||
7110 - test ! -s conftest.err
7111 - } && test -s conftest$ac_exeext && {
7112 - test "$cross_compiling" = yes ||
7113 - $as_test_x conftest$ac_exeext
7115 +if ac_fn_cxx_try_link "$LINENO"; then :
7116 eval "$as_ac_Lib=yes"
7118 - $as_echo "$as_me: failed program was:" >&5
7119 -sed 's/^/| /' conftest.$ac_ext >&5
7121 - eval "$as_ac_Lib=no"
7122 + eval "$as_ac_Lib=no"
7125 -rm -rf conftest.dSYM
7126 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7127 - conftest$ac_exeext conftest.$ac_ext
7128 +rm -f core conftest.err conftest.$ac_objext \
7129 + conftest$ac_exeext conftest.$ac_ext
7130 LIBS=$ac_check_lib_save_LIBS
7132 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
7133 - $as_echo "$as_val"'`
7134 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
7135 +eval ac_res=\$$as_ac_Lib
7136 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
7137 $as_echo "$ac_res" >&6; }
7138 -as_val=`eval 'as_val=${'$as_ac_Lib'}
7139 - $as_echo "$as_val"'`
7140 - if test "x$as_val" = x""yes; then
7141 +eval as_val=\$$as_ac_Lib
7142 + if test "x$as_val" = x""yes; then :
7143 BOOST_FILESYSTEM_LIB="-l$ax_lib"; link_filesystem="yes"; break
7145 link_filesystem="no"
7146 @@ -6216,18 +5711,14 @@ fi
7147 for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
7148 ax_lib=${libextension}
7149 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
7150 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
7151 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
7152 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
7153 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
7154 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
7155 $as_echo_n "(cached) " >&6
7157 ac_check_lib_save_LIBS=$LIBS
7158 LIBS="-l$ax_lib $LIBS"
7159 -cat >conftest.$ac_ext <<_ACEOF
7162 -cat confdefs.h >>conftest.$ac_ext
7163 -cat >>conftest.$ac_ext <<_ACEOF
7164 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7165 /* end confdefs.h. */
7167 /* Override any GCC internal prototype to avoid an error.
7168 @@ -6245,47 +5736,20 @@ return exit ();
7172 -rm -f conftest.$ac_objext conftest$ac_exeext
7173 -if { (ac_try="$ac_link"
7174 -case "(($ac_try" in
7175 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7176 - *) ac_try_echo=$ac_try;;
7178 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7179 -$as_echo "$ac_try_echo") >&5
7180 - (eval "$ac_link") 2>conftest.er1
7182 - grep -v '^ *+' conftest.er1 >conftest.err
7183 - rm -f conftest.er1
7184 - cat conftest.err >&5
7185 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7186 - (exit $ac_status); } && {
7187 - test -z "$ac_cxx_werror_flag" ||
7188 - test ! -s conftest.err
7189 - } && test -s conftest$ac_exeext && {
7190 - test "$cross_compiling" = yes ||
7191 - $as_test_x conftest$ac_exeext
7193 +if ac_fn_cxx_try_link "$LINENO"; then :
7194 eval "$as_ac_Lib=yes"
7196 - $as_echo "$as_me: failed program was:" >&5
7197 -sed 's/^/| /' conftest.$ac_ext >&5
7199 - eval "$as_ac_Lib=no"
7200 + eval "$as_ac_Lib=no"
7203 -rm -rf conftest.dSYM
7204 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7205 - conftest$ac_exeext conftest.$ac_ext
7206 +rm -f core conftest.err conftest.$ac_objext \
7207 + conftest$ac_exeext conftest.$ac_ext
7208 LIBS=$ac_check_lib_save_LIBS
7210 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
7211 - $as_echo "$as_val"'`
7212 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
7213 +eval ac_res=\$$as_ac_Lib
7214 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
7215 $as_echo "$ac_res" >&6; }
7216 -as_val=`eval 'as_val=${'$as_ac_Lib'}
7217 - $as_echo "$as_val"'`
7218 - if test "x$as_val" = x""yes; then
7219 +eval as_val=\$$as_ac_Lib
7220 + if test "x$as_val" = x""yes; then :
7221 BOOST_FILESYSTEM_LIB="-l$ax_lib"; link_filesystem="yes"; break
7223 link_filesystem="no"
7224 @@ -6296,18 +5760,14 @@ fi
7226 for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
7227 as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
7228 -{ $as_echo "$as_me:$LINENO: checking for exit in -l$ax_lib" >&5
7229 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
7230 $as_echo_n "checking for exit in -l$ax_lib... " >&6; }
7231 -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
7232 +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
7233 $as_echo_n "(cached) " >&6
7235 ac_check_lib_save_LIBS=$LIBS
7236 LIBS="-l$ax_lib $LIBS"
7237 -cat >conftest.$ac_ext <<_ACEOF
7240 -cat confdefs.h >>conftest.$ac_ext
7241 -cat >>conftest.$ac_ext <<_ACEOF
7242 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7243 /* end confdefs.h. */
7245 /* Override any GCC internal prototype to avoid an error.
7246 @@ -6325,47 +5785,20 @@ return exit ();
7250 -rm -f conftest.$ac_objext conftest$ac_exeext
7251 -if { (ac_try="$ac_link"
7252 -case "(($ac_try" in
7253 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7254 - *) ac_try_echo=$ac_try;;
7256 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7257 -$as_echo "$ac_try_echo") >&5
7258 - (eval "$ac_link") 2>conftest.er1
7260 - grep -v '^ *+' conftest.er1 >conftest.err
7261 - rm -f conftest.er1
7262 - cat conftest.err >&5
7263 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7264 - (exit $ac_status); } && {
7265 - test -z "$ac_cxx_werror_flag" ||
7266 - test ! -s conftest.err
7267 - } && test -s conftest$ac_exeext && {
7268 - test "$cross_compiling" = yes ||
7269 - $as_test_x conftest$ac_exeext
7271 +if ac_fn_cxx_try_link "$LINENO"; then :
7272 eval "$as_ac_Lib=yes"
7274 - $as_echo "$as_me: failed program was:" >&5
7275 -sed 's/^/| /' conftest.$ac_ext >&5
7277 - eval "$as_ac_Lib=no"
7278 + eval "$as_ac_Lib=no"
7281 -rm -rf conftest.dSYM
7282 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7283 - conftest$ac_exeext conftest.$ac_ext
7284 +rm -f core conftest.err conftest.$ac_objext \
7285 + conftest$ac_exeext conftest.$ac_ext
7286 LIBS=$ac_check_lib_save_LIBS
7288 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
7289 - $as_echo "$as_val"'`
7290 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
7291 +eval ac_res=\$$as_ac_Lib
7292 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
7293 $as_echo "$ac_res" >&6; }
7294 -as_val=`eval 'as_val=${'$as_ac_Lib'}
7295 - $as_echo "$as_val"'`
7296 - if test "x$as_val" = x""yes; then
7297 +eval as_val=\$$as_ac_Lib
7298 + if test "x$as_val" = x""yes; then :
7299 BOOST_FILESYSTEM_LIB="-l$ax_lib"; link_filesystem="yes"; break
7301 link_filesystem="no"
7302 @@ -6375,9 +5808,7 @@ fi
7305 if test "x$link_filesystem" != "xyes"; then
7306 - { { $as_echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5
7307 -$as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
7308 - { (exit 1); exit 1; }; }
7309 + as_fn_error "Could not link against $ax_lib !" "$LINENO" 5
7313 @@ -6386,20 +5817,81 @@ $as_echo "$as_me: error: Could not link against $ax_lib !" >&2;}
7317 -# Checks for libraries.
7318 +# Test the boost library whether it was compiled for 64bit system / 32bit
7319 +# system with long file support or not.
7321 +# If not, there is a little help with intructions to get boost library compiled:
7322 +# ./bjam "define=_FILE_OFFSET_BITS=64" release --toolset=gcc --build-type=minimal --layout=system --libdir=/usr/lib/ --prefix=/usr
7323 +# sudo ./bjam "define=_FILE_OFFSET_BITS=64" release --toolset=gcc --build-type=minimal --layout=system --libdir=/usr/lib/ --includedir=/usr/include/boost --prefix=/usr install
7325 +# Check whether --enable-crippled_boost was given.
7326 +if test "${enable_crippled_boost+set}" = set; then :
7327 + enableval=$enable_crippled_boost; USE_CRIPPLED_BOOST="yes"
7329 + USE_CRIPPLED_BOOST="no"
7333 +if test "x$USE_CRIPPLED_BOOST" = "xno"; then
7335 +LIBS="$LIBS $BOOST_IOSTREAMS_LIB"
7337 +ac_cpp='$CXXCPP $CPPFLAGS'
7338 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7339 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7340 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7342 +if test "$cross_compiling" = yes; then :
7343 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7344 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7345 +as_fn_error "cannot run test program while cross compiling
7346 +See \`config.log' for more details." "$LINENO" 5; }
7348 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7349 +/* end confdefs.h. */
7351 +#include <iostream>
7354 +#include <sys/types.h>
7355 +#include <sys/mman.h>
7356 +#include <sys/stat.h>
7358 +#include "src/boost/iostreams/device/nonclosable_file_descriptor.hpp"
7359 +int main(int argc, char **argv) {
7360 + int fd = open("bigfs.tmp", O_RDWR|O_CREAT, 0666);
7361 + boost::iostreams::nonclosable_file_descriptor file(fd);
7362 + long long ret = file.seek(3*1024*1024*1024LL, std::ios_base::beg);
7363 + return ret == 3*1024*1024*1024LL ? 0 : 1;
7366 +if ac_fn_cxx_try_run "$LINENO"; then :
7369 + as_fn_error "Boost library compiled for 32bit architecture without long file support!" "$LINENO" 5
7371 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
7372 + conftest.$ac_objext conftest.beam conftest.$ac_ext
7376 +ac_cpp='$CXXCPP $CPPFLAGS'
7377 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7378 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7379 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7384 -{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
7385 +# Checks for libraries.
7386 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
7387 $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
7388 -if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
7389 +if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then :
7390 $as_echo_n "(cached) " >&6
7392 ac_check_lib_save_LIBS=$LIBS
7393 LIBS="-lpthread $LIBS"
7394 -cat >conftest.$ac_ext <<_ACEOF
7397 -cat confdefs.h >>conftest.$ac_ext
7398 -cat >>conftest.$ac_ext <<_ACEOF
7399 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7400 /* end confdefs.h. */
7402 /* Override any GCC internal prototype to avoid an error.
7403 @@ -6417,43 +5909,18 @@ return pthread_mutex_lock ();
7407 -rm -f conftest.$ac_objext conftest$ac_exeext
7408 -if { (ac_try="$ac_link"
7409 -case "(($ac_try" in
7410 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7411 - *) ac_try_echo=$ac_try;;
7413 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7414 -$as_echo "$ac_try_echo") >&5
7415 - (eval "$ac_link") 2>conftest.er1
7417 - grep -v '^ *+' conftest.er1 >conftest.err
7418 - rm -f conftest.er1
7419 - cat conftest.err >&5
7420 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7421 - (exit $ac_status); } && {
7422 - test -z "$ac_cxx_werror_flag" ||
7423 - test ! -s conftest.err
7424 - } && test -s conftest$ac_exeext && {
7425 - test "$cross_compiling" = yes ||
7426 - $as_test_x conftest$ac_exeext
7428 +if ac_fn_cxx_try_link "$LINENO"; then :
7429 ac_cv_lib_pthread_pthread_mutex_lock=yes
7431 - $as_echo "$as_me: failed program was:" >&5
7432 -sed 's/^/| /' conftest.$ac_ext >&5
7434 - ac_cv_lib_pthread_pthread_mutex_lock=no
7435 + ac_cv_lib_pthread_pthread_mutex_lock=no
7438 -rm -rf conftest.dSYM
7439 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7440 - conftest$ac_exeext conftest.$ac_ext
7441 +rm -f core conftest.err conftest.$ac_objext \
7442 + conftest$ac_exeext conftest.$ac_ext
7443 LIBS=$ac_check_lib_save_LIBS
7445 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
7446 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
7447 $as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
7448 -if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then
7449 +if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then :
7450 cat >>confdefs.h <<_ACEOF
7451 #define HAVE_LIBPTHREAD 1
7453 @@ -6461,24 +5928,17 @@ _ACEOF
7454 LIBS="-lpthread $LIBS"
7457 - { { $as_echo "$as_me:$LINENO: error: Can't find pthread.a" >&5
7458 -$as_echo "$as_me: error: Can't find pthread.a" >&2;}
7459 - { (exit 1); exit 1; }; }
7460 + as_fn_error "Can't find pthread.a" "$LINENO" 5
7464 -{ $as_echo "$as_me:$LINENO: checking for magic_open in -lmagic" >&5
7465 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_open in -lmagic" >&5
7466 $as_echo_n "checking for magic_open in -lmagic... " >&6; }
7467 -if test "${ac_cv_lib_magic_magic_open+set}" = set; then
7468 +if test "${ac_cv_lib_magic_magic_open+set}" = set; then :
7469 $as_echo_n "(cached) " >&6
7471 ac_check_lib_save_LIBS=$LIBS
7472 LIBS="-lmagic $LIBS"
7473 -cat >conftest.$ac_ext <<_ACEOF
7476 -cat confdefs.h >>conftest.$ac_ext
7477 -cat >>conftest.$ac_ext <<_ACEOF
7478 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7479 /* end confdefs.h. */
7481 /* Override any GCC internal prototype to avoid an error.
7482 @@ -6496,43 +5956,18 @@ return magic_open ();
7486 -rm -f conftest.$ac_objext conftest$ac_exeext
7487 -if { (ac_try="$ac_link"
7488 -case "(($ac_try" in
7489 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7490 - *) ac_try_echo=$ac_try;;
7492 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7493 -$as_echo "$ac_try_echo") >&5
7494 - (eval "$ac_link") 2>conftest.er1
7496 - grep -v '^ *+' conftest.er1 >conftest.err
7497 - rm -f conftest.er1
7498 - cat conftest.err >&5
7499 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7500 - (exit $ac_status); } && {
7501 - test -z "$ac_cxx_werror_flag" ||
7502 - test ! -s conftest.err
7503 - } && test -s conftest$ac_exeext && {
7504 - test "$cross_compiling" = yes ||
7505 - $as_test_x conftest$ac_exeext
7507 +if ac_fn_cxx_try_link "$LINENO"; then :
7508 ac_cv_lib_magic_magic_open=yes
7510 - $as_echo "$as_me: failed program was:" >&5
7511 -sed 's/^/| /' conftest.$ac_ext >&5
7513 - ac_cv_lib_magic_magic_open=no
7514 + ac_cv_lib_magic_magic_open=no
7517 -rm -rf conftest.dSYM
7518 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7519 - conftest$ac_exeext conftest.$ac_ext
7520 +rm -f core conftest.err conftest.$ac_objext \
7521 + conftest$ac_exeext conftest.$ac_ext
7522 LIBS=$ac_check_lib_save_LIBS
7524 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_open" >&5
7525 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_open" >&5
7526 $as_echo "$ac_cv_lib_magic_magic_open" >&6; }
7527 -if test "x$ac_cv_lib_magic_magic_open" = x""yes; then
7528 +if test "x$ac_cv_lib_magic_magic_open" = x""yes; then :
7529 cat >>confdefs.h <<_ACEOF
7530 #define HAVE_LIBMAGIC 1
7532 @@ -6540,9 +5975,7 @@ _ACEOF
7533 LIBS="-lmagic $LIBS"
7536 - { { $as_echo "$as_me:$LINENO: error: FuseCompress depends on libmagic." >&5
7537 -$as_echo "$as_me: error: FuseCompress depends on libmagic." >&2;}
7538 - { (exit 1); exit 1; }; }
7539 + as_fn_error "FuseCompress depends on libmagic." "$LINENO" 5
7543 @@ -6553,7 +5986,7 @@ fi
7546 # Check whether --with-lzma was given.
7547 -if test "${with_lzma+set}" = set; then
7548 +if test "${with_lzma+set}" = set; then :
7550 if test "$withval" = "no"; then
7552 @@ -6576,19 +6009,14 @@ fi
7553 LDFLAGS="$LDFLAGS -L$ax_user_lib_path"
7557 -{ $as_echo "$as_me:$LINENO: checking for lzma_code in -llzma" >&5
7558 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5
7559 $as_echo_n "checking for lzma_code in -llzma... " >&6; }
7560 -if test "${ac_cv_lib_lzma_lzma_code+set}" = set; then
7561 +if test "${ac_cv_lib_lzma_lzma_code+set}" = set; then :
7562 $as_echo_n "(cached) " >&6
7564 ac_check_lib_save_LIBS=$LIBS
7566 -cat >conftest.$ac_ext <<_ACEOF
7569 -cat confdefs.h >>conftest.$ac_ext
7570 -cat >>conftest.$ac_ext <<_ACEOF
7571 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7572 /* end confdefs.h. */
7574 /* Override any GCC internal prototype to avoid an error.
7575 @@ -6606,43 +6034,18 @@ return lzma_code ();
7579 -rm -f conftest.$ac_objext conftest$ac_exeext
7580 -if { (ac_try="$ac_link"
7581 -case "(($ac_try" in
7582 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7583 - *) ac_try_echo=$ac_try;;
7585 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7586 -$as_echo "$ac_try_echo") >&5
7587 - (eval "$ac_link") 2>conftest.er1
7589 - grep -v '^ *+' conftest.er1 >conftest.err
7590 - rm -f conftest.er1
7591 - cat conftest.err >&5
7592 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7593 - (exit $ac_status); } && {
7594 - test -z "$ac_cxx_werror_flag" ||
7595 - test ! -s conftest.err
7596 - } && test -s conftest$ac_exeext && {
7597 - test "$cross_compiling" = yes ||
7598 - $as_test_x conftest$ac_exeext
7600 +if ac_fn_cxx_try_link "$LINENO"; then :
7601 ac_cv_lib_lzma_lzma_code=yes
7603 - $as_echo "$as_me: failed program was:" >&5
7604 -sed 's/^/| /' conftest.$ac_ext >&5
7606 - ac_cv_lib_lzma_lzma_code=no
7607 + ac_cv_lib_lzma_lzma_code=no
7610 -rm -rf conftest.dSYM
7611 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7612 - conftest$ac_exeext conftest.$ac_ext
7613 +rm -f core conftest.err conftest.$ac_objext \
7614 + conftest$ac_exeext conftest.$ac_ext
7615 LIBS=$ac_check_lib_save_LIBS
7617 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lzma_lzma_code" >&5
7618 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5
7619 $as_echo "$ac_cv_lib_lzma_lzma_code" >&6; }
7620 -if test "x$ac_cv_lib_lzma_lzma_code" = x""yes; then
7621 +if test "x$ac_cv_lib_lzma_lzma_code" = x""yes; then :
7622 cat >>confdefs.h <<_ACEOF
7623 #define HAVE_LIBLZMA 1
7625 @@ -6657,7 +6060,7 @@ fi
7628 # Check whether --with-z was given.
7629 -if test "${with_z+set}" = set; then
7630 +if test "${with_z+set}" = set; then :
7632 if test "$withval" = "no"; then
7634 @@ -6680,19 +6083,14 @@ fi
7635 LDFLAGS="$LDFLAGS -L$ax_user_lib_path"
7639 -{ $as_echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
7640 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uncompress in -lz" >&5
7641 $as_echo_n "checking for uncompress in -lz... " >&6; }
7642 -if test "${ac_cv_lib_z_uncompress+set}" = set; then
7643 +if test "${ac_cv_lib_z_uncompress+set}" = set; then :
7644 $as_echo_n "(cached) " >&6
7646 ac_check_lib_save_LIBS=$LIBS
7648 -cat >conftest.$ac_ext <<_ACEOF
7651 -cat confdefs.h >>conftest.$ac_ext
7652 -cat >>conftest.$ac_ext <<_ACEOF
7653 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7654 /* end confdefs.h. */
7656 /* Override any GCC internal prototype to avoid an error.
7657 @@ -6710,43 +6108,18 @@ return uncompress ();
7661 -rm -f conftest.$ac_objext conftest$ac_exeext
7662 -if { (ac_try="$ac_link"
7663 -case "(($ac_try" in
7664 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7665 - *) ac_try_echo=$ac_try;;
7667 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7668 -$as_echo "$ac_try_echo") >&5
7669 - (eval "$ac_link") 2>conftest.er1
7671 - grep -v '^ *+' conftest.er1 >conftest.err
7672 - rm -f conftest.er1
7673 - cat conftest.err >&5
7674 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7675 - (exit $ac_status); } && {
7676 - test -z "$ac_cxx_werror_flag" ||
7677 - test ! -s conftest.err
7678 - } && test -s conftest$ac_exeext && {
7679 - test "$cross_compiling" = yes ||
7680 - $as_test_x conftest$ac_exeext
7682 +if ac_fn_cxx_try_link "$LINENO"; then :
7683 ac_cv_lib_z_uncompress=yes
7685 - $as_echo "$as_me: failed program was:" >&5
7686 -sed 's/^/| /' conftest.$ac_ext >&5
7688 - ac_cv_lib_z_uncompress=no
7689 + ac_cv_lib_z_uncompress=no
7692 -rm -rf conftest.dSYM
7693 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7694 - conftest$ac_exeext conftest.$ac_ext
7695 +rm -f core conftest.err conftest.$ac_objext \
7696 + conftest$ac_exeext conftest.$ac_ext
7697 LIBS=$ac_check_lib_save_LIBS
7699 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
7700 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_uncompress" >&5
7701 $as_echo "$ac_cv_lib_z_uncompress" >&6; }
7702 -if test "x$ac_cv_lib_z_uncompress" = x""yes; then
7703 +if test "x$ac_cv_lib_z_uncompress" = x""yes; then :
7704 cat >>confdefs.h <<_ACEOF
7707 @@ -6761,7 +6134,7 @@ fi
7710 # Check whether --with-bz2 was given.
7711 -if test "${with_bz2+set}" = set; then
7712 +if test "${with_bz2+set}" = set; then :
7714 if test "$withval" = "no"; then
7716 @@ -6784,19 +6157,14 @@ fi
7717 LDFLAGS="$LDFLAGS -L$ax_user_lib_path"
7721 -{ $as_echo "$as_me:$LINENO: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5
7722 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzBuffToBuffCompress in -lbz2" >&5
7723 $as_echo_n "checking for BZ2_bzBuffToBuffCompress in -lbz2... " >&6; }
7724 -if test "${ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress+set}" = set; then
7725 +if test "${ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress+set}" = set; then :
7726 $as_echo_n "(cached) " >&6
7728 ac_check_lib_save_LIBS=$LIBS
7730 -cat >conftest.$ac_ext <<_ACEOF
7733 -cat confdefs.h >>conftest.$ac_ext
7734 -cat >>conftest.$ac_ext <<_ACEOF
7735 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7736 /* end confdefs.h. */
7738 /* Override any GCC internal prototype to avoid an error.
7739 @@ -6814,43 +6182,18 @@ return BZ2_bzBuffToBuffCompress ();
7743 -rm -f conftest.$ac_objext conftest$ac_exeext
7744 -if { (ac_try="$ac_link"
7745 -case "(($ac_try" in
7746 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7747 - *) ac_try_echo=$ac_try;;
7749 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7750 -$as_echo "$ac_try_echo") >&5
7751 - (eval "$ac_link") 2>conftest.er1
7753 - grep -v '^ *+' conftest.er1 >conftest.err
7754 - rm -f conftest.er1
7755 - cat conftest.err >&5
7756 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7757 - (exit $ac_status); } && {
7758 - test -z "$ac_cxx_werror_flag" ||
7759 - test ! -s conftest.err
7760 - } && test -s conftest$ac_exeext && {
7761 - test "$cross_compiling" = yes ||
7762 - $as_test_x conftest$ac_exeext
7764 +if ac_fn_cxx_try_link "$LINENO"; then :
7765 ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=yes
7767 - $as_echo "$as_me: failed program was:" >&5
7768 -sed 's/^/| /' conftest.$ac_ext >&5
7770 - ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=no
7771 + ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress=no
7774 -rm -rf conftest.dSYM
7775 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7776 - conftest$ac_exeext conftest.$ac_ext
7777 +rm -f core conftest.err conftest.$ac_objext \
7778 + conftest$ac_exeext conftest.$ac_ext
7779 LIBS=$ac_check_lib_save_LIBS
7781 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" >&5
7782 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" >&5
7783 $as_echo "$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" >&6; }
7784 -if test "x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" = x""yes; then
7785 +if test "x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress" = x""yes; then :
7786 cat >>confdefs.h <<_ACEOF
7787 #define HAVE_LIBBZ2 1
7789 @@ -6865,7 +6208,7 @@ fi
7792 # Check whether --with-lzo2 was given.
7793 -if test "${with_lzo2+set}" = set; then
7794 +if test "${with_lzo2+set}" = set; then :
7796 if test "$withval" = "no"; then
7798 @@ -6888,19 +6231,14 @@ fi
7799 LDFLAGS="$LDFLAGS -L$ax_user_lib_path"
7803 -{ $as_echo "$as_me:$LINENO: checking for lzo1x_1_compress in -llzo2" >&5
7804 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_1_compress in -llzo2" >&5
7805 $as_echo_n "checking for lzo1x_1_compress in -llzo2... " >&6; }
7806 -if test "${ac_cv_lib_lzo2_lzo1x_1_compress+set}" = set; then
7807 +if test "${ac_cv_lib_lzo2_lzo1x_1_compress+set}" = set; then :
7808 $as_echo_n "(cached) " >&6
7810 ac_check_lib_save_LIBS=$LIBS
7812 -cat >conftest.$ac_ext <<_ACEOF
7815 -cat confdefs.h >>conftest.$ac_ext
7816 -cat >>conftest.$ac_ext <<_ACEOF
7817 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7818 /* end confdefs.h. */
7820 /* Override any GCC internal prototype to avoid an error.
7821 @@ -6918,43 +6256,18 @@ return lzo1x_1_compress ();
7825 -rm -f conftest.$ac_objext conftest$ac_exeext
7826 -if { (ac_try="$ac_link"
7827 -case "(($ac_try" in
7828 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7829 - *) ac_try_echo=$ac_try;;
7831 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7832 -$as_echo "$ac_try_echo") >&5
7833 - (eval "$ac_link") 2>conftest.er1
7835 - grep -v '^ *+' conftest.er1 >conftest.err
7836 - rm -f conftest.er1
7837 - cat conftest.err >&5
7838 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7839 - (exit $ac_status); } && {
7840 - test -z "$ac_cxx_werror_flag" ||
7841 - test ! -s conftest.err
7842 - } && test -s conftest$ac_exeext && {
7843 - test "$cross_compiling" = yes ||
7844 - $as_test_x conftest$ac_exeext
7846 +if ac_fn_cxx_try_link "$LINENO"; then :
7847 ac_cv_lib_lzo2_lzo1x_1_compress=yes
7849 - $as_echo "$as_me: failed program was:" >&5
7850 -sed 's/^/| /' conftest.$ac_ext >&5
7852 - ac_cv_lib_lzo2_lzo1x_1_compress=no
7853 + ac_cv_lib_lzo2_lzo1x_1_compress=no
7856 -rm -rf conftest.dSYM
7857 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7858 - conftest$ac_exeext conftest.$ac_ext
7859 +rm -f core conftest.err conftest.$ac_objext \
7860 + conftest$ac_exeext conftest.$ac_ext
7861 LIBS=$ac_check_lib_save_LIBS
7863 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lzo2_lzo1x_1_compress" >&5
7864 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzo2_lzo1x_1_compress" >&5
7865 $as_echo "$ac_cv_lib_lzo2_lzo1x_1_compress" >&6; }
7866 -if test "x$ac_cv_lib_lzo2_lzo1x_1_compress" = x""yes; then
7867 +if test "x$ac_cv_lib_lzo2_lzo1x_1_compress" = x""yes; then :
7868 cat >>confdefs.h <<_ACEOF
7869 #define HAVE_LIBLZO2 1
7871 @@ -6972,10 +6285,10 @@ ac_cpp='$CXXCPP $CPPFLAGS'
7872 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7873 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7874 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7875 -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
7876 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
7877 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
7878 if test -z "$CXXCPP"; then
7879 - if test "${ac_cv_prog_CXXCPP+set}" = set; then
7880 + if test "${ac_cv_prog_CXXCPP+set}" = set; then :
7881 $as_echo_n "(cached) " >&6
7883 # Double quotes because CXXCPP needs to be expanded
7884 @@ -6990,11 +6303,7 @@ do
7885 # <limits.h> exists even on freestanding compilers.
7886 # On the NeXT, cc -E runs the code through the compiler's parser,
7887 # not just through cpp. "Syntax error" is here to catch this case.
7888 - cat >conftest.$ac_ext <<_ACEOF
7891 -cat confdefs.h >>conftest.$ac_ext
7892 -cat >>conftest.$ac_ext <<_ACEOF
7893 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7894 /* end confdefs.h. */
7896 # include <limits.h>
7897 @@ -7003,78 +6312,34 @@ cat >>conftest.$ac_ext <<_ACEOF
7901 -if { (ac_try="$ac_cpp conftest.$ac_ext"
7902 -case "(($ac_try" in
7903 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7904 - *) ac_try_echo=$ac_try;;
7906 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7907 -$as_echo "$ac_try_echo") >&5
7908 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
7910 - grep -v '^ *+' conftest.er1 >conftest.err
7911 - rm -f conftest.er1
7912 - cat conftest.err >&5
7913 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7914 - (exit $ac_status); } >/dev/null && {
7915 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
7916 - test ! -s conftest.err
7920 - $as_echo "$as_me: failed program was:" >&5
7921 -sed 's/^/| /' conftest.$ac_ext >&5
7922 +if ac_fn_cxx_try_cpp "$LINENO"; then :
7925 # Broken: fails on valid input.
7929 rm -f conftest.err conftest.$ac_ext
7931 # OK, works on sane cases. Now check whether nonexistent headers
7932 # can be detected and how.
7933 - cat >conftest.$ac_ext <<_ACEOF
7936 -cat confdefs.h >>conftest.$ac_ext
7937 -cat >>conftest.$ac_ext <<_ACEOF
7938 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7939 /* end confdefs.h. */
7940 #include <ac_nonexistent.h>
7942 -if { (ac_try="$ac_cpp conftest.$ac_ext"
7943 -case "(($ac_try" in
7944 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7945 - *) ac_try_echo=$ac_try;;
7947 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7948 -$as_echo "$ac_try_echo") >&5
7949 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
7951 - grep -v '^ *+' conftest.er1 >conftest.err
7952 - rm -f conftest.er1
7953 - cat conftest.err >&5
7954 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7955 - (exit $ac_status); } >/dev/null && {
7956 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
7957 - test ! -s conftest.err
7959 +if ac_fn_cxx_try_cpp "$LINENO"; then :
7960 # Broken: success on invalid input.
7963 - $as_echo "$as_me: failed program was:" >&5
7964 -sed 's/^/| /' conftest.$ac_ext >&5
7966 # Passes both tests.
7971 rm -f conftest.err conftest.$ac_ext
7974 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7975 rm -f conftest.err conftest.$ac_ext
7976 -if $ac_preproc_ok; then
7977 +if $ac_preproc_ok; then :
7981 @@ -7086,7 +6351,7 @@ fi
7983 ac_cv_prog_CXXCPP=$CXXCPP
7985 -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
7986 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
7987 $as_echo "$CXXCPP" >&6; }
7989 for ac_cxx_preproc_warn_flag in '' yes
7990 @@ -7097,11 +6362,7 @@ do
7991 # <limits.h> exists even on freestanding compilers.
7992 # On the NeXT, cc -E runs the code through the compiler's parser,
7993 # not just through cpp. "Syntax error" is here to catch this case.
7994 - cat >conftest.$ac_ext <<_ACEOF
7997 -cat confdefs.h >>conftest.$ac_ext
7998 -cat >>conftest.$ac_ext <<_ACEOF
7999 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8000 /* end confdefs.h. */
8002 # include <limits.h>
8003 @@ -7110,87 +6371,40 @@ cat >>conftest.$ac_ext <<_ACEOF
8007 -if { (ac_try="$ac_cpp conftest.$ac_ext"
8008 -case "(($ac_try" in
8009 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8010 - *) ac_try_echo=$ac_try;;
8012 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8013 -$as_echo "$ac_try_echo") >&5
8014 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
8016 - grep -v '^ *+' conftest.er1 >conftest.err
8017 - rm -f conftest.er1
8018 - cat conftest.err >&5
8019 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8020 - (exit $ac_status); } >/dev/null && {
8021 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
8022 - test ! -s conftest.err
8026 - $as_echo "$as_me: failed program was:" >&5
8027 -sed 's/^/| /' conftest.$ac_ext >&5
8028 +if ac_fn_cxx_try_cpp "$LINENO"; then :
8031 # Broken: fails on valid input.
8035 rm -f conftest.err conftest.$ac_ext
8037 # OK, works on sane cases. Now check whether nonexistent headers
8038 # can be detected and how.
8039 - cat >conftest.$ac_ext <<_ACEOF
8042 -cat confdefs.h >>conftest.$ac_ext
8043 -cat >>conftest.$ac_ext <<_ACEOF
8044 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8045 /* end confdefs.h. */
8046 #include <ac_nonexistent.h>
8048 -if { (ac_try="$ac_cpp conftest.$ac_ext"
8049 -case "(($ac_try" in
8050 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8051 - *) ac_try_echo=$ac_try;;
8053 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8054 -$as_echo "$ac_try_echo") >&5
8055 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
8057 - grep -v '^ *+' conftest.er1 >conftest.err
8058 - rm -f conftest.er1
8059 - cat conftest.err >&5
8060 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8061 - (exit $ac_status); } >/dev/null && {
8062 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
8063 - test ! -s conftest.err
8065 +if ac_fn_cxx_try_cpp "$LINENO"; then :
8066 # Broken: success on invalid input.
8069 - $as_echo "$as_me: failed program was:" >&5
8070 -sed 's/^/| /' conftest.$ac_ext >&5
8072 # Passes both tests.
8077 rm -f conftest.err conftest.$ac_ext
8080 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
8081 rm -f conftest.err conftest.$ac_ext
8082 -if $ac_preproc_ok; then
8084 +if $ac_preproc_ok; then :
8087 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
8088 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8089 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8090 -{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
8091 -See \`config.log' for more details." >&5
8092 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
8093 -See \`config.log' for more details." >&2;}
8094 - { (exit 1); exit 1; }; }; }
8095 +as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check
8096 +See \`config.log' for more details." "$LINENO" 5; }
8100 @@ -7200,9 +6414,9 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
8101 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
8104 -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
8105 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
8106 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
8107 -if test "${ac_cv_path_GREP+set}" = set; then
8108 +if test "${ac_cv_path_GREP+set}" = set; then :
8109 $as_echo_n "(cached) " >&6
8111 if test -z "$GREP"; then
8112 @@ -7213,7 +6427,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
8115 test -z "$as_dir" && as_dir=.
8116 - for ac_prog in grep ggrep; do
8117 + for ac_prog in grep ggrep; do
8118 for ac_exec_ext in '' $ac_executable_extensions; do
8119 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
8120 { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
8121 @@ -7233,7 +6447,7 @@ case `"$ac_path_GREP" --version 2>&1` in
8122 $as_echo 'GREP' >> "conftest.nl"
8123 "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
8124 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8125 - ac_count=`expr $ac_count + 1`
8126 + as_fn_arith $ac_count + 1 && ac_count=$as_val
8127 if test $ac_count -gt ${ac_path_GREP_max-0}; then
8128 # Best one so far, save it but keep looking for a better one
8129 ac_cv_path_GREP="$ac_path_GREP"
8130 @@ -7248,26 +6462,24 @@ esac
8131 $ac_path_GREP_found && break 3
8137 if test -z "$ac_cv_path_GREP"; then
8138 - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
8139 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
8140 - { (exit 1); exit 1; }; }
8141 + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
8144 ac_cv_path_GREP=$GREP
8148 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
8149 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
8150 $as_echo "$ac_cv_path_GREP" >&6; }
8151 GREP="$ac_cv_path_GREP"
8154 -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
8155 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
8156 $as_echo_n "checking for egrep... " >&6; }
8157 -if test "${ac_cv_path_EGREP+set}" = set; then
8158 +if test "${ac_cv_path_EGREP+set}" = set; then :
8159 $as_echo_n "(cached) " >&6
8161 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
8162 @@ -7281,7 +6493,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
8165 test -z "$as_dir" && as_dir=.
8166 - for ac_prog in egrep; do
8167 + for ac_prog in egrep; do
8168 for ac_exec_ext in '' $ac_executable_extensions; do
8169 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
8170 { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
8171 @@ -7301,7 +6513,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
8172 $as_echo 'EGREP' >> "conftest.nl"
8173 "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
8174 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
8175 - ac_count=`expr $ac_count + 1`
8176 + as_fn_arith $ac_count + 1 && ac_count=$as_val
8177 if test $ac_count -gt ${ac_path_EGREP_max-0}; then
8178 # Best one so far, save it but keep looking for a better one
8179 ac_cv_path_EGREP="$ac_path_EGREP"
8180 @@ -7316,12 +6528,10 @@ esac
8181 $ac_path_EGREP_found && break 3
8187 if test -z "$ac_cv_path_EGREP"; then
8188 - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
8189 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
8190 - { (exit 1); exit 1; }; }
8191 + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
8194 ac_cv_path_EGREP=$EGREP
8195 @@ -7329,21 +6539,17 @@ fi
8199 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
8200 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
8201 $as_echo "$ac_cv_path_EGREP" >&6; }
8202 EGREP="$ac_cv_path_EGREP"
8205 -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
8206 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
8207 $as_echo_n "checking for ANSI C header files... " >&6; }
8208 -if test "${ac_cv_header_stdc+set}" = set; then
8209 +if test "${ac_cv_header_stdc+set}" = set; then :
8210 $as_echo_n "(cached) " >&6
8212 - cat >conftest.$ac_ext <<_ACEOF
8215 -cat confdefs.h >>conftest.$ac_ext
8216 -cat >>conftest.$ac_ext <<_ACEOF
8217 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8218 /* end confdefs.h. */
8221 @@ -7358,48 +6564,23 @@ main ()
8225 -rm -f conftest.$ac_objext
8226 -if { (ac_try="$ac_compile"
8227 -case "(($ac_try" in
8228 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8229 - *) ac_try_echo=$ac_try;;
8231 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8232 -$as_echo "$ac_try_echo") >&5
8233 - (eval "$ac_compile") 2>conftest.er1
8235 - grep -v '^ *+' conftest.er1 >conftest.err
8236 - rm -f conftest.er1
8237 - cat conftest.err >&5
8238 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8239 - (exit $ac_status); } && {
8240 - test -z "$ac_cxx_werror_flag" ||
8241 - test ! -s conftest.err
8242 - } && test -s conftest.$ac_objext; then
8243 +if ac_fn_cxx_try_compile "$LINENO"; then :
8244 ac_cv_header_stdc=yes
8246 - $as_echo "$as_me: failed program was:" >&5
8247 -sed 's/^/| /' conftest.$ac_ext >&5
8249 - ac_cv_header_stdc=no
8250 + ac_cv_header_stdc=no
8253 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8255 if test $ac_cv_header_stdc = yes; then
8256 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
8257 - cat >conftest.$ac_ext <<_ACEOF
8260 -cat confdefs.h >>conftest.$ac_ext
8261 -cat >>conftest.$ac_ext <<_ACEOF
8262 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8263 /* end confdefs.h. */
8267 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
8268 - $EGREP "memchr" >/dev/null 2>&1; then
8270 + $EGREP "memchr" >/dev/null 2>&1; then :
8273 ac_cv_header_stdc=no
8275 @@ -7409,18 +6590,14 @@ fi
8277 if test $ac_cv_header_stdc = yes; then
8278 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
8279 - cat >conftest.$ac_ext <<_ACEOF
8282 -cat confdefs.h >>conftest.$ac_ext
8283 -cat >>conftest.$ac_ext <<_ACEOF
8284 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8285 /* end confdefs.h. */
8289 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
8290 - $EGREP "free" >/dev/null 2>&1; then
8292 + $EGREP "free" >/dev/null 2>&1; then :
8295 ac_cv_header_stdc=no
8297 @@ -7430,14 +6607,10 @@ fi
8299 if test $ac_cv_header_stdc = yes; then
8300 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
8301 - if test "$cross_compiling" = yes; then
8302 + if test "$cross_compiling" = yes; then :
8305 - cat >conftest.$ac_ext <<_ACEOF
8308 -cat confdefs.h >>conftest.$ac_ext
8309 -cat >>conftest.$ac_ext <<_ACEOF
8310 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8311 /* end confdefs.h. */
8314 @@ -7464,118 +6637,34 @@ main ()
8318 -rm -f conftest$ac_exeext
8319 -if { (ac_try="$ac_link"
8320 -case "(($ac_try" in
8321 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8322 - *) ac_try_echo=$ac_try;;
8324 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8325 -$as_echo "$ac_try_echo") >&5
8326 - (eval "$ac_link") 2>&5
8328 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8329 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8330 - { (case "(($ac_try" in
8331 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8332 - *) ac_try_echo=$ac_try;;
8334 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8335 -$as_echo "$ac_try_echo") >&5
8336 - (eval "$ac_try") 2>&5
8338 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8339 - (exit $ac_status); }; }; then
8342 - $as_echo "$as_me: program exited with status $ac_status" >&5
8343 -$as_echo "$as_me: failed program was:" >&5
8344 -sed 's/^/| /' conftest.$ac_ext >&5
8345 +if ac_fn_cxx_try_run "$LINENO"; then :
8347 -( exit $ac_status )
8348 -ac_cv_header_stdc=no
8350 + ac_cv_header_stdc=no
8352 -rm -rf conftest.dSYM
8353 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8354 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
8355 + conftest.$ac_objext conftest.beam conftest.$ac_ext
8361 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
8362 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
8363 $as_echo "$ac_cv_header_stdc" >&6; }
8364 if test $ac_cv_header_stdc = yes; then
8366 -cat >>confdefs.h <<\_ACEOF
8367 -#define STDC_HEADERS 1
8369 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
8373 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
8383 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
8384 inttypes.h stdint.h unistd.h
8386 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
8387 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
8388 -$as_echo_n "checking for $ac_header... " >&6; }
8389 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
8390 - $as_echo_n "(cached) " >&6
8392 - cat >conftest.$ac_ext <<_ACEOF
8395 -cat confdefs.h >>conftest.$ac_ext
8396 -cat >>conftest.$ac_ext <<_ACEOF
8397 -/* end confdefs.h. */
8398 -$ac_includes_default
8400 -#include <$ac_header>
8402 -rm -f conftest.$ac_objext
8403 -if { (ac_try="$ac_compile"
8404 -case "(($ac_try" in
8405 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8406 - *) ac_try_echo=$ac_try;;
8408 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8409 -$as_echo "$ac_try_echo") >&5
8410 - (eval "$ac_compile") 2>conftest.er1
8412 - grep -v '^ *+' conftest.er1 >conftest.err
8413 - rm -f conftest.er1
8414 - cat conftest.err >&5
8415 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8416 - (exit $ac_status); } && {
8417 - test -z "$ac_cxx_werror_flag" ||
8418 - test ! -s conftest.err
8419 - } && test -s conftest.$ac_objext; then
8420 - eval "$as_ac_Header=yes"
8422 - $as_echo "$as_me: failed program was:" >&5
8423 -sed 's/^/| /' conftest.$ac_ext >&5
8425 - eval "$as_ac_Header=no"
8428 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8430 -ac_res=`eval 'as_val=${'$as_ac_Header'}
8431 - $as_echo "$as_val"'`
8432 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
8433 -$as_echo "$ac_res" >&6; }
8434 -as_val=`eval 'as_val=${'$as_ac_Header'}
8435 - $as_echo "$as_val"'`
8436 - if test "x$as_val" = x""yes; then
8438 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
8439 +ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
8441 +eval as_val=\$$as_ac_Header
8442 + if test "x$as_val" = x""yes; then :
8443 cat >>confdefs.h <<_ACEOF
8444 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
8446 @@ -7585,287 +6674,19 @@ fi
8450 -if test "${ac_cv_header_attr_xattr_h+set}" = set; then
8451 - { $as_echo "$as_me:$LINENO: checking for attr/xattr.h" >&5
8452 -$as_echo_n "checking for attr/xattr.h... " >&6; }
8453 -if test "${ac_cv_header_attr_xattr_h+set}" = set; then
8454 - $as_echo_n "(cached) " >&6
8456 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_attr_xattr_h" >&5
8457 -$as_echo "$ac_cv_header_attr_xattr_h" >&6; }
8459 - # Is the header compilable?
8460 -{ $as_echo "$as_me:$LINENO: checking attr/xattr.h usability" >&5
8461 -$as_echo_n "checking attr/xattr.h usability... " >&6; }
8462 -cat >conftest.$ac_ext <<_ACEOF
8465 -cat confdefs.h >>conftest.$ac_ext
8466 -cat >>conftest.$ac_ext <<_ACEOF
8467 -/* end confdefs.h. */
8468 -$ac_includes_default
8469 -#include <attr/xattr.h>
8471 -rm -f conftest.$ac_objext
8472 -if { (ac_try="$ac_compile"
8473 -case "(($ac_try" in
8474 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8475 - *) ac_try_echo=$ac_try;;
8477 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8478 -$as_echo "$ac_try_echo") >&5
8479 - (eval "$ac_compile") 2>conftest.er1
8481 - grep -v '^ *+' conftest.er1 >conftest.err
8482 - rm -f conftest.er1
8483 - cat conftest.err >&5
8484 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8485 - (exit $ac_status); } && {
8486 - test -z "$ac_cxx_werror_flag" ||
8487 - test ! -s conftest.err
8488 - } && test -s conftest.$ac_objext; then
8489 - ac_header_compiler=yes
8491 - $as_echo "$as_me: failed program was:" >&5
8492 -sed 's/^/| /' conftest.$ac_ext >&5
8494 - ac_header_compiler=no
8497 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8498 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
8499 -$as_echo "$ac_header_compiler" >&6; }
8501 -# Is the header present?
8502 -{ $as_echo "$as_me:$LINENO: checking attr/xattr.h presence" >&5
8503 -$as_echo_n "checking attr/xattr.h presence... " >&6; }
8504 -cat >conftest.$ac_ext <<_ACEOF
8507 -cat confdefs.h >>conftest.$ac_ext
8508 -cat >>conftest.$ac_ext <<_ACEOF
8509 -/* end confdefs.h. */
8510 -#include <attr/xattr.h>
8512 -if { (ac_try="$ac_cpp conftest.$ac_ext"
8513 -case "(($ac_try" in
8514 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8515 - *) ac_try_echo=$ac_try;;
8517 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8518 -$as_echo "$ac_try_echo") >&5
8519 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
8521 - grep -v '^ *+' conftest.er1 >conftest.err
8522 - rm -f conftest.er1
8523 - cat conftest.err >&5
8524 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8525 - (exit $ac_status); } >/dev/null && {
8526 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
8527 - test ! -s conftest.err
8529 - ac_header_preproc=yes
8531 - $as_echo "$as_me: failed program was:" >&5
8532 -sed 's/^/| /' conftest.$ac_ext >&5
8534 - ac_header_preproc=no
8537 -rm -f conftest.err conftest.$ac_ext
8538 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
8539 -$as_echo "$ac_header_preproc" >&6; }
8541 -# So? What about this header?
8542 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
8544 - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&5
8545 -$as_echo "$as_me: WARNING: attr/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
8546 - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: proceeding with the compiler's result" >&5
8547 -$as_echo "$as_me: WARNING: attr/xattr.h: proceeding with the compiler's result" >&2;}
8548 - ac_header_preproc=yes
8551 - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: present but cannot be compiled" >&5
8552 -$as_echo "$as_me: WARNING: attr/xattr.h: present but cannot be compiled" >&2;}
8553 - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: check for missing prerequisite headers?" >&5
8554 -$as_echo "$as_me: WARNING: attr/xattr.h: check for missing prerequisite headers?" >&2;}
8555 - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: see the Autoconf documentation" >&5
8556 -$as_echo "$as_me: WARNING: attr/xattr.h: see the Autoconf documentation" >&2;}
8557 - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: section \"Present But Cannot Be Compiled\"" >&5
8558 -$as_echo "$as_me: WARNING: attr/xattr.h: section \"Present But Cannot Be Compiled\"" >&2;}
8559 - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: proceeding with the preprocessor's result" >&5
8560 -$as_echo "$as_me: WARNING: attr/xattr.h: proceeding with the preprocessor's result" >&2;}
8561 - { $as_echo "$as_me:$LINENO: WARNING: attr/xattr.h: in the future, the compiler will take precedence" >&5
8562 -$as_echo "$as_me: WARNING: attr/xattr.h: in the future, the compiler will take precedence" >&2;}
8564 -## --------------------------------------- ##
8565 -## Report this to milan.svoboda@centrum.cz ##
8566 -## --------------------------------------- ##
8568 - ) | sed "s/^/$as_me: WARNING: /" >&2
8571 -{ $as_echo "$as_me:$LINENO: checking for attr/xattr.h" >&5
8572 -$as_echo_n "checking for attr/xattr.h... " >&6; }
8573 -if test "${ac_cv_header_attr_xattr_h+set}" = set; then
8574 - $as_echo_n "(cached) " >&6
8576 - ac_cv_header_attr_xattr_h=$ac_header_preproc
8578 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_attr_xattr_h" >&5
8579 -$as_echo "$ac_cv_header_attr_xattr_h" >&6; }
8582 -if test "x$ac_cv_header_attr_xattr_h" = x""yes; then
8584 -cat >>confdefs.h <<\_ACEOF
8585 -#define HAVE_ATTR_XATTR_H /**/
8589 - if test "${ac_cv_header_sys_xattr_h+set}" = set; then
8590 - { $as_echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
8591 -$as_echo_n "checking for sys/xattr.h... " >&6; }
8592 -if test "${ac_cv_header_sys_xattr_h+set}" = set; then
8593 - $as_echo_n "(cached) " >&6
8595 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
8596 -$as_echo "$ac_cv_header_sys_xattr_h" >&6; }
8598 - # Is the header compilable?
8599 -{ $as_echo "$as_me:$LINENO: checking sys/xattr.h usability" >&5
8600 -$as_echo_n "checking sys/xattr.h usability... " >&6; }
8601 -cat >conftest.$ac_ext <<_ACEOF
8604 -cat confdefs.h >>conftest.$ac_ext
8605 -cat >>conftest.$ac_ext <<_ACEOF
8606 -/* end confdefs.h. */
8607 -$ac_includes_default
8608 -#include <sys/xattr.h>
8610 -rm -f conftest.$ac_objext
8611 -if { (ac_try="$ac_compile"
8612 -case "(($ac_try" in
8613 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8614 - *) ac_try_echo=$ac_try;;
8616 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8617 -$as_echo "$ac_try_echo") >&5
8618 - (eval "$ac_compile") 2>conftest.er1
8620 - grep -v '^ *+' conftest.er1 >conftest.err
8621 - rm -f conftest.er1
8622 - cat conftest.err >&5
8623 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8624 - (exit $ac_status); } && {
8625 - test -z "$ac_cxx_werror_flag" ||
8626 - test ! -s conftest.err
8627 - } && test -s conftest.$ac_objext; then
8628 - ac_header_compiler=yes
8630 - $as_echo "$as_me: failed program was:" >&5
8631 -sed 's/^/| /' conftest.$ac_ext >&5
8633 - ac_header_compiler=no
8636 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8637 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
8638 -$as_echo "$ac_header_compiler" >&6; }
8640 -# Is the header present?
8641 -{ $as_echo "$as_me:$LINENO: checking sys/xattr.h presence" >&5
8642 -$as_echo_n "checking sys/xattr.h presence... " >&6; }
8643 -cat >conftest.$ac_ext <<_ACEOF
8646 -cat confdefs.h >>conftest.$ac_ext
8647 -cat >>conftest.$ac_ext <<_ACEOF
8648 -/* end confdefs.h. */
8649 -#include <sys/xattr.h>
8651 -if { (ac_try="$ac_cpp conftest.$ac_ext"
8652 -case "(($ac_try" in
8653 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8654 - *) ac_try_echo=$ac_try;;
8656 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8657 -$as_echo "$ac_try_echo") >&5
8658 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
8660 - grep -v '^ *+' conftest.er1 >conftest.err
8661 - rm -f conftest.er1
8662 - cat conftest.err >&5
8663 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8664 - (exit $ac_status); } >/dev/null && {
8665 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
8666 - test ! -s conftest.err
8668 - ac_header_preproc=yes
8670 - $as_echo "$as_me: failed program was:" >&5
8671 -sed 's/^/| /' conftest.$ac_ext >&5
8673 - ac_header_preproc=no
8675 +ac_fn_cxx_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
8676 +if test "x$ac_cv_header_attr_xattr_h" = x""yes; then :
8678 -rm -f conftest.err conftest.$ac_ext
8679 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
8680 -$as_echo "$ac_header_preproc" >&6; }
8681 +$as_echo "#define HAVE_ATTR_XATTR_H /**/" >>confdefs.h
8683 -# So? What about this header?
8684 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
8686 - { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&5
8687 -$as_echo "$as_me: WARNING: sys/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
8688 - { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the compiler's result" >&5
8689 -$as_echo "$as_me: WARNING: sys/xattr.h: proceeding with the compiler's result" >&2;}
8690 - ac_header_preproc=yes
8693 - { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: present but cannot be compiled" >&5
8694 -$as_echo "$as_me: WARNING: sys/xattr.h: present but cannot be compiled" >&2;}
8695 - { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: check for missing prerequisite headers?" >&5
8696 -$as_echo "$as_me: WARNING: sys/xattr.h: check for missing prerequisite headers?" >&2;}
8697 - { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: see the Autoconf documentation" >&5
8698 -$as_echo "$as_me: WARNING: sys/xattr.h: see the Autoconf documentation" >&2;}
8699 - { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: section \"Present But Cannot Be Compiled\"" >&5
8700 -$as_echo "$as_me: WARNING: sys/xattr.h: section \"Present But Cannot Be Compiled\"" >&2;}
8701 - { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&5
8702 -$as_echo "$as_me: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&2;}
8703 - { $as_echo "$as_me:$LINENO: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&5
8704 -$as_echo "$as_me: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&2;}
8706 -## --------------------------------------- ##
8707 -## Report this to milan.svoboda@centrum.cz ##
8708 -## --------------------------------------- ##
8710 - ) | sed "s/^/$as_me: WARNING: /" >&2
8713 -{ $as_echo "$as_me:$LINENO: checking for sys/xattr.h" >&5
8714 -$as_echo_n "checking for sys/xattr.h... " >&6; }
8715 -if test "${ac_cv_header_sys_xattr_h+set}" = set; then
8716 - $as_echo_n "(cached) " >&6
8718 - ac_cv_header_sys_xattr_h=$ac_header_preproc
8720 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5
8721 -$as_echo "$ac_cv_header_sys_xattr_h" >&6; }
8724 -if test "x$ac_cv_header_sys_xattr_h" = x""yes; then
8725 + ac_fn_cxx_check_header_mongrel "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default"
8726 +if test "x$ac_cv_header_sys_xattr_h" = x""yes; then :
8728 -cat >>confdefs.h <<\_ACEOF
8729 -#define HAVE_SYS_XATTR_H /**/
8731 +$as_echo "#define HAVE_SYS_XATTR_H /**/" >>confdefs.h
8734 - { { $as_echo "$as_me:$LINENO: error: Can't find xattr.h in attr/ or /sys" >&5
8735 -$as_echo "$as_me: error: Can't find xattr.h in attr/ or /sys" >&2;}
8736 - { (exit 1); exit 1; }; }
8737 + as_fn_error "Can't find xattr.h in attr/ or /sys" "$LINENO" 5
8741 @@ -7879,9 +6700,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
8742 if test -n "$ac_tool_prefix"; then
8743 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
8744 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
8745 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8746 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8747 $as_echo_n "checking for $ac_word... " >&6; }
8748 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
8749 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
8750 $as_echo_n "(cached) " >&6
8753 @@ -7894,14 +6715,14 @@ for as_dir in $PATH
8756 test -z "$as_dir" && as_dir=.
8757 - for ac_exec_ext in '' $ac_executable_extensions; do
8758 + for ac_exec_ext in '' $ac_executable_extensions; do
8759 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8760 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
8761 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8762 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8771 @@ -7909,10 +6730,10 @@ esac
8773 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
8774 if test -n "$PKG_CONFIG"; then
8775 - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
8776 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
8777 $as_echo "$PKG_CONFIG" >&6; }
8779 - { $as_echo "$as_me:$LINENO: result: no" >&5
8780 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8781 $as_echo "no" >&6; }
8784 @@ -7922,9 +6743,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
8785 ac_pt_PKG_CONFIG=$PKG_CONFIG
8786 # Extract the first word of "pkg-config", so it can be a program name with args.
8787 set dummy pkg-config; ac_word=$2
8788 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
8789 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
8790 $as_echo_n "checking for $ac_word... " >&6; }
8791 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
8792 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
8793 $as_echo_n "(cached) " >&6
8795 case $ac_pt_PKG_CONFIG in
8796 @@ -7937,14 +6758,14 @@ for as_dir in $PATH
8799 test -z "$as_dir" && as_dir=.
8800 - for ac_exec_ext in '' $ac_executable_extensions; do
8801 + for ac_exec_ext in '' $ac_executable_extensions; do
8802 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8803 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
8804 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8805 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8814 @@ -7952,10 +6773,10 @@ esac
8816 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
8817 if test -n "$ac_pt_PKG_CONFIG"; then
8818 - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
8819 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
8820 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
8822 - { $as_echo "$as_me:$LINENO: result: no" >&5
8823 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8824 $as_echo "no" >&6; }
8827 @@ -7964,7 +6785,7 @@ fi
8829 case $cross_compiling:$ac_tool_warned in
8831 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
8832 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
8833 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
8834 ac_tool_warned=yes ;;
8836 @@ -7977,13 +6798,13 @@ fi
8838 if test -n "$PKG_CONFIG"; then
8839 _pkg_min_version=0.9.0
8840 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
8841 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
8842 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
8843 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
8844 - { $as_echo "$as_me:$LINENO: result: yes" >&5
8845 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8846 $as_echo "yes" >&6; }
8848 - { $as_echo "$as_me:$LINENO: result: no" >&5
8849 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8850 $as_echo "no" >&6; }
8853 @@ -7991,18 +6812,18 @@ $as_echo "no" >&6; }
8857 -{ $as_echo "$as_me:$LINENO: checking for FUSE" >&5
8858 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FUSE" >&5
8859 $as_echo_n "checking for FUSE... " >&6; }
8861 if test -n "$FUSE_CFLAGS"; then
8862 pkg_cv_FUSE_CFLAGS="$FUSE_CFLAGS"
8863 elif test -n "$PKG_CONFIG"; then
8864 if test -n "$PKG_CONFIG" && \
8865 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fuse\"") >&5
8866 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse\""; } >&5
8867 ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
8869 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8870 - (exit $ac_status); }; then
8871 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8872 + test $ac_status = 0; }; then
8873 pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse" 2>/dev/null`
8876 @@ -8014,11 +6835,11 @@ if test -n "$FUSE_LIBS"; then
8877 pkg_cv_FUSE_LIBS="$FUSE_LIBS"
8878 elif test -n "$PKG_CONFIG"; then
8879 if test -n "$PKG_CONFIG" && \
8880 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fuse\"") >&5
8881 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse\""; } >&5
8882 ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
8884 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8885 - (exit $ac_status); }; then
8886 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
8887 + test $ac_status = 0; }; then
8888 pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse" 2>/dev/null`
8891 @@ -8044,7 +6865,7 @@ fi
8892 # Put the nasty error message in config.log where it belongs
8893 echo "$FUSE_PKG_ERRORS" >&5
8895 - { { $as_echo "$as_me:$LINENO: error: Package requirements (fuse) were not met:
8896 + as_fn_error "Package requirements (fuse) were not met:
8900 @@ -8054,71 +6875,41 @@ installed software in a non-standard prefix.
8901 Alternatively, you may set the environment variables FUSE_CFLAGS
8902 and FUSE_LIBS to avoid the need to call pkg-config.
8903 See the pkg-config man page for more details.
8905 -$as_echo "$as_me: error: Package requirements (fuse) were not met:
8909 -Consider adjusting the PKG_CONFIG_PATH environment variable if you
8910 -installed software in a non-standard prefix.
8912 -Alternatively, you may set the environment variables FUSE_CFLAGS
8913 -and FUSE_LIBS to avoid the need to call pkg-config.
8914 -See the pkg-config man page for more details.
8916 - { (exit 1); exit 1; }; }
8917 -elif test $pkg_failed = untried; then
8918 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
8919 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8920 -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
8921 -is in your PATH or set the PKG_CONFIG environment variable to the full
8922 -path to pkg-config.
8924 -Alternatively, you may set the environment variables FUSE_CFLAGS
8925 -and FUSE_LIBS to avoid the need to call pkg-config.
8926 -See the pkg-config man page for more details.
8928 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.
8929 -See \`config.log' for more details." >&5
8930 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
8931 -is in your PATH or set the PKG_CONFIG environment variable to the full
8932 -path to pkg-config.
8934 +elif test $pkg_failed = untried; then
8935 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8936 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8937 +as_fn_error "The pkg-config script could not be found or is too old. Make sure it
8938 +is in your PATH or set the PKG_CONFIG environment variable to the full
8939 +path to pkg-config.
8941 Alternatively, you may set the environment variables FUSE_CFLAGS
8942 and FUSE_LIBS to avoid the need to call pkg-config.
8943 See the pkg-config man page for more details.
8945 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
8946 -See \`config.log' for more details." >&2;}
8947 - { (exit 1); exit 1; }; }; }
8948 +See \`config.log' for more details." "$LINENO" 5; }
8950 FUSE_CFLAGS=$pkg_cv_FUSE_CFLAGS
8951 FUSE_LIBS=$pkg_cv_FUSE_LIBS
8952 - { $as_echo "$as_me:$LINENO: result: yes" >&5
8953 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8954 $as_echo "yes" >&6; }
8958 # Check for a supported FUSE_MAJOR_VERSION.
8959 -{ $as_echo "$as_me:$LINENO: checking For supported FUSE API version" >&5
8960 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking For supported FUSE API version" >&5
8961 $as_echo_n "checking For supported FUSE API version... " >&6; }
8962 -if test "$cross_compiling" = yes; then
8963 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
8964 +if test "$cross_compiling" = yes; then :
8965 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8966 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8967 -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
8968 -See \`config.log' for more details." >&5
8969 -$as_echo "$as_me: error: cannot run test program while cross compiling
8970 -See \`config.log' for more details." >&2;}
8971 - { (exit 1); exit 1; }; }; }
8972 +as_fn_error "cannot run test program while cross compiling
8973 +See \`config.log' for more details." "$LINENO" 5; }
8975 - cat >conftest.$ac_ext <<_ACEOF
8979 -cat confdefs.h >>conftest.$ac_ext
8980 -cat >>conftest.$ac_ext <<_ACEOF
8981 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8982 /* end confdefs.h. */
8989 @@ -8132,62 +6923,32 @@ main ()
8993 -rm -f conftest$ac_exeext
8994 -if { (ac_try="$ac_link"
8995 -case "(($ac_try" in
8996 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8997 - *) ac_try_echo=$ac_try;;
8999 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9000 -$as_echo "$ac_try_echo") >&5
9001 - (eval "$ac_link") 2>&5
9003 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9004 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9005 - { (case "(($ac_try" in
9006 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9007 - *) ac_try_echo=$ac_try;;
9009 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9010 -$as_echo "$ac_try_echo") >&5
9011 - (eval "$ac_try") 2>&5
9013 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9014 - (exit $ac_status); }; }; then
9015 - { $as_echo "$as_me:$LINENO: result: yes" >&5
9016 +if ac_fn_cxx_try_run "$LINENO"; then :
9017 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9018 $as_echo "yes" >&6; }
9020 - $as_echo "$as_me: program exited with status $ac_status" >&5
9021 -$as_echo "$as_me: failed program was:" >&5
9022 -sed 's/^/| /' conftest.$ac_ext >&5
9024 -( exit $ac_status )
9025 -{ $as_echo "$as_me:$LINENO: result: no" >&5
9026 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9027 $as_echo "no" >&6; }
9028 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
9029 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
9030 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
9031 -{ { $as_echo "$as_me:$LINENO: error: FuseCompress requires FUSE 2.6 or newer.
9032 -See \`config.log' for more details." >&5
9033 -$as_echo "$as_me: error: FuseCompress requires FUSE 2.6 or newer.
9034 -See \`config.log' for more details." >&2;}
9035 - { (exit 1); exit 1; }; }; }
9036 +as_fn_error "FuseCompress requires FUSE 2.6 or newer.
9037 +See \`config.log' for more details." "$LINENO" 5; }
9041 -rm -rf conftest.dSYM
9042 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
9043 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
9044 + conftest.$ac_objext conftest.beam conftest.$ac_ext
9049 # Check whether --enable-profile was given.
9050 -if test "${enable_profile+set}" = set; then
9051 +if test "${enable_profile+set}" = set; then :
9052 enableval=$enable_profile; CPPFLAGS="$CPPFLAGS -pg" LDFLAGS="$LDFLAGS -pg"
9056 # Check whether --enable-debug was given.
9057 -if test "${enable_debug+set}" = set; then
9058 +if test "${enable_debug+set}" = set; then :
9059 enableval=$enable_debug; CPPFLAGS="$CPPFLAGS -D_GLIBCXX_DEBUG"
9061 CPPFLAGS="$CPPFLAGS -DNDEBUG"
9062 @@ -8195,24 +6956,15 @@ fi
9065 # Checks for header files.
9072 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
9073 as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
9074 -{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
9075 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
9076 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
9077 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9078 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
9079 $as_echo_n "(cached) " >&6
9081 - cat >conftest.$ac_ext <<_ACEOF
9084 -cat confdefs.h >>conftest.$ac_ext
9085 -cat >>conftest.$ac_ext <<_ACEOF
9086 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9087 /* end confdefs.h. */
9088 #include <sys/types.h>
9090 @@ -8226,41 +6978,18 @@ return 0;
9094 -rm -f conftest.$ac_objext
9095 -if { (ac_try="$ac_compile"
9096 -case "(($ac_try" in
9097 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9098 - *) ac_try_echo=$ac_try;;
9100 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9101 -$as_echo "$ac_try_echo") >&5
9102 - (eval "$ac_compile") 2>conftest.er1
9104 - grep -v '^ *+' conftest.er1 >conftest.err
9105 - rm -f conftest.er1
9106 - cat conftest.err >&5
9107 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9108 - (exit $ac_status); } && {
9109 - test -z "$ac_cxx_werror_flag" ||
9110 - test ! -s conftest.err
9111 - } && test -s conftest.$ac_objext; then
9112 +if ac_fn_cxx_try_compile "$LINENO"; then :
9113 eval "$as_ac_Header=yes"
9115 - $as_echo "$as_me: failed program was:" >&5
9116 -sed 's/^/| /' conftest.$ac_ext >&5
9118 - eval "$as_ac_Header=no"
9119 + eval "$as_ac_Header=no"
9122 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9124 -ac_res=`eval 'as_val=${'$as_ac_Header'}
9125 - $as_echo "$as_val"'`
9126 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9127 +eval ac_res=\$$as_ac_Header
9128 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
9129 $as_echo "$ac_res" >&6; }
9130 -as_val=`eval 'as_val=${'$as_ac_Header'}
9131 - $as_echo "$as_val"'`
9132 - if test "x$as_val" = x""yes; then
9133 +eval as_val=\$$as_ac_Header
9134 + if test "x$as_val" = x""yes; then :
9135 cat >>confdefs.h <<_ACEOF
9136 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
9138 @@ -8271,17 +7000,13 @@ fi
9140 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
9141 if test $ac_header_dirent = dirent.h; then
9142 - { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
9143 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
9144 $as_echo_n "checking for library containing opendir... " >&6; }
9145 -if test "${ac_cv_search_opendir+set}" = set; then
9146 +if test "${ac_cv_search_opendir+set}" = set; then :
9147 $as_echo_n "(cached) " >&6
9149 ac_func_search_save_LIBS=$LIBS
9150 -cat >conftest.$ac_ext <<_ACEOF
9153 -cat confdefs.h >>conftest.$ac_ext
9154 -cat >>conftest.$ac_ext <<_ACEOF
9155 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9156 /* end confdefs.h. */
9158 /* Override any GCC internal prototype to avoid an error.
9159 @@ -8306,70 +7031,39 @@ for ac_lib in '' dir; do
9161 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9163 - rm -f conftest.$ac_objext conftest$ac_exeext
9164 -if { (ac_try="$ac_link"
9165 -case "(($ac_try" in
9166 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9167 - *) ac_try_echo=$ac_try;;
9169 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9170 -$as_echo "$ac_try_echo") >&5
9171 - (eval "$ac_link") 2>conftest.er1
9173 - grep -v '^ *+' conftest.er1 >conftest.err
9174 - rm -f conftest.er1
9175 - cat conftest.err >&5
9176 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9177 - (exit $ac_status); } && {
9178 - test -z "$ac_cxx_werror_flag" ||
9179 - test ! -s conftest.err
9180 - } && test -s conftest$ac_exeext && {
9181 - test "$cross_compiling" = yes ||
9182 - $as_test_x conftest$ac_exeext
9184 + if ac_fn_cxx_try_link "$LINENO"; then :
9185 ac_cv_search_opendir=$ac_res
9187 - $as_echo "$as_me: failed program was:" >&5
9188 -sed 's/^/| /' conftest.$ac_ext >&5
9193 -rm -rf conftest.dSYM
9194 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9195 - conftest$ac_exeext
9196 - if test "${ac_cv_search_opendir+set}" = set; then
9197 +rm -f core conftest.err conftest.$ac_objext \
9198 + conftest$ac_exeext
9199 + if test "${ac_cv_search_opendir+set}" = set; then :
9203 -if test "${ac_cv_search_opendir+set}" = set; then
9205 +if test "${ac_cv_search_opendir+set}" = set; then :
9208 ac_cv_search_opendir=no
9211 LIBS=$ac_func_search_save_LIBS
9213 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
9214 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
9215 $as_echo "$ac_cv_search_opendir" >&6; }
9216 ac_res=$ac_cv_search_opendir
9217 -if test "$ac_res" != no; then
9218 +if test "$ac_res" != no; then :
9219 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
9224 - { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
9225 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
9226 $as_echo_n "checking for library containing opendir... " >&6; }
9227 -if test "${ac_cv_search_opendir+set}" = set; then
9228 +if test "${ac_cv_search_opendir+set}" = set; then :
9229 $as_echo_n "(cached) " >&6
9231 ac_func_search_save_LIBS=$LIBS
9232 -cat >conftest.$ac_ext <<_ACEOF
9235 -cat confdefs.h >>conftest.$ac_ext
9236 -cat >>conftest.$ac_ext <<_ACEOF
9237 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9238 /* end confdefs.h. */
9240 /* Override any GCC internal prototype to avoid an error.
9241 @@ -8394,70 +7088,39 @@ for ac_lib in '' x; do
9243 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9245 - rm -f conftest.$ac_objext conftest$ac_exeext
9246 -if { (ac_try="$ac_link"
9247 -case "(($ac_try" in
9248 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9249 - *) ac_try_echo=$ac_try;;
9251 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9252 -$as_echo "$ac_try_echo") >&5
9253 - (eval "$ac_link") 2>conftest.er1
9255 - grep -v '^ *+' conftest.er1 >conftest.err
9256 - rm -f conftest.er1
9257 - cat conftest.err >&5
9258 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9259 - (exit $ac_status); } && {
9260 - test -z "$ac_cxx_werror_flag" ||
9261 - test ! -s conftest.err
9262 - } && test -s conftest$ac_exeext && {
9263 - test "$cross_compiling" = yes ||
9264 - $as_test_x conftest$ac_exeext
9266 + if ac_fn_cxx_try_link "$LINENO"; then :
9267 ac_cv_search_opendir=$ac_res
9269 - $as_echo "$as_me: failed program was:" >&5
9270 -sed 's/^/| /' conftest.$ac_ext >&5
9275 -rm -rf conftest.dSYM
9276 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9277 - conftest$ac_exeext
9278 - if test "${ac_cv_search_opendir+set}" = set; then
9279 +rm -f core conftest.err conftest.$ac_objext \
9280 + conftest$ac_exeext
9281 + if test "${ac_cv_search_opendir+set}" = set; then :
9285 -if test "${ac_cv_search_opendir+set}" = set; then
9287 +if test "${ac_cv_search_opendir+set}" = set; then :
9290 ac_cv_search_opendir=no
9293 LIBS=$ac_func_search_save_LIBS
9295 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
9296 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
9297 $as_echo "$ac_cv_search_opendir" >&6; }
9298 ac_res=$ac_cv_search_opendir
9299 -if test "$ac_res" != no; then
9300 +if test "$ac_res" != no; then :
9301 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
9307 -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
9308 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
9309 $as_echo_n "checking for ANSI C header files... " >&6; }
9310 -if test "${ac_cv_header_stdc+set}" = set; then
9311 +if test "${ac_cv_header_stdc+set}" = set; then :
9312 $as_echo_n "(cached) " >&6
9314 - cat >conftest.$ac_ext <<_ACEOF
9317 -cat confdefs.h >>conftest.$ac_ext
9318 -cat >>conftest.$ac_ext <<_ACEOF
9319 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9320 /* end confdefs.h. */
9323 @@ -8472,48 +7135,23 @@ main ()
9327 -rm -f conftest.$ac_objext
9328 -if { (ac_try="$ac_compile"
9329 -case "(($ac_try" in
9330 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9331 - *) ac_try_echo=$ac_try;;
9333 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9334 -$as_echo "$ac_try_echo") >&5
9335 - (eval "$ac_compile") 2>conftest.er1
9337 - grep -v '^ *+' conftest.er1 >conftest.err
9338 - rm -f conftest.er1
9339 - cat conftest.err >&5
9340 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9341 - (exit $ac_status); } && {
9342 - test -z "$ac_cxx_werror_flag" ||
9343 - test ! -s conftest.err
9344 - } && test -s conftest.$ac_objext; then
9345 +if ac_fn_cxx_try_compile "$LINENO"; then :
9346 ac_cv_header_stdc=yes
9348 - $as_echo "$as_me: failed program was:" >&5
9349 -sed 's/^/| /' conftest.$ac_ext >&5
9351 - ac_cv_header_stdc=no
9352 + ac_cv_header_stdc=no
9355 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9357 if test $ac_cv_header_stdc = yes; then
9358 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
9359 - cat >conftest.$ac_ext <<_ACEOF
9362 -cat confdefs.h >>conftest.$ac_ext
9363 -cat >>conftest.$ac_ext <<_ACEOF
9364 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9365 /* end confdefs.h. */
9369 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
9370 - $EGREP "memchr" >/dev/null 2>&1; then
9372 + $EGREP "memchr" >/dev/null 2>&1; then :
9375 ac_cv_header_stdc=no
9377 @@ -8523,18 +7161,14 @@ fi
9379 if test $ac_cv_header_stdc = yes; then
9380 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
9381 - cat >conftest.$ac_ext <<_ACEOF
9384 -cat confdefs.h >>conftest.$ac_ext
9385 -cat >>conftest.$ac_ext <<_ACEOF
9386 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9387 /* end confdefs.h. */
9391 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
9392 - $EGREP "free" >/dev/null 2>&1; then
9394 + $EGREP "free" >/dev/null 2>&1; then :
9397 ac_cv_header_stdc=no
9399 @@ -8544,14 +7178,10 @@ fi
9401 if test $ac_cv_header_stdc = yes; then
9402 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
9403 - if test "$cross_compiling" = yes; then
9404 + if test "$cross_compiling" = yes; then :
9407 - cat >conftest.$ac_ext <<_ACEOF
9410 -cat confdefs.h >>conftest.$ac_ext
9411 -cat >>conftest.$ac_ext <<_ACEOF
9412 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9413 /* end confdefs.h. */
9416 @@ -8578,203 +7208,31 @@ main ()
9420 -rm -f conftest$ac_exeext
9421 -if { (ac_try="$ac_link"
9422 -case "(($ac_try" in
9423 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9424 - *) ac_try_echo=$ac_try;;
9426 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9427 -$as_echo "$ac_try_echo") >&5
9428 - (eval "$ac_link") 2>&5
9430 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9431 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9432 - { (case "(($ac_try" in
9433 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9434 - *) ac_try_echo=$ac_try;;
9436 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9437 -$as_echo "$ac_try_echo") >&5
9438 - (eval "$ac_try") 2>&5
9440 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9441 - (exit $ac_status); }; }; then
9444 - $as_echo "$as_me: program exited with status $ac_status" >&5
9445 -$as_echo "$as_me: failed program was:" >&5
9446 -sed 's/^/| /' conftest.$ac_ext >&5
9447 +if ac_fn_cxx_try_run "$LINENO"; then :
9449 -( exit $ac_status )
9450 -ac_cv_header_stdc=no
9452 + ac_cv_header_stdc=no
9454 -rm -rf conftest.dSYM
9455 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
9456 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
9457 + conftest.$ac_objext conftest.beam conftest.$ac_ext
9463 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
9464 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
9465 $as_echo "$ac_cv_header_stdc" >&6; }
9466 if test $ac_cv_header_stdc = yes; then
9468 -cat >>confdefs.h <<\_ACEOF
9469 -#define STDC_HEADERS 1
9471 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
9482 for ac_header in fcntl.h limits.h stddef.h stdlib.h string.h unistd.h utime.h
9484 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
9485 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9486 - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
9487 -$as_echo_n "checking for $ac_header... " >&6; }
9488 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9489 - $as_echo_n "(cached) " >&6
9491 -ac_res=`eval 'as_val=${'$as_ac_Header'}
9492 - $as_echo "$as_val"'`
9493 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9494 -$as_echo "$ac_res" >&6; }
9496 - # Is the header compilable?
9497 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
9498 -$as_echo_n "checking $ac_header usability... " >&6; }
9499 -cat >conftest.$ac_ext <<_ACEOF
9502 -cat confdefs.h >>conftest.$ac_ext
9503 -cat >>conftest.$ac_ext <<_ACEOF
9504 -/* end confdefs.h. */
9505 -$ac_includes_default
9506 -#include <$ac_header>
9508 -rm -f conftest.$ac_objext
9509 -if { (ac_try="$ac_compile"
9510 -case "(($ac_try" in
9511 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9512 - *) ac_try_echo=$ac_try;;
9514 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9515 -$as_echo "$ac_try_echo") >&5
9516 - (eval "$ac_compile") 2>conftest.er1
9518 - grep -v '^ *+' conftest.er1 >conftest.err
9519 - rm -f conftest.er1
9520 - cat conftest.err >&5
9521 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9522 - (exit $ac_status); } && {
9523 - test -z "$ac_cxx_werror_flag" ||
9524 - test ! -s conftest.err
9525 - } && test -s conftest.$ac_objext; then
9526 - ac_header_compiler=yes
9528 - $as_echo "$as_me: failed program was:" >&5
9529 -sed 's/^/| /' conftest.$ac_ext >&5
9531 - ac_header_compiler=no
9534 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9535 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
9536 -$as_echo "$ac_header_compiler" >&6; }
9538 -# Is the header present?
9539 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
9540 -$as_echo_n "checking $ac_header presence... " >&6; }
9541 -cat >conftest.$ac_ext <<_ACEOF
9544 -cat confdefs.h >>conftest.$ac_ext
9545 -cat >>conftest.$ac_ext <<_ACEOF
9546 -/* end confdefs.h. */
9547 -#include <$ac_header>
9549 -if { (ac_try="$ac_cpp conftest.$ac_ext"
9550 -case "(($ac_try" in
9551 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9552 - *) ac_try_echo=$ac_try;;
9554 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9555 -$as_echo "$ac_try_echo") >&5
9556 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
9558 - grep -v '^ *+' conftest.er1 >conftest.err
9559 - rm -f conftest.er1
9560 - cat conftest.err >&5
9561 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9562 - (exit $ac_status); } >/dev/null && {
9563 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
9564 - test ! -s conftest.err
9566 - ac_header_preproc=yes
9568 - $as_echo "$as_me: failed program was:" >&5
9569 -sed 's/^/| /' conftest.$ac_ext >&5
9571 - ac_header_preproc=no
9574 -rm -f conftest.err conftest.$ac_ext
9575 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
9576 -$as_echo "$ac_header_preproc" >&6; }
9578 -# So? What about this header?
9579 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
9581 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
9582 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
9583 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
9584 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
9585 - ac_header_preproc=yes
9588 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
9589 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
9590 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
9591 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
9592 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
9593 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
9594 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
9595 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
9596 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
9597 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
9598 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
9599 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
9601 -## --------------------------------------- ##
9602 -## Report this to milan.svoboda@centrum.cz ##
9603 -## --------------------------------------- ##
9605 - ) | sed "s/^/$as_me: WARNING: /" >&2
9608 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
9609 -$as_echo_n "checking for $ac_header... " >&6; }
9610 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9611 - $as_echo_n "(cached) " >&6
9613 - eval "$as_ac_Header=\$ac_header_preproc"
9615 -ac_res=`eval 'as_val=${'$as_ac_Header'}
9616 - $as_echo "$as_val"'`
9617 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9618 -$as_echo "$ac_res" >&6; }
9621 -as_val=`eval 'as_val=${'$as_ac_Header'}
9622 - $as_echo "$as_val"'`
9623 - if test "x$as_val" = x""yes; then
9625 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
9626 +ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
9627 +eval as_val=\$$as_ac_Header
9628 + if test "x$as_val" = x""yes; then :
9629 cat >>confdefs.h <<_ACEOF
9630 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
9632 @@ -8785,16 +7243,12 @@ done
9635 # Checks for typedefs, structures, and compiler characteristics.
9636 -{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
9637 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
9638 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
9639 -if test "${ac_cv_header_stdbool_h+set}" = set; then
9640 +if test "${ac_cv_header_stdbool_h+set}" = set; then :
9641 $as_echo_n "(cached) " >&6
9643 - cat >conftest.$ac_ext <<_ACEOF
9646 -cat confdefs.h >>conftest.$ac_ext
9647 -cat >>conftest.$ac_ext <<_ACEOF
9648 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9649 /* end confdefs.h. */
9651 #include <stdbool.h>
9652 @@ -8874,159 +7328,39 @@ main ()
9656 -rm -f conftest.$ac_objext
9657 -if { (ac_try="$ac_compile"
9658 -case "(($ac_try" in
9659 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9660 - *) ac_try_echo=$ac_try;;
9662 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9663 -$as_echo "$ac_try_echo") >&5
9664 - (eval "$ac_compile") 2>conftest.er1
9666 - grep -v '^ *+' conftest.er1 >conftest.err
9667 - rm -f conftest.er1
9668 - cat conftest.err >&5
9669 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9670 - (exit $ac_status); } && {
9671 - test -z "$ac_cxx_werror_flag" ||
9672 - test ! -s conftest.err
9673 - } && test -s conftest.$ac_objext; then
9674 +if ac_fn_cxx_try_compile "$LINENO"; then :
9675 ac_cv_header_stdbool_h=yes
9677 - $as_echo "$as_me: failed program was:" >&5
9678 -sed 's/^/| /' conftest.$ac_ext >&5
9680 - ac_cv_header_stdbool_h=no
9681 + ac_cv_header_stdbool_h=no
9684 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9686 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
9687 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
9688 $as_echo "$ac_cv_header_stdbool_h" >&6; }
9689 -{ $as_echo "$as_me:$LINENO: checking for _Bool" >&5
9690 -$as_echo_n "checking for _Bool... " >&6; }
9691 -if test "${ac_cv_type__Bool+set}" = set; then
9692 +ac_fn_cxx_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
9693 +if test "x$ac_cv_type__Bool" = x""yes; then :
9695 +cat >>confdefs.h <<_ACEOF
9696 +#define HAVE__BOOL 1
9702 +if test $ac_cv_header_stdbool_h = yes; then
9704 +$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
9708 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
9709 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
9710 +if test "${ac_cv_c_const+set}" = set; then :
9711 $as_echo_n "(cached) " >&6
9713 - ac_cv_type__Bool=no
9714 -cat >conftest.$ac_ext <<_ACEOF
9717 -cat confdefs.h >>conftest.$ac_ext
9718 -cat >>conftest.$ac_ext <<_ACEOF
9719 -/* end confdefs.h. */
9720 -$ac_includes_default
9724 -if (sizeof (_Bool))
9730 -rm -f conftest.$ac_objext
9731 -if { (ac_try="$ac_compile"
9732 -case "(($ac_try" in
9733 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9734 - *) ac_try_echo=$ac_try;;
9736 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9737 -$as_echo "$ac_try_echo") >&5
9738 - (eval "$ac_compile") 2>conftest.er1
9740 - grep -v '^ *+' conftest.er1 >conftest.err
9741 - rm -f conftest.er1
9742 - cat conftest.err >&5
9743 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9744 - (exit $ac_status); } && {
9745 - test -z "$ac_cxx_werror_flag" ||
9746 - test ! -s conftest.err
9747 - } && test -s conftest.$ac_objext; then
9748 - cat >conftest.$ac_ext <<_ACEOF
9751 -cat confdefs.h >>conftest.$ac_ext
9752 -cat >>conftest.$ac_ext <<_ACEOF
9753 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9754 /* end confdefs.h. */
9755 -$ac_includes_default
9759 -if (sizeof ((_Bool)))
9765 -rm -f conftest.$ac_objext
9766 -if { (ac_try="$ac_compile"
9767 -case "(($ac_try" in
9768 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9769 - *) ac_try_echo=$ac_try;;
9771 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9772 -$as_echo "$ac_try_echo") >&5
9773 - (eval "$ac_compile") 2>conftest.er1
9775 - grep -v '^ *+' conftest.er1 >conftest.err
9776 - rm -f conftest.er1
9777 - cat conftest.err >&5
9778 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9779 - (exit $ac_status); } && {
9780 - test -z "$ac_cxx_werror_flag" ||
9781 - test ! -s conftest.err
9782 - } && test -s conftest.$ac_objext; then
9785 - $as_echo "$as_me: failed program was:" >&5
9786 -sed 's/^/| /' conftest.$ac_ext >&5
9788 - ac_cv_type__Bool=yes
9791 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9793 - $as_echo "$as_me: failed program was:" >&5
9794 -sed 's/^/| /' conftest.$ac_ext >&5
9799 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9801 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
9802 -$as_echo "$ac_cv_type__Bool" >&6; }
9803 -if test "x$ac_cv_type__Bool" = x""yes; then
9805 -cat >>confdefs.h <<_ACEOF
9806 -#define HAVE__BOOL 1
9812 -if test $ac_cv_header_stdbool_h = yes; then
9814 -cat >>confdefs.h <<\_ACEOF
9815 -#define HAVE_STDBOOL_H 1
9820 -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
9821 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
9822 -if test "${ac_cv_c_const+set}" = set; then
9823 - $as_echo_n "(cached) " >&6
9825 - cat >conftest.$ac_ext <<_ACEOF
9828 -cat confdefs.h >>conftest.$ac_ext
9829 -cat >>conftest.$ac_ext <<_ACEOF
9830 -/* end confdefs.h. */
9836 @@ -9084,60 +7418,33 @@ main ()
9840 -rm -f conftest.$ac_objext
9841 -if { (ac_try="$ac_compile"
9842 -case "(($ac_try" in
9843 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9844 - *) ac_try_echo=$ac_try;;
9846 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9847 -$as_echo "$ac_try_echo") >&5
9848 - (eval "$ac_compile") 2>conftest.er1
9850 - grep -v '^ *+' conftest.er1 >conftest.err
9851 - rm -f conftest.er1
9852 - cat conftest.err >&5
9853 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9854 - (exit $ac_status); } && {
9855 - test -z "$ac_cxx_werror_flag" ||
9856 - test ! -s conftest.err
9857 - } && test -s conftest.$ac_objext; then
9858 +if ac_fn_cxx_try_compile "$LINENO"; then :
9861 - $as_echo "$as_me: failed program was:" >&5
9862 -sed 's/^/| /' conftest.$ac_ext >&5
9868 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9870 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
9871 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
9872 $as_echo "$ac_cv_c_const" >&6; }
9873 if test $ac_cv_c_const = no; then
9875 -cat >>confdefs.h <<\_ACEOF
9878 +$as_echo "#define const /**/" >>confdefs.h
9882 -{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
9883 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
9884 $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
9885 -if test "${ac_cv_type_uid_t+set}" = set; then
9886 +if test "${ac_cv_type_uid_t+set}" = set; then :
9887 $as_echo_n "(cached) " >&6
9889 - cat >conftest.$ac_ext <<_ACEOF
9892 -cat confdefs.h >>conftest.$ac_ext
9893 -cat >>conftest.$ac_ext <<_ACEOF
9894 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9895 /* end confdefs.h. */
9896 #include <sys/types.h>
9899 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
9900 - $EGREP "uid_t" >/dev/null 2>&1; then
9901 + $EGREP "uid_t" >/dev/null 2>&1; then :
9902 ac_cv_type_uid_t=yes
9905 @@ -9145,33 +7452,25 @@ fi
9909 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
9910 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
9911 $as_echo "$ac_cv_type_uid_t" >&6; }
9912 if test $ac_cv_type_uid_t = no; then
9914 -cat >>confdefs.h <<\_ACEOF
9917 +$as_echo "#define uid_t int" >>confdefs.h
9920 -cat >>confdefs.h <<\_ACEOF
9923 +$as_echo "#define gid_t int" >>confdefs.h
9927 -{ $as_echo "$as_me:$LINENO: checking for inline" >&5
9928 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
9929 $as_echo_n "checking for inline... " >&6; }
9930 -if test "${ac_cv_c_inline+set}" = set; then
9931 +if test "${ac_cv_c_inline+set}" = set; then :
9932 $as_echo_n "(cached) " >&6
9935 for ac_kw in inline __inline__ __inline; do
9936 - cat >conftest.$ac_ext <<_ACEOF
9939 -cat confdefs.h >>conftest.$ac_ext
9940 -cat >>conftest.$ac_ext <<_ACEOF
9941 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9942 /* end confdefs.h. */
9945 @@ -9180,41 +7479,17 @@ $ac_kw foo_t foo () {return 0; }
9949 -rm -f conftest.$ac_objext
9950 -if { (ac_try="$ac_compile"
9951 -case "(($ac_try" in
9952 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9953 - *) ac_try_echo=$ac_try;;
9955 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9956 -$as_echo "$ac_try_echo") >&5
9957 - (eval "$ac_compile") 2>conftest.er1
9959 - grep -v '^ *+' conftest.er1 >conftest.err
9960 - rm -f conftest.er1
9961 - cat conftest.err >&5
9962 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9963 - (exit $ac_status); } && {
9964 - test -z "$ac_cxx_werror_flag" ||
9965 - test ! -s conftest.err
9966 - } && test -s conftest.$ac_objext; then
9967 +if ac_fn_cxx_try_compile "$LINENO"; then :
9968 ac_cv_c_inline=$ac_kw
9970 - $as_echo "$as_me: failed program was:" >&5
9971 -sed 's/^/| /' conftest.$ac_ext >&5
9976 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9977 test "$ac_cv_c_inline" != no && break
9981 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
9982 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
9983 $as_echo "$ac_cv_c_inline" >&6; }
9986 case $ac_cv_c_inline in
9989 @@ -9230,102 +7505,9 @@ _ACEOF
9993 -{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
9994 -$as_echo_n "checking for mode_t... " >&6; }
9995 -if test "${ac_cv_type_mode_t+set}" = set; then
9996 - $as_echo_n "(cached) " >&6
9998 - ac_cv_type_mode_t=no
9999 -cat >conftest.$ac_ext <<_ACEOF
10002 -cat confdefs.h >>conftest.$ac_ext
10003 -cat >>conftest.$ac_ext <<_ACEOF
10004 -/* end confdefs.h. */
10005 -$ac_includes_default
10009 -if (sizeof (mode_t))
10015 -rm -f conftest.$ac_objext
10016 -if { (ac_try="$ac_compile"
10017 -case "(($ac_try" in
10018 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10019 - *) ac_try_echo=$ac_try;;
10021 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10022 -$as_echo "$ac_try_echo") >&5
10023 - (eval "$ac_compile") 2>conftest.er1
10025 - grep -v '^ *+' conftest.er1 >conftest.err
10026 - rm -f conftest.er1
10027 - cat conftest.err >&5
10028 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10029 - (exit $ac_status); } && {
10030 - test -z "$ac_cxx_werror_flag" ||
10031 - test ! -s conftest.err
10032 - } && test -s conftest.$ac_objext; then
10033 - cat >conftest.$ac_ext <<_ACEOF
10036 -cat confdefs.h >>conftest.$ac_ext
10037 -cat >>conftest.$ac_ext <<_ACEOF
10038 -/* end confdefs.h. */
10039 -$ac_includes_default
10043 -if (sizeof ((mode_t)))
10049 -rm -f conftest.$ac_objext
10050 -if { (ac_try="$ac_compile"
10051 -case "(($ac_try" in
10052 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10053 - *) ac_try_echo=$ac_try;;
10055 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10056 -$as_echo "$ac_try_echo") >&5
10057 - (eval "$ac_compile") 2>conftest.er1
10059 - grep -v '^ *+' conftest.er1 >conftest.err
10060 - rm -f conftest.er1
10061 - cat conftest.err >&5
10062 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10063 - (exit $ac_status); } && {
10064 - test -z "$ac_cxx_werror_flag" ||
10065 - test ! -s conftest.err
10066 - } && test -s conftest.$ac_objext; then
10069 - $as_echo "$as_me: failed program was:" >&5
10070 -sed 's/^/| /' conftest.$ac_ext >&5
10072 - ac_cv_type_mode_t=yes
10075 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10077 - $as_echo "$as_me: failed program was:" >&5
10078 -sed 's/^/| /' conftest.$ac_ext >&5
10082 +ac_fn_cxx_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
10083 +if test "x$ac_cv_type_mode_t" = x""yes; then :
10085 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10087 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
10088 -$as_echo "$ac_cv_type_mode_t" >&6; }
10089 -if test "x$ac_cv_type_mode_t" = x""yes; then
10093 cat >>confdefs.h <<_ACEOF
10094 @@ -9334,102 +7516,9 @@ _ACEOF
10098 -{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
10099 -$as_echo_n "checking for off_t... " >&6; }
10100 -if test "${ac_cv_type_off_t+set}" = set; then
10101 - $as_echo_n "(cached) " >&6
10103 - ac_cv_type_off_t=no
10104 -cat >conftest.$ac_ext <<_ACEOF
10107 -cat confdefs.h >>conftest.$ac_ext
10108 -cat >>conftest.$ac_ext <<_ACEOF
10109 -/* end confdefs.h. */
10110 -$ac_includes_default
10114 -if (sizeof (off_t))
10120 -rm -f conftest.$ac_objext
10121 -if { (ac_try="$ac_compile"
10122 -case "(($ac_try" in
10123 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10124 - *) ac_try_echo=$ac_try;;
10126 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10127 -$as_echo "$ac_try_echo") >&5
10128 - (eval "$ac_compile") 2>conftest.er1
10130 - grep -v '^ *+' conftest.er1 >conftest.err
10131 - rm -f conftest.er1
10132 - cat conftest.err >&5
10133 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10134 - (exit $ac_status); } && {
10135 - test -z "$ac_cxx_werror_flag" ||
10136 - test ! -s conftest.err
10137 - } && test -s conftest.$ac_objext; then
10138 - cat >conftest.$ac_ext <<_ACEOF
10141 -cat confdefs.h >>conftest.$ac_ext
10142 -cat >>conftest.$ac_ext <<_ACEOF
10143 -/* end confdefs.h. */
10144 -$ac_includes_default
10148 -if (sizeof ((off_t)))
10154 -rm -f conftest.$ac_objext
10155 -if { (ac_try="$ac_compile"
10156 -case "(($ac_try" in
10157 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10158 - *) ac_try_echo=$ac_try;;
10160 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10161 -$as_echo "$ac_try_echo") >&5
10162 - (eval "$ac_compile") 2>conftest.er1
10164 - grep -v '^ *+' conftest.er1 >conftest.err
10165 - rm -f conftest.er1
10166 - cat conftest.err >&5
10167 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10168 - (exit $ac_status); } && {
10169 - test -z "$ac_cxx_werror_flag" ||
10170 - test ! -s conftest.err
10171 - } && test -s conftest.$ac_objext; then
10174 - $as_echo "$as_me: failed program was:" >&5
10175 -sed 's/^/| /' conftest.$ac_ext >&5
10177 - ac_cv_type_off_t=yes
10180 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10182 - $as_echo "$as_me: failed program was:" >&5
10183 -sed 's/^/| /' conftest.$ac_ext >&5
10187 +ac_fn_cxx_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
10188 +if test "x$ac_cv_type_off_t" = x""yes; then :
10190 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10192 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
10193 -$as_echo "$ac_cv_type_off_t" >&6; }
10194 -if test "x$ac_cv_type_off_t" = x""yes; then
10198 cat >>confdefs.h <<_ACEOF
10199 @@ -9438,19 +7527,15 @@ _ACEOF
10203 -{ $as_echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
10204 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
10205 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
10206 -if test "${ac_cv_c_restrict+set}" = set; then
10207 +if test "${ac_cv_c_restrict+set}" = set; then :
10208 $as_echo_n "(cached) " >&6
10210 ac_cv_c_restrict=no
10211 # The order here caters to the fact that C++ does not require restrict.
10212 for ac_kw in __restrict __restrict__ _Restrict restrict; do
10213 - cat >conftest.$ac_ext <<_ACEOF
10216 -cat confdefs.h >>conftest.$ac_ext
10217 -cat >>conftest.$ac_ext <<_ACEOF
10218 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10219 /* end confdefs.h. */
10220 typedef int * int_ptr;
10221 int foo (int_ptr $ac_kw ip) {
10222 @@ -9467,46 +7552,20 @@ int s[1];
10226 -rm -f conftest.$ac_objext
10227 -if { (ac_try="$ac_compile"
10228 -case "(($ac_try" in
10229 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10230 - *) ac_try_echo=$ac_try;;
10232 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10233 -$as_echo "$ac_try_echo") >&5
10234 - (eval "$ac_compile") 2>conftest.er1
10236 - grep -v '^ *+' conftest.er1 >conftest.err
10237 - rm -f conftest.er1
10238 - cat conftest.err >&5
10239 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10240 - (exit $ac_status); } && {
10241 - test -z "$ac_cxx_werror_flag" ||
10242 - test ! -s conftest.err
10243 - } && test -s conftest.$ac_objext; then
10244 +if ac_fn_cxx_try_compile "$LINENO"; then :
10245 ac_cv_c_restrict=$ac_kw
10247 - $as_echo "$as_me: failed program was:" >&5
10248 -sed 's/^/| /' conftest.$ac_ext >&5
10253 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10254 test "$ac_cv_c_restrict" != no && break
10258 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
10259 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
10260 $as_echo "$ac_cv_c_restrict" >&6; }
10263 case $ac_cv_c_restrict in
10265 - no) cat >>confdefs.h <<\_ACEOF
10266 -#define restrict /**/
10268 + no) $as_echo "#define restrict /**/" >>confdefs.h
10270 *) cat >>confdefs.h <<_ACEOF
10271 #define restrict $ac_cv_c_restrict
10272 @@ -9514,465 +7573,103 @@ _ACEOF
10276 -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
10277 -$as_echo_n "checking for size_t... " >&6; }
10278 -if test "${ac_cv_type_size_t+set}" = set; then
10279 - $as_echo_n "(cached) " >&6
10280 +ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
10281 +if test "x$ac_cv_type_size_t" = x""yes; then :
10284 - ac_cv_type_size_t=no
10285 -cat >conftest.$ac_ext <<_ACEOF
10288 +cat >>confdefs.h <<_ACEOF
10289 +#define size_t unsigned int
10294 +ac_fn_cxx_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
10295 +if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
10297 +cat >>confdefs.h <<_ACEOF
10298 +#define HAVE_PTRDIFF_T 1
10305 +# Checks for library functions.
10306 +for ac_header in unistd.h
10308 + ac_fn_cxx_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
10309 +if test "x$ac_cv_header_unistd_h" = x""yes; then :
10310 + cat >>confdefs.h <<_ACEOF
10311 +#define HAVE_UNISTD_H 1
10313 -cat confdefs.h >>conftest.$ac_ext
10314 -cat >>conftest.$ac_ext <<_ACEOF
10320 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working chown" >&5
10321 +$as_echo_n "checking for working chown... " >&6; }
10322 +if test "${ac_cv_func_chown_works+set}" = set; then :
10323 + $as_echo_n "(cached) " >&6
10325 + if test "$cross_compiling" = yes; then :
10326 + ac_cv_func_chown_works=no
10328 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10329 /* end confdefs.h. */
10330 $ac_includes_default
10331 +#include <fcntl.h>
10336 -if (sizeof (size_t))
10338 + char *f = "conftest.chown";
10339 + struct stat before, after;
10341 + if (creat (f, 0600) < 0)
10343 + if (stat (f, &before) < 0)
10345 + if (chown (f, (uid_t) -1, (gid_t) -1) == -1)
10347 + if (stat (f, &after) < 0)
10349 + return ! (before.st_uid == after.st_uid && before.st_gid == after.st_gid);
10355 -rm -f conftest.$ac_objext
10356 -if { (ac_try="$ac_compile"
10357 -case "(($ac_try" in
10358 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10359 - *) ac_try_echo=$ac_try;;
10361 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10362 -$as_echo "$ac_try_echo") >&5
10363 - (eval "$ac_compile") 2>conftest.er1
10365 - grep -v '^ *+' conftest.er1 >conftest.err
10366 - rm -f conftest.er1
10367 - cat conftest.err >&5
10368 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10369 - (exit $ac_status); } && {
10370 - test -z "$ac_cxx_werror_flag" ||
10371 - test ! -s conftest.err
10372 - } && test -s conftest.$ac_objext; then
10373 - cat >conftest.$ac_ext <<_ACEOF
10376 -cat confdefs.h >>conftest.$ac_ext
10377 -cat >>conftest.$ac_ext <<_ACEOF
10378 -/* end confdefs.h. */
10379 -$ac_includes_default
10383 -if (sizeof ((size_t)))
10389 -rm -f conftest.$ac_objext
10390 -if { (ac_try="$ac_compile"
10391 -case "(($ac_try" in
10392 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10393 - *) ac_try_echo=$ac_try;;
10395 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10396 -$as_echo "$ac_try_echo") >&5
10397 - (eval "$ac_compile") 2>conftest.er1
10399 - grep -v '^ *+' conftest.er1 >conftest.err
10400 - rm -f conftest.er1
10401 - cat conftest.err >&5
10402 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10403 - (exit $ac_status); } && {
10404 - test -z "$ac_cxx_werror_flag" ||
10405 - test ! -s conftest.err
10406 - } && test -s conftest.$ac_objext; then
10409 - $as_echo "$as_me: failed program was:" >&5
10410 -sed 's/^/| /' conftest.$ac_ext >&5
10412 - ac_cv_type_size_t=yes
10415 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10417 - $as_echo "$as_me: failed program was:" >&5
10418 -sed 's/^/| /' conftest.$ac_ext >&5
10423 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10425 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
10426 -$as_echo "$ac_cv_type_size_t" >&6; }
10427 -if test "x$ac_cv_type_size_t" = x""yes; then
10431 -cat >>confdefs.h <<_ACEOF
10432 -#define size_t unsigned int
10437 -{ $as_echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
10438 -$as_echo_n "checking for ptrdiff_t... " >&6; }
10439 -if test "${ac_cv_type_ptrdiff_t+set}" = set; then
10440 - $as_echo_n "(cached) " >&6
10442 - ac_cv_type_ptrdiff_t=no
10443 -cat >conftest.$ac_ext <<_ACEOF
10446 -cat confdefs.h >>conftest.$ac_ext
10447 -cat >>conftest.$ac_ext <<_ACEOF
10448 -/* end confdefs.h. */
10449 -$ac_includes_default
10453 -if (sizeof (ptrdiff_t))
10459 -rm -f conftest.$ac_objext
10460 -if { (ac_try="$ac_compile"
10461 -case "(($ac_try" in
10462 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10463 - *) ac_try_echo=$ac_try;;
10465 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10466 -$as_echo "$ac_try_echo") >&5
10467 - (eval "$ac_compile") 2>conftest.er1
10469 - grep -v '^ *+' conftest.er1 >conftest.err
10470 - rm -f conftest.er1
10471 - cat conftest.err >&5
10472 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10473 - (exit $ac_status); } && {
10474 - test -z "$ac_cxx_werror_flag" ||
10475 - test ! -s conftest.err
10476 - } && test -s conftest.$ac_objext; then
10477 - cat >conftest.$ac_ext <<_ACEOF
10480 -cat confdefs.h >>conftest.$ac_ext
10481 -cat >>conftest.$ac_ext <<_ACEOF
10482 -/* end confdefs.h. */
10483 -$ac_includes_default
10487 -if (sizeof ((ptrdiff_t)))
10493 -rm -f conftest.$ac_objext
10494 -if { (ac_try="$ac_compile"
10495 -case "(($ac_try" in
10496 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10497 - *) ac_try_echo=$ac_try;;
10499 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10500 -$as_echo "$ac_try_echo") >&5
10501 - (eval "$ac_compile") 2>conftest.er1
10503 - grep -v '^ *+' conftest.er1 >conftest.err
10504 - rm -f conftest.er1
10505 - cat conftest.err >&5
10506 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10507 - (exit $ac_status); } && {
10508 - test -z "$ac_cxx_werror_flag" ||
10509 - test ! -s conftest.err
10510 - } && test -s conftest.$ac_objext; then
10513 - $as_echo "$as_me: failed program was:" >&5
10514 -sed 's/^/| /' conftest.$ac_ext >&5
10516 - ac_cv_type_ptrdiff_t=yes
10519 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10521 - $as_echo "$as_me: failed program was:" >&5
10522 -sed 's/^/| /' conftest.$ac_ext >&5
10527 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10529 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
10530 -$as_echo "$ac_cv_type_ptrdiff_t" >&6; }
10531 -if test "x$ac_cv_type_ptrdiff_t" = x""yes; then
10533 -cat >>confdefs.h <<_ACEOF
10534 -#define HAVE_PTRDIFF_T 1
10541 -# Checks for library functions.
10543 -for ac_header in unistd.h
10545 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
10546 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
10547 - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
10548 -$as_echo_n "checking for $ac_header... " >&6; }
10549 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
10550 - $as_echo_n "(cached) " >&6
10552 -ac_res=`eval 'as_val=${'$as_ac_Header'}
10553 - $as_echo "$as_val"'`
10554 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
10555 -$as_echo "$ac_res" >&6; }
10557 - # Is the header compilable?
10558 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
10559 -$as_echo_n "checking $ac_header usability... " >&6; }
10560 -cat >conftest.$ac_ext <<_ACEOF
10563 -cat confdefs.h >>conftest.$ac_ext
10564 -cat >>conftest.$ac_ext <<_ACEOF
10565 -/* end confdefs.h. */
10566 -$ac_includes_default
10567 -#include <$ac_header>
10569 -rm -f conftest.$ac_objext
10570 -if { (ac_try="$ac_compile"
10571 -case "(($ac_try" in
10572 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10573 - *) ac_try_echo=$ac_try;;
10575 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10576 -$as_echo "$ac_try_echo") >&5
10577 - (eval "$ac_compile") 2>conftest.er1
10579 - grep -v '^ *+' conftest.er1 >conftest.err
10580 - rm -f conftest.er1
10581 - cat conftest.err >&5
10582 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10583 - (exit $ac_status); } && {
10584 - test -z "$ac_cxx_werror_flag" ||
10585 - test ! -s conftest.err
10586 - } && test -s conftest.$ac_objext; then
10587 - ac_header_compiler=yes
10589 - $as_echo "$as_me: failed program was:" >&5
10590 -sed 's/^/| /' conftest.$ac_ext >&5
10592 - ac_header_compiler=no
10595 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10596 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
10597 -$as_echo "$ac_header_compiler" >&6; }
10599 -# Is the header present?
10600 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
10601 -$as_echo_n "checking $ac_header presence... " >&6; }
10602 -cat >conftest.$ac_ext <<_ACEOF
10605 -cat confdefs.h >>conftest.$ac_ext
10606 -cat >>conftest.$ac_ext <<_ACEOF
10607 -/* end confdefs.h. */
10608 -#include <$ac_header>
10610 -if { (ac_try="$ac_cpp conftest.$ac_ext"
10611 -case "(($ac_try" in
10612 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10613 - *) ac_try_echo=$ac_try;;
10615 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10616 -$as_echo "$ac_try_echo") >&5
10617 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
10619 - grep -v '^ *+' conftest.er1 >conftest.err
10620 - rm -f conftest.er1
10621 - cat conftest.err >&5
10622 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10623 - (exit $ac_status); } >/dev/null && {
10624 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
10625 - test ! -s conftest.err
10627 - ac_header_preproc=yes
10629 - $as_echo "$as_me: failed program was:" >&5
10630 -sed 's/^/| /' conftest.$ac_ext >&5
10632 - ac_header_preproc=no
10635 -rm -f conftest.err conftest.$ac_ext
10636 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
10637 -$as_echo "$ac_header_preproc" >&6; }
10639 -# So? What about this header?
10640 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
10642 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
10643 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
10644 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
10645 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
10646 - ac_header_preproc=yes
10649 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
10650 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
10651 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
10652 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
10653 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
10654 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
10655 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
10656 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
10657 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
10658 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
10659 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
10660 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
10662 -## --------------------------------------- ##
10663 -## Report this to milan.svoboda@centrum.cz ##
10664 -## --------------------------------------- ##
10666 - ) | sed "s/^/$as_me: WARNING: /" >&2
10669 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
10670 -$as_echo_n "checking for $ac_header... " >&6; }
10671 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
10672 - $as_echo_n "(cached) " >&6
10674 - eval "$as_ac_Header=\$ac_header_preproc"
10676 -ac_res=`eval 'as_val=${'$as_ac_Header'}
10677 - $as_echo "$as_val"'`
10678 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
10679 -$as_echo "$ac_res" >&6; }
10682 -as_val=`eval 'as_val=${'$as_ac_Header'}
10683 - $as_echo "$as_val"'`
10684 - if test "x$as_val" = x""yes; then
10685 - cat >>confdefs.h <<_ACEOF
10686 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
10693 -{ $as_echo "$as_me:$LINENO: checking for working chown" >&5
10694 -$as_echo_n "checking for working chown... " >&6; }
10695 -if test "${ac_cv_func_chown_works+set}" = set; then
10696 - $as_echo_n "(cached) " >&6
10698 - if test "$cross_compiling" = yes; then
10699 - ac_cv_func_chown_works=no
10701 - cat >conftest.$ac_ext <<_ACEOF
10704 -cat confdefs.h >>conftest.$ac_ext
10705 -cat >>conftest.$ac_ext <<_ACEOF
10706 -/* end confdefs.h. */
10707 -$ac_includes_default
10708 -#include <fcntl.h>
10713 - char *f = "conftest.chown";
10714 - struct stat before, after;
10716 - if (creat (f, 0600) < 0)
10718 - if (stat (f, &before) < 0)
10720 - if (chown (f, (uid_t) -1, (gid_t) -1) == -1)
10722 - if (stat (f, &after) < 0)
10724 - return ! (before.st_uid == after.st_uid && before.st_gid == after.st_gid);
10730 -rm -f conftest$ac_exeext
10731 -if { (ac_try="$ac_link"
10732 -case "(($ac_try" in
10733 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10734 - *) ac_try_echo=$ac_try;;
10736 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10737 -$as_echo "$ac_try_echo") >&5
10738 - (eval "$ac_link") 2>&5
10740 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10741 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10742 - { (case "(($ac_try" in
10743 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10744 - *) ac_try_echo=$ac_try;;
10746 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10747 -$as_echo "$ac_try_echo") >&5
10748 - (eval "$ac_try") 2>&5
10750 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10751 - (exit $ac_status); }; }; then
10752 +if ac_fn_cxx_try_run "$LINENO"; then :
10753 ac_cv_func_chown_works=yes
10755 - $as_echo "$as_me: program exited with status $ac_status" >&5
10756 -$as_echo "$as_me: failed program was:" >&5
10757 -sed 's/^/| /' conftest.$ac_ext >&5
10759 -( exit $ac_status )
10760 -ac_cv_func_chown_works=no
10761 + ac_cv_func_chown_works=no
10763 -rm -rf conftest.dSYM
10764 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
10765 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
10766 + conftest.$ac_objext conftest.beam conftest.$ac_ext
10770 rm -f conftest.chown
10773 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_chown_works" >&5
10774 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_chown_works" >&5
10775 $as_echo "$ac_cv_func_chown_works" >&6; }
10776 if test $ac_cv_func_chown_works = yes; then
10778 -cat >>confdefs.h <<\_ACEOF
10779 -#define HAVE_CHOWN 1
10781 +$as_echo "#define HAVE_CHOWN 1" >>confdefs.h
10785 -{ $as_echo "$as_me:$LINENO: checking whether closedir returns void" >&5
10786 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
10787 $as_echo_n "checking whether closedir returns void... " >&6; }
10788 -if test "${ac_cv_func_closedir_void+set}" = set; then
10789 +if test "${ac_cv_func_closedir_void+set}" = set; then :
10790 $as_echo_n "(cached) " >&6
10792 - if test "$cross_compiling" = yes; then
10793 + if test "$cross_compiling" = yes; then :
10794 ac_cv_func_closedir_void=yes
10796 - cat >conftest.$ac_ext <<_ACEOF
10799 -cat confdefs.h >>conftest.$ac_ext
10800 -cat >>conftest.$ac_ext <<_ACEOF
10801 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10802 /* end confdefs.h. */
10803 $ac_includes_default
10804 #include <$ac_header_dirent>
10805 @@ -9988,76 +7685,43 @@ return closedir (opendir (".")) != 0;
10809 -rm -f conftest$ac_exeext
10810 -if { (ac_try="$ac_link"
10811 -case "(($ac_try" in
10812 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10813 - *) ac_try_echo=$ac_try;;
10815 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10816 -$as_echo "$ac_try_echo") >&5
10817 - (eval "$ac_link") 2>&5
10819 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10820 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10821 - { (case "(($ac_try" in
10822 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10823 - *) ac_try_echo=$ac_try;;
10825 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10826 -$as_echo "$ac_try_echo") >&5
10827 - (eval "$ac_try") 2>&5
10829 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10830 - (exit $ac_status); }; }; then
10831 +if ac_fn_cxx_try_run "$LINENO"; then :
10832 ac_cv_func_closedir_void=no
10834 - $as_echo "$as_me: program exited with status $ac_status" >&5
10835 -$as_echo "$as_me: failed program was:" >&5
10836 -sed 's/^/| /' conftest.$ac_ext >&5
10838 -( exit $ac_status )
10839 -ac_cv_func_closedir_void=yes
10840 + ac_cv_func_closedir_void=yes
10842 -rm -rf conftest.dSYM
10843 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
10844 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
10845 + conftest.$ac_objext conftest.beam conftest.$ac_ext
10850 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5
10851 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_closedir_void" >&5
10852 $as_echo "$ac_cv_func_closedir_void" >&6; }
10853 if test $ac_cv_func_closedir_void = yes; then
10855 -cat >>confdefs.h <<\_ACEOF
10856 -#define CLOSEDIR_VOID 1
10858 +$as_echo "#define CLOSEDIR_VOID 1" >>confdefs.h
10862 -{ $as_echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
10863 -$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; }
10864 -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
10865 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
10866 +$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
10867 +if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
10868 $as_echo_n "(cached) " >&6
10870 rm -f conftest.sym conftest.file
10871 echo >conftest.file
10872 if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
10873 - if test "$cross_compiling" = yes; then
10874 + if test "$cross_compiling" = yes; then :
10875 ac_cv_func_lstat_dereferences_slashed_symlink=no
10877 - cat >conftest.$ac_ext <<_ACEOF
10880 -cat confdefs.h >>conftest.$ac_ext
10881 -cat >>conftest.$ac_ext <<_ACEOF
10882 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10883 /* end confdefs.h. */
10884 $ac_includes_default
10889 - /* Linux will dereference the symlink and fail.
10890 + /* Linux will dereference the symlink and fail, as required by POSIX.
10891 That is better in the sense that it means we will not
10892 have to compile and use the lstat wrapper. */
10893 return lstat ("conftest.sym/", &sbuf) == 0;
10894 @@ -10065,42 +7729,15 @@ struct stat sbuf;
10898 -rm -f conftest$ac_exeext
10899 -if { (ac_try="$ac_link"
10900 -case "(($ac_try" in
10901 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10902 - *) ac_try_echo=$ac_try;;
10904 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10905 -$as_echo "$ac_try_echo") >&5
10906 - (eval "$ac_link") 2>&5
10908 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10909 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10910 - { (case "(($ac_try" in
10911 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10912 - *) ac_try_echo=$ac_try;;
10914 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10915 -$as_echo "$ac_try_echo") >&5
10916 - (eval "$ac_try") 2>&5
10918 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10919 - (exit $ac_status); }; }; then
10920 +if ac_fn_cxx_try_run "$LINENO"; then :
10921 ac_cv_func_lstat_dereferences_slashed_symlink=yes
10923 - $as_echo "$as_me: program exited with status $ac_status" >&5
10924 -$as_echo "$as_me: failed program was:" >&5
10925 -sed 's/^/| /' conftest.$ac_ext >&5
10927 -( exit $ac_status )
10928 -ac_cv_func_lstat_dereferences_slashed_symlink=no
10929 + ac_cv_func_lstat_dereferences_slashed_symlink=no
10931 -rm -rf conftest.dSYM
10932 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
10933 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
10934 + conftest.$ac_objext conftest.beam conftest.$ac_ext
10939 # If the `ln -s' command failed, then we probably don't even
10940 # have an lstat function.
10941 @@ -10109,7 +7746,7 @@ fi
10942 rm -f conftest.sym conftest.file
10945 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
10946 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
10947 $as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
10949 test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
10950 @@ -10119,7 +7756,7 @@ cat >>confdefs.h <<_ACEOF
10954 -if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
10955 +if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
10956 case " $LIBOBJS " in
10957 *" lstat.$ac_objext "* ) ;;
10958 *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
10959 @@ -10128,19 +7765,15 @@ esac
10963 -{ $as_echo "$as_me:$LINENO: checking whether lstat accepts an empty string" >&5
10964 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat accepts an empty string" >&5
10965 $as_echo_n "checking whether lstat accepts an empty string... " >&6; }
10966 -if test "${ac_cv_func_lstat_empty_string_bug+set}" = set; then
10967 +if test "${ac_cv_func_lstat_empty_string_bug+set}" = set; then :
10968 $as_echo_n "(cached) " >&6
10970 - if test "$cross_compiling" = yes; then
10971 + if test "$cross_compiling" = yes; then :
10972 ac_cv_func_lstat_empty_string_bug=yes
10974 - cat >conftest.$ac_ext <<_ACEOF
10977 -cat confdefs.h >>conftest.$ac_ext
10978 -cat >>conftest.$ac_ext <<_ACEOF
10979 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10980 /* end confdefs.h. */
10981 $ac_includes_default
10983 @@ -10152,44 +7785,17 @@ struct stat sbuf;
10987 -rm -f conftest$ac_exeext
10988 -if { (ac_try="$ac_link"
10989 -case "(($ac_try" in
10990 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10991 - *) ac_try_echo=$ac_try;;
10993 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10994 -$as_echo "$ac_try_echo") >&5
10995 - (eval "$ac_link") 2>&5
10997 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10998 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10999 - { (case "(($ac_try" in
11000 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11001 - *) ac_try_echo=$ac_try;;
11003 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11004 -$as_echo "$ac_try_echo") >&5
11005 - (eval "$ac_try") 2>&5
11007 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11008 - (exit $ac_status); }; }; then
11009 +if ac_fn_cxx_try_run "$LINENO"; then :
11010 ac_cv_func_lstat_empty_string_bug=no
11012 - $as_echo "$as_me: program exited with status $ac_status" >&5
11013 -$as_echo "$as_me: failed program was:" >&5
11014 -sed 's/^/| /' conftest.$ac_ext >&5
11016 -( exit $ac_status )
11017 -ac_cv_func_lstat_empty_string_bug=yes
11018 + ac_cv_func_lstat_empty_string_bug=yes
11020 -rm -rf conftest.dSYM
11021 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11022 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11023 + conftest.$ac_objext conftest.beam conftest.$ac_ext
11028 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat_empty_string_bug" >&5
11029 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_empty_string_bug" >&5
11030 $as_echo "$ac_cv_func_lstat_empty_string_bug" >&6; }
11031 if test $ac_cv_func_lstat_empty_string_bug = yes; then
11032 case " $LIBOBJS " in
11033 @@ -10205,29 +7811,25 @@ _ACEOF
11037 -{ $as_echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
11038 -$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; }
11039 -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
11040 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
11041 +$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
11042 +if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
11043 $as_echo_n "(cached) " >&6
11045 rm -f conftest.sym conftest.file
11046 echo >conftest.file
11047 if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
11048 - if test "$cross_compiling" = yes; then
11049 + if test "$cross_compiling" = yes; then :
11050 ac_cv_func_lstat_dereferences_slashed_symlink=no
11052 - cat >conftest.$ac_ext <<_ACEOF
11055 -cat confdefs.h >>conftest.$ac_ext
11056 -cat >>conftest.$ac_ext <<_ACEOF
11057 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11058 /* end confdefs.h. */
11059 $ac_includes_default
11064 - /* Linux will dereference the symlink and fail.
11065 + /* Linux will dereference the symlink and fail, as required by POSIX.
11066 That is better in the sense that it means we will not
11067 have to compile and use the lstat wrapper. */
11068 return lstat ("conftest.sym/", &sbuf) == 0;
11069 @@ -10235,42 +7837,15 @@ struct stat sbuf;
11073 -rm -f conftest$ac_exeext
11074 -if { (ac_try="$ac_link"
11075 -case "(($ac_try" in
11076 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11077 - *) ac_try_echo=$ac_try;;
11079 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11080 -$as_echo "$ac_try_echo") >&5
11081 - (eval "$ac_link") 2>&5
11083 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11084 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11085 - { (case "(($ac_try" in
11086 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11087 - *) ac_try_echo=$ac_try;;
11089 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11090 -$as_echo "$ac_try_echo") >&5
11091 - (eval "$ac_try") 2>&5
11093 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11094 - (exit $ac_status); }; }; then
11095 +if ac_fn_cxx_try_run "$LINENO"; then :
11096 ac_cv_func_lstat_dereferences_slashed_symlink=yes
11098 - $as_echo "$as_me: program exited with status $ac_status" >&5
11099 -$as_echo "$as_me: failed program was:" >&5
11100 -sed 's/^/| /' conftest.$ac_ext >&5
11102 -( exit $ac_status )
11103 -ac_cv_func_lstat_dereferences_slashed_symlink=no
11104 + ac_cv_func_lstat_dereferences_slashed_symlink=no
11106 -rm -rf conftest.dSYM
11107 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11108 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11109 + conftest.$ac_objext conftest.beam conftest.$ac_ext
11114 # If the `ln -s' command failed, then we probably don't even
11115 # have an lstat function.
11116 @@ -10279,7 +7854,7 @@ fi
11117 rm -f conftest.sym conftest.file
11120 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
11121 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
11122 $as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
11124 test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
11125 @@ -10289,7 +7864,7 @@ cat >>confdefs.h <<_ACEOF
11129 -if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
11130 +if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
11131 case " $LIBOBJS " in
11132 *" lstat.$ac_objext "* ) ;;
11133 *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
11134 @@ -10298,170 +7873,27 @@ esac
11139 for ac_header in stdlib.h
11141 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
11142 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11143 - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
11144 -$as_echo_n "checking for $ac_header... " >&6; }
11145 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11146 - $as_echo_n "(cached) " >&6
11148 -ac_res=`eval 'as_val=${'$as_ac_Header'}
11149 - $as_echo "$as_val"'`
11150 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
11151 -$as_echo "$ac_res" >&6; }
11153 - # Is the header compilable?
11154 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
11155 -$as_echo_n "checking $ac_header usability... " >&6; }
11156 -cat >conftest.$ac_ext <<_ACEOF
11159 -cat confdefs.h >>conftest.$ac_ext
11160 -cat >>conftest.$ac_ext <<_ACEOF
11161 -/* end confdefs.h. */
11162 -$ac_includes_default
11163 -#include <$ac_header>
11165 -rm -f conftest.$ac_objext
11166 -if { (ac_try="$ac_compile"
11167 -case "(($ac_try" in
11168 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11169 - *) ac_try_echo=$ac_try;;
11171 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11172 -$as_echo "$ac_try_echo") >&5
11173 - (eval "$ac_compile") 2>conftest.er1
11175 - grep -v '^ *+' conftest.er1 >conftest.err
11176 - rm -f conftest.er1
11177 - cat conftest.err >&5
11178 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11179 - (exit $ac_status); } && {
11180 - test -z "$ac_cxx_werror_flag" ||
11181 - test ! -s conftest.err
11182 - } && test -s conftest.$ac_objext; then
11183 - ac_header_compiler=yes
11185 - $as_echo "$as_me: failed program was:" >&5
11186 -sed 's/^/| /' conftest.$ac_ext >&5
11188 - ac_header_compiler=no
11191 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11192 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
11193 -$as_echo "$ac_header_compiler" >&6; }
11195 -# Is the header present?
11196 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
11197 -$as_echo_n "checking $ac_header presence... " >&6; }
11198 -cat >conftest.$ac_ext <<_ACEOF
11201 -cat confdefs.h >>conftest.$ac_ext
11202 -cat >>conftest.$ac_ext <<_ACEOF
11203 -/* end confdefs.h. */
11204 -#include <$ac_header>
11206 -if { (ac_try="$ac_cpp conftest.$ac_ext"
11207 -case "(($ac_try" in
11208 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11209 - *) ac_try_echo=$ac_try;;
11211 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11212 -$as_echo "$ac_try_echo") >&5
11213 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
11215 - grep -v '^ *+' conftest.er1 >conftest.err
11216 - rm -f conftest.er1
11217 - cat conftest.err >&5
11218 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11219 - (exit $ac_status); } >/dev/null && {
11220 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
11221 - test ! -s conftest.err
11223 - ac_header_preproc=yes
11225 - $as_echo "$as_me: failed program was:" >&5
11226 -sed 's/^/| /' conftest.$ac_ext >&5
11228 - ac_header_preproc=no
11231 -rm -f conftest.err conftest.$ac_ext
11232 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
11233 -$as_echo "$ac_header_preproc" >&6; }
11235 -# So? What about this header?
11236 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
11238 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
11239 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
11240 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
11241 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
11242 - ac_header_preproc=yes
11245 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
11246 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
11247 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
11248 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
11249 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
11250 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
11251 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
11252 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
11253 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
11254 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
11255 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
11256 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
11258 -## --------------------------------------- ##
11259 -## Report this to milan.svoboda@centrum.cz ##
11260 -## --------------------------------------- ##
11262 - ) | sed "s/^/$as_me: WARNING: /" >&2
11265 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
11266 -$as_echo_n "checking for $ac_header... " >&6; }
11267 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11268 - $as_echo_n "(cached) " >&6
11270 - eval "$as_ac_Header=\$ac_header_preproc"
11272 -ac_res=`eval 'as_val=${'$as_ac_Header'}
11273 - $as_echo "$as_val"'`
11274 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
11275 -$as_echo "$ac_res" >&6; }
11278 -as_val=`eval 'as_val=${'$as_ac_Header'}
11279 - $as_echo "$as_val"'`
11280 - if test "x$as_val" = x""yes; then
11282 + ac_fn_cxx_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
11283 +if test "x$ac_cv_header_stdlib_h" = x""yes; then :
11284 cat >>confdefs.h <<_ACEOF
11285 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
11286 +#define HAVE_STDLIB_H 1
11293 -{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
11294 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
11295 $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
11296 -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
11297 +if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
11298 $as_echo_n "(cached) " >&6
11300 - if test "$cross_compiling" = yes; then
11301 + if test "$cross_compiling" = yes; then :
11302 ac_cv_func_malloc_0_nonnull=no
11304 - cat >conftest.$ac_ext <<_ACEOF
11307 -cat confdefs.h >>conftest.$ac_ext
11308 -cat >>conftest.$ac_ext <<_ACEOF
11309 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11310 /* end confdefs.h. */
11311 #if defined STDC_HEADERS || defined HAVE_STDLIB_H
11312 # include <stdlib.h>
11313 @@ -10477,55 +7909,24 @@ return ! malloc (0);
11317 -rm -f conftest$ac_exeext
11318 -if { (ac_try="$ac_link"
11319 -case "(($ac_try" in
11320 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11321 - *) ac_try_echo=$ac_try;;
11323 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11324 -$as_echo "$ac_try_echo") >&5
11325 - (eval "$ac_link") 2>&5
11327 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11328 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11329 - { (case "(($ac_try" in
11330 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11331 - *) ac_try_echo=$ac_try;;
11333 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11334 -$as_echo "$ac_try_echo") >&5
11335 - (eval "$ac_try") 2>&5
11337 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11338 - (exit $ac_status); }; }; then
11339 +if ac_fn_cxx_try_run "$LINENO"; then :
11340 ac_cv_func_malloc_0_nonnull=yes
11342 - $as_echo "$as_me: program exited with status $ac_status" >&5
11343 -$as_echo "$as_me: failed program was:" >&5
11344 -sed 's/^/| /' conftest.$ac_ext >&5
11346 -( exit $ac_status )
11347 -ac_cv_func_malloc_0_nonnull=no
11348 + ac_cv_func_malloc_0_nonnull=no
11350 -rm -rf conftest.dSYM
11351 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11352 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11353 + conftest.$ac_objext conftest.beam conftest.$ac_ext
11358 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
11359 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
11360 $as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
11361 -if test $ac_cv_func_malloc_0_nonnull = yes; then
11362 +if test $ac_cv_func_malloc_0_nonnull = yes; then :
11364 -cat >>confdefs.h <<\_ACEOF
11365 -#define HAVE_MALLOC 1
11367 +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
11370 - cat >>confdefs.h <<\_ACEOF
11371 -#define HAVE_MALLOC 0
11373 + $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
11375 case " $LIBOBJS " in
11376 *" malloc.$ac_objext "* ) ;;
11377 @@ -10534,271 +7935,94 @@ _ACEOF
11381 -cat >>confdefs.h <<\_ACEOF
11382 -#define malloc rpl_malloc
11384 +$as_echo "#define malloc rpl_malloc" >>confdefs.h
11390 -{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
11391 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
11392 $as_echo_n "checking for working memcmp... " >&6; }
11393 -if test "${ac_cv_func_memcmp_working+set}" = set; then
11394 +if test "${ac_cv_func_memcmp_working+set}" = set; then :
11395 $as_echo_n "(cached) " >&6
11397 - if test "$cross_compiling" = yes; then
11398 + if test "$cross_compiling" = yes; then :
11399 ac_cv_func_memcmp_working=no
11401 - cat >conftest.$ac_ext <<_ACEOF
11404 -cat confdefs.h >>conftest.$ac_ext
11405 -cat >>conftest.$ac_ext <<_ACEOF
11406 -/* end confdefs.h. */
11407 -$ac_includes_default
11412 - /* Some versions of memcmp are not 8-bit clean. */
11413 - char c0 = '\100', c1 = '\200', c2 = '\201';
11414 - if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
11417 - /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
11418 - or more and with at least one buffer not starting on a 4-byte boundary.
11419 - William Lewis provided this test program. */
11424 - for (i = 0; i < 4; i++)
11426 - char *a = foo + i;
11427 - char *b = bar + i;
11428 - strcpy (a, "--------01111111");
11429 - strcpy (b, "--------10000000");
11430 - if (memcmp (a, b, 16) >= 0)
11440 -rm -f conftest$ac_exeext
11441 -if { (ac_try="$ac_link"
11442 -case "(($ac_try" in
11443 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11444 - *) ac_try_echo=$ac_try;;
11446 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11447 -$as_echo "$ac_try_echo") >&5
11448 - (eval "$ac_link") 2>&5
11450 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11451 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11452 - { (case "(($ac_try" in
11453 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11454 - *) ac_try_echo=$ac_try;;
11456 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11457 -$as_echo "$ac_try_echo") >&5
11458 - (eval "$ac_try") 2>&5
11460 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11461 - (exit $ac_status); }; }; then
11462 - ac_cv_func_memcmp_working=yes
11464 - $as_echo "$as_me: program exited with status $ac_status" >&5
11465 -$as_echo "$as_me: failed program was:" >&5
11466 -sed 's/^/| /' conftest.$ac_ext >&5
11468 -( exit $ac_status )
11469 -ac_cv_func_memcmp_working=no
11471 -rm -rf conftest.dSYM
11472 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11477 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
11478 -$as_echo "$ac_cv_func_memcmp_working" >&6; }
11479 -test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
11480 - *" memcmp.$ac_objext "* ) ;;
11481 - *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
11487 -for ac_header in stdlib.h
11489 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
11490 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11491 - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
11492 -$as_echo_n "checking for $ac_header... " >&6; }
11493 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11494 - $as_echo_n "(cached) " >&6
11496 -ac_res=`eval 'as_val=${'$as_ac_Header'}
11497 - $as_echo "$as_val"'`
11498 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
11499 -$as_echo "$ac_res" >&6; }
11501 - # Is the header compilable?
11502 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
11503 -$as_echo_n "checking $ac_header usability... " >&6; }
11504 -cat >conftest.$ac_ext <<_ACEOF
11507 -cat confdefs.h >>conftest.$ac_ext
11508 -cat >>conftest.$ac_ext <<_ACEOF
11509 -/* end confdefs.h. */
11510 -$ac_includes_default
11511 -#include <$ac_header>
11513 -rm -f conftest.$ac_objext
11514 -if { (ac_try="$ac_compile"
11515 -case "(($ac_try" in
11516 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11517 - *) ac_try_echo=$ac_try;;
11519 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11520 -$as_echo "$ac_try_echo") >&5
11521 - (eval "$ac_compile") 2>conftest.er1
11523 - grep -v '^ *+' conftest.er1 >conftest.err
11524 - rm -f conftest.er1
11525 - cat conftest.err >&5
11526 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11527 - (exit $ac_status); } && {
11528 - test -z "$ac_cxx_werror_flag" ||
11529 - test ! -s conftest.err
11530 - } && test -s conftest.$ac_objext; then
11531 - ac_header_compiler=yes
11533 - $as_echo "$as_me: failed program was:" >&5
11534 -sed 's/^/| /' conftest.$ac_ext >&5
11536 - ac_header_compiler=no
11539 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11540 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
11541 -$as_echo "$ac_header_compiler" >&6; }
11543 -# Is the header present?
11544 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
11545 -$as_echo_n "checking $ac_header presence... " >&6; }
11546 -cat >conftest.$ac_ext <<_ACEOF
11549 -cat confdefs.h >>conftest.$ac_ext
11550 -cat >>conftest.$ac_ext <<_ACEOF
11551 -/* end confdefs.h. */
11552 -#include <$ac_header>
11554 -if { (ac_try="$ac_cpp conftest.$ac_ext"
11555 -case "(($ac_try" in
11556 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11557 - *) ac_try_echo=$ac_try;;
11559 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11560 -$as_echo "$ac_try_echo") >&5
11561 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
11563 - grep -v '^ *+' conftest.er1 >conftest.err
11564 - rm -f conftest.er1
11565 - cat conftest.err >&5
11566 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11567 - (exit $ac_status); } >/dev/null && {
11568 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
11569 - test ! -s conftest.err
11571 - ac_header_preproc=yes
11573 - $as_echo "$as_me: failed program was:" >&5
11574 -sed 's/^/| /' conftest.$ac_ext >&5
11575 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11576 +/* end confdefs.h. */
11577 +$ac_includes_default
11582 - ac_header_preproc=no
11584 + /* Some versions of memcmp are not 8-bit clean. */
11585 + char c0 = '\100', c1 = '\200', c2 = '\201';
11586 + if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
11589 -rm -f conftest.err conftest.$ac_ext
11590 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
11591 -$as_echo "$ac_header_preproc" >&6; }
11592 + /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
11593 + or more and with at least one buffer not starting on a 4-byte boundary.
11594 + William Lewis provided this test program. */
11599 + for (i = 0; i < 4; i++)
11601 + char *a = foo + i;
11602 + char *b = bar + i;
11603 + strcpy (a, "--------01111111");
11604 + strcpy (b, "--------10000000");
11605 + if (memcmp (a, b, 16) >= 0)
11611 -# So? What about this header?
11612 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
11614 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
11615 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
11616 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
11617 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
11618 - ac_header_preproc=yes
11621 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
11622 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
11623 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
11624 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
11625 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
11626 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
11627 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
11628 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
11629 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
11630 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
11631 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
11632 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
11634 -## --------------------------------------- ##
11635 -## Report this to milan.svoboda@centrum.cz ##
11636 -## --------------------------------------- ##
11638 - ) | sed "s/^/$as_me: WARNING: /" >&2
11641 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
11642 -$as_echo_n "checking for $ac_header... " >&6; }
11643 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11644 - $as_echo_n "(cached) " >&6
11649 +if ac_fn_cxx_try_run "$LINENO"; then :
11650 + ac_cv_func_memcmp_working=yes
11652 - eval "$as_ac_Header=\$ac_header_preproc"
11653 + ac_cv_func_memcmp_working=no
11655 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11656 + conftest.$ac_objext conftest.beam conftest.$ac_ext
11658 -ac_res=`eval 'as_val=${'$as_ac_Header'}
11659 - $as_echo "$as_val"'`
11660 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
11661 -$as_echo "$ac_res" >&6; }
11664 -as_val=`eval 'as_val=${'$as_ac_Header'}
11665 - $as_echo "$as_val"'`
11666 - if test "x$as_val" = x""yes; then
11667 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
11668 +$as_echo "$ac_cv_func_memcmp_working" >&6; }
11669 +test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
11670 + *" memcmp.$ac_objext "* ) ;;
11671 + *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
11676 +for ac_header in stdlib.h
11678 + ac_fn_cxx_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
11679 +if test "x$ac_cv_header_stdlib_h" = x""yes; then :
11680 cat >>confdefs.h <<_ACEOF
11681 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
11682 +#define HAVE_STDLIB_H 1
11689 -{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
11690 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
11691 $as_echo_n "checking for GNU libc compatible realloc... " >&6; }
11692 -if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
11693 +if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then :
11694 $as_echo_n "(cached) " >&6
11696 - if test "$cross_compiling" = yes; then
11697 + if test "$cross_compiling" = yes; then :
11698 ac_cv_func_realloc_0_nonnull=no
11700 - cat >conftest.$ac_ext <<_ACEOF
11703 -cat confdefs.h >>conftest.$ac_ext
11704 -cat >>conftest.$ac_ext <<_ACEOF
11705 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11706 /* end confdefs.h. */
11707 #if defined STDC_HEADERS || defined HAVE_STDLIB_H
11708 # include <stdlib.h>
11709 @@ -10814,55 +8038,24 @@ return ! realloc (0, 0);
11713 -rm -f conftest$ac_exeext
11714 -if { (ac_try="$ac_link"
11715 -case "(($ac_try" in
11716 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11717 - *) ac_try_echo=$ac_try;;
11719 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11720 -$as_echo "$ac_try_echo") >&5
11721 - (eval "$ac_link") 2>&5
11723 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11724 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11725 - { (case "(($ac_try" in
11726 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11727 - *) ac_try_echo=$ac_try;;
11729 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11730 -$as_echo "$ac_try_echo") >&5
11731 - (eval "$ac_try") 2>&5
11733 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11734 - (exit $ac_status); }; }; then
11735 +if ac_fn_cxx_try_run "$LINENO"; then :
11736 ac_cv_func_realloc_0_nonnull=yes
11738 - $as_echo "$as_me: program exited with status $ac_status" >&5
11739 -$as_echo "$as_me: failed program was:" >&5
11740 -sed 's/^/| /' conftest.$ac_ext >&5
11742 -( exit $ac_status )
11743 -ac_cv_func_realloc_0_nonnull=no
11744 + ac_cv_func_realloc_0_nonnull=no
11746 -rm -rf conftest.dSYM
11747 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11748 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11749 + conftest.$ac_objext conftest.beam conftest.$ac_ext
11754 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
11755 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
11756 $as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
11757 -if test $ac_cv_func_realloc_0_nonnull = yes; then
11758 +if test $ac_cv_func_realloc_0_nonnull = yes; then :
11760 -cat >>confdefs.h <<\_ACEOF
11761 -#define HAVE_REALLOC 1
11763 +$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
11766 - cat >>confdefs.h <<\_ACEOF
11767 -#define HAVE_REALLOC 0
11769 + $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
11771 case " $LIBOBJS " in
11772 *" realloc.$ac_objext "* ) ;;
11773 @@ -10871,27 +8064,20 @@ _ACEOF
11777 -cat >>confdefs.h <<\_ACEOF
11778 -#define realloc rpl_realloc
11780 +$as_echo "#define realloc rpl_realloc" >>confdefs.h
11786 -{ $as_echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
11787 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
11788 $as_echo_n "checking whether stat accepts an empty string... " >&6; }
11789 -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then
11790 +if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
11791 $as_echo_n "(cached) " >&6
11793 - if test "$cross_compiling" = yes; then
11794 + if test "$cross_compiling" = yes; then :
11795 ac_cv_func_stat_empty_string_bug=yes
11797 - cat >conftest.$ac_ext <<_ACEOF
11800 -cat confdefs.h >>conftest.$ac_ext
11801 -cat >>conftest.$ac_ext <<_ACEOF
11802 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11803 /* end confdefs.h. */
11804 $ac_includes_default
11806 @@ -10903,44 +8089,17 @@ struct stat sbuf;
11810 -rm -f conftest$ac_exeext
11811 -if { (ac_try="$ac_link"
11812 -case "(($ac_try" in
11813 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11814 - *) ac_try_echo=$ac_try;;
11816 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11817 -$as_echo "$ac_try_echo") >&5
11818 - (eval "$ac_link") 2>&5
11820 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11821 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11822 - { (case "(($ac_try" in
11823 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11824 - *) ac_try_echo=$ac_try;;
11826 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11827 -$as_echo "$ac_try_echo") >&5
11828 - (eval "$ac_try") 2>&5
11830 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11831 - (exit $ac_status); }; }; then
11832 +if ac_fn_cxx_try_run "$LINENO"; then :
11833 ac_cv_func_stat_empty_string_bug=no
11835 - $as_echo "$as_me: program exited with status $ac_status" >&5
11836 -$as_echo "$as_me: failed program was:" >&5
11837 -sed 's/^/| /' conftest.$ac_ext >&5
11839 -( exit $ac_status )
11840 -ac_cv_func_stat_empty_string_bug=yes
11841 + ac_cv_func_stat_empty_string_bug=yes
11843 -rm -rf conftest.dSYM
11844 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11845 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11846 + conftest.$ac_objext conftest.beam conftest.$ac_ext
11851 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5
11852 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
11853 $as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
11854 if test $ac_cv_func_stat_empty_string_bug = yes; then
11855 case " $LIBOBJS " in
11856 @@ -10959,149 +8118,13 @@ fi
11861 -for ac_header in $ac_header_list
11863 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
11864 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11865 - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
11866 -$as_echo_n "checking for $ac_header... " >&6; }
11867 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11868 - $as_echo_n "(cached) " >&6
11870 -ac_res=`eval 'as_val=${'$as_ac_Header'}
11871 - $as_echo "$as_val"'`
11872 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
11873 -$as_echo "$ac_res" >&6; }
11875 - # Is the header compilable?
11876 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
11877 -$as_echo_n "checking $ac_header usability... " >&6; }
11878 -cat >conftest.$ac_ext <<_ACEOF
11881 -cat confdefs.h >>conftest.$ac_ext
11882 -cat >>conftest.$ac_ext <<_ACEOF
11883 -/* end confdefs.h. */
11884 -$ac_includes_default
11885 -#include <$ac_header>
11887 -rm -f conftest.$ac_objext
11888 -if { (ac_try="$ac_compile"
11889 -case "(($ac_try" in
11890 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11891 - *) ac_try_echo=$ac_try;;
11893 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11894 -$as_echo "$ac_try_echo") >&5
11895 - (eval "$ac_compile") 2>conftest.er1
11897 - grep -v '^ *+' conftest.er1 >conftest.err
11898 - rm -f conftest.er1
11899 - cat conftest.err >&5
11900 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11901 - (exit $ac_status); } && {
11902 - test -z "$ac_cxx_werror_flag" ||
11903 - test ! -s conftest.err
11904 - } && test -s conftest.$ac_objext; then
11905 - ac_header_compiler=yes
11907 - $as_echo "$as_me: failed program was:" >&5
11908 -sed 's/^/| /' conftest.$ac_ext >&5
11910 - ac_header_compiler=no
11913 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11914 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
11915 -$as_echo "$ac_header_compiler" >&6; }
11917 -# Is the header present?
11918 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
11919 -$as_echo_n "checking $ac_header presence... " >&6; }
11920 -cat >conftest.$ac_ext <<_ACEOF
11923 -cat confdefs.h >>conftest.$ac_ext
11924 -cat >>conftest.$ac_ext <<_ACEOF
11925 -/* end confdefs.h. */
11926 -#include <$ac_header>
11928 -if { (ac_try="$ac_cpp conftest.$ac_ext"
11929 -case "(($ac_try" in
11930 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11931 - *) ac_try_echo=$ac_try;;
11933 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11934 -$as_echo "$ac_try_echo") >&5
11935 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
11937 - grep -v '^ *+' conftest.er1 >conftest.err
11938 - rm -f conftest.er1
11939 - cat conftest.err >&5
11940 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11941 - (exit $ac_status); } >/dev/null && {
11942 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
11943 - test ! -s conftest.err
11945 - ac_header_preproc=yes
11947 - $as_echo "$as_me: failed program was:" >&5
11948 -sed 's/^/| /' conftest.$ac_ext >&5
11950 - ac_header_preproc=no
11953 -rm -f conftest.err conftest.$ac_ext
11954 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
11955 -$as_echo "$ac_header_preproc" >&6; }
11957 -# So? What about this header?
11958 -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
11960 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
11961 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
11962 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
11963 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
11964 - ac_header_preproc=yes
11967 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
11968 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
11969 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
11970 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
11971 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
11972 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
11973 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
11974 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
11975 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
11976 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
11977 - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
11978 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
11980 -## --------------------------------------- ##
11981 -## Report this to milan.svoboda@centrum.cz ##
11982 -## --------------------------------------- ##
11984 - ) | sed "s/^/$as_me: WARNING: /" >&2
11987 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
11988 -$as_echo_n "checking for $ac_header... " >&6; }
11989 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11990 - $as_echo_n "(cached) " >&6
11992 - eval "$as_ac_Header=\$ac_header_preproc"
11994 -ac_res=`eval 'as_val=${'$as_ac_Header'}
11995 - $as_echo "$as_val"'`
11996 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
11997 -$as_echo "$ac_res" >&6; }
12000 -as_val=`eval 'as_val=${'$as_ac_Header'}
12001 - $as_echo "$as_val"'`
12002 - if test "x$as_val" = x""yes; then
12003 + for ac_header in $ac_header_list
12005 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
12006 +ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
12008 +eval as_val=\$$as_ac_Header
12009 + if test "x$as_val" = x""yes; then :
12010 cat >>confdefs.h <<_ACEOF
12011 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
12013 @@ -11113,26 +8136,17 @@ done
12022 -{ $as_echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
12023 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether utime accepts a null argument" >&5
12024 $as_echo_n "checking whether utime accepts a null argument... " >&6; }
12025 -if test "${ac_cv_func_utime_null+set}" = set; then
12026 +if test "${ac_cv_func_utime_null+set}" = set; then :
12027 $as_echo_n "(cached) " >&6
12029 rm -f conftest.data; >conftest.data
12030 # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong.
12031 -if test "$cross_compiling" = yes; then
12032 - ac_cv_func_utime_null=no
12033 +if test "$cross_compiling" = yes; then :
12034 + ac_cv_func_utime_null='guessing yes'
12036 - cat >conftest.$ac_ext <<_ACEOF
12039 -cat confdefs.h >>conftest.$ac_ext
12040 -cat >>conftest.$ac_ext <<_ACEOF
12041 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12042 /* end confdefs.h. */
12043 $ac_includes_default
12044 #ifdef HAVE_UTIME_H
12045 @@ -11145,164 +8159,38 @@ struct stat s, t;
12046 return ! (stat ("conftest.data", &s) == 0
12047 && utime ("conftest.data", 0) == 0
12048 && stat ("conftest.data", &t) == 0
12049 - && t.st_mtime >= s.st_mtime
12050 - && t.st_mtime - s.st_mtime < 120);
12055 -rm -f conftest$ac_exeext
12056 -if { (ac_try="$ac_link"
12057 -case "(($ac_try" in
12058 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12059 - *) ac_try_echo=$ac_try;;
12061 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12062 -$as_echo "$ac_try_echo") >&5
12063 - (eval "$ac_link") 2>&5
12065 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12066 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12067 - { (case "(($ac_try" in
12068 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12069 - *) ac_try_echo=$ac_try;;
12071 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12072 -$as_echo "$ac_try_echo") >&5
12073 - (eval "$ac_try") 2>&5
12075 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12076 - (exit $ac_status); }; }; then
12077 - ac_cv_func_utime_null=yes
12079 - $as_echo "$as_me: program exited with status $ac_status" >&5
12080 -$as_echo "$as_me: failed program was:" >&5
12081 -sed 's/^/| /' conftest.$ac_ext >&5
12083 -( exit $ac_status )
12084 -ac_cv_func_utime_null=no
12086 -rm -rf conftest.dSYM
12087 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
12092 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5
12093 -$as_echo "$ac_cv_func_utime_null" >&6; }
12094 -if test $ac_cv_func_utime_null = yes; then
12096 -cat >>confdefs.h <<\_ACEOF
12097 -#define HAVE_UTIME_NULL 1
12101 -rm -f conftest.data
12114 -for ac_func in fchdir fdatasync ftruncate lchown memmove memset mkdir rmdir strchr strerror utime
12116 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
12117 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
12118 -$as_echo_n "checking for $ac_func... " >&6; }
12119 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
12120 - $as_echo_n "(cached) " >&6
12122 - cat >conftest.$ac_ext <<_ACEOF
12125 -cat confdefs.h >>conftest.$ac_ext
12126 -cat >>conftest.$ac_ext <<_ACEOF
12127 -/* end confdefs.h. */
12128 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
12129 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
12130 -#define $ac_func innocuous_$ac_func
12132 -/* System header to define __stub macros and hopefully few prototypes,
12133 - which can conflict with char $ac_func (); below.
12134 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
12135 - <limits.h> exists even on freestanding compilers. */
12138 -# include <limits.h>
12140 -# include <assert.h>
12145 -/* Override any GCC internal prototype to avoid an error.
12146 - Use char because int might match the return type of a GCC
12147 - builtin and then its argument prototype would still apply. */
12148 -#ifdef __cplusplus
12152 -/* The GNU C library defines this for functions which it implements
12153 - to always fail with ENOSYS. Some functions are actually named
12154 - something starting with __ and the normal name is an alias. */
12155 -#if defined __stub_$ac_func || defined __stub___$ac_func
12162 -return $ac_func ();
12163 + && t.st_mtime >= s.st_mtime
12164 + && t.st_mtime - s.st_mtime < 120);
12169 -rm -f conftest.$ac_objext conftest$ac_exeext
12170 -if { (ac_try="$ac_link"
12171 -case "(($ac_try" in
12172 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12173 - *) ac_try_echo=$ac_try;;
12175 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12176 -$as_echo "$ac_try_echo") >&5
12177 - (eval "$ac_link") 2>conftest.er1
12179 - grep -v '^ *+' conftest.er1 >conftest.err
12180 - rm -f conftest.er1
12181 - cat conftest.err >&5
12182 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12183 - (exit $ac_status); } && {
12184 - test -z "$ac_cxx_werror_flag" ||
12185 - test ! -s conftest.err
12186 - } && test -s conftest$ac_exeext && {
12187 - test "$cross_compiling" = yes ||
12188 - $as_test_x conftest$ac_exeext
12190 - eval "$as_ac_var=yes"
12191 +if ac_fn_cxx_try_run "$LINENO"; then :
12192 + ac_cv_func_utime_null=yes
12194 - $as_echo "$as_me: failed program was:" >&5
12195 -sed 's/^/| /' conftest.$ac_ext >&5
12196 + ac_cv_func_utime_null=no
12198 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
12199 + conftest.$ac_objext conftest.beam conftest.$ac_ext
12202 - eval "$as_ac_var=no"
12204 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_utime_null" >&5
12205 +$as_echo "$ac_cv_func_utime_null" >&6; }
12206 +if test "x$ac_cv_func_utime_null" != xno; then
12207 + ac_cv_func_utime_null=yes
12209 +$as_echo "#define HAVE_UTIME_NULL 1" >>confdefs.h
12211 -rm -rf conftest.dSYM
12212 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12213 - conftest$ac_exeext conftest.$ac_ext
12215 -ac_res=`eval 'as_val=${'$as_ac_var'}
12216 - $as_echo "$as_val"'`
12217 - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
12218 -$as_echo "$ac_res" >&6; }
12219 -as_val=`eval 'as_val=${'$as_ac_var'}
12220 - $as_echo "$as_val"'`
12221 - if test "x$as_val" = x""yes; then
12222 +rm -f conftest.data
12224 +for ac_func in fchdir fdatasync ftruncate lchown memmove memset mkdir rmdir strchr strerror utime
12226 + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
12227 +ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
12228 +eval as_val=\$$as_ac_var
12229 + if test "x$as_val" = x""yes; then :
12230 cat >>confdefs.h <<_ACEOF
12231 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
12233 @@ -11344,13 +8232,13 @@ _ACEOF
12237 - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
12238 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
12239 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
12242 _ | IFS | as_nl) ;; #(
12243 BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
12244 - *) $as_unset $ac_var ;;
12245 + *) { eval $ac_var=; unset $ac_var;} ;;
12249 @@ -11358,8 +8246,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
12251 case $as_nl`(ac_space=' '; set) 2>&1` in #(
12252 *${as_nl}ac_space=\ *)
12253 - # `set' does not quote correctly, so add quotes (double-quote
12254 - # substitution turns \\\\ into \\, and sed turns \\ into \).
12255 + # `set' does not quote correctly, so add quotes: double-quote
12256 + # substitution turns \\\\ into \\, and sed turns \\ into \.
12259 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
12260 @@ -11382,11 +8270,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
12261 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
12262 if test -w "$cache_file"; then
12263 test "x$cache_file" != "x/dev/null" &&
12264 - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
12265 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
12266 $as_echo "$as_me: updating cache $cache_file" >&6;}
12267 cat confcache >$cache_file
12269 - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
12270 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
12271 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
12274 @@ -11406,43 +8294,43 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
12275 ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
12276 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
12277 # will be set to the directory where LIBOBJS objects are built.
12278 - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
12279 - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
12280 + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
12281 + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
12283 LIBOBJS=$ac_libobjs
12285 LTLIBOBJS=$ac_ltlibobjs
12288 + if test -n "$EXEEXT"; then
12290 + am__EXEEXT_FALSE='#'
12292 + am__EXEEXT_TRUE='#'
12293 + am__EXEEXT_FALSE=
12296 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
12297 - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
12298 -Usually this means the macro was only invoked conditionally." >&5
12299 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
12300 -Usually this means the macro was only invoked conditionally." >&2;}
12301 - { (exit 1); exit 1; }; }
12302 + as_fn_error "conditional \"AMDEP\" was never defined.
12303 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
12305 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
12306 - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
12307 -Usually this means the macro was only invoked conditionally." >&5
12308 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
12309 -Usually this means the macro was only invoked conditionally." >&2;}
12310 - { (exit 1); exit 1; }; }
12311 + as_fn_error "conditional \"am__fastdepCXX\" was never defined.
12312 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
12314 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
12315 - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
12316 -Usually this means the macro was only invoked conditionally." >&5
12317 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
12318 -Usually this means the macro was only invoked conditionally." >&2;}
12319 - { (exit 1); exit 1; }; }
12320 + as_fn_error "conditional \"am__fastdepCC\" was never defined.
12321 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
12324 : ${CONFIG_STATUS=./config.status}
12326 ac_clean_files_save=$ac_clean_files
12327 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
12328 -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
12329 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
12330 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
12331 -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
12333 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
12335 # Generated by $as_me.
12336 # Run this file to recreate the current configuration.
12337 @@ -11452,17 +8340,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
12339 ac_cs_recheck=false
12341 -SHELL=\${CONFIG_SHELL-$SHELL}
12344 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
12345 -## --------------------- ##
12346 -## M4sh Initialization. ##
12347 -## --------------------- ##
12348 +SHELL=\${CONFIG_SHELL-$SHELL}
12351 +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
12352 +## -------------------- ##
12353 +## M4sh Initialization. ##
12354 +## -------------------- ##
12356 # Be more Bourne compatible
12357 DUALCASE=1; export DUALCASE # for MKS sh
12358 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
12359 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
12362 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
12363 @@ -11470,23 +8359,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
12364 alias -g '${1+"$@"}'='"$@"'
12365 setopt NO_GLOB_SUBST
12367 - case `(set -o) 2>/dev/null` in
12368 - *posix*) set -o posix ;;
12369 + case `(set -o) 2>/dev/null` in #(
12371 + set -o posix ;; #(
12382 -# Avoid depending upon Character Ranges.
12383 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
12384 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
12385 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
12386 -as_cr_digits='0123456789'
12387 -as_cr_alnum=$as_cr_Letters$as_cr_digits
12392 @@ -11494,7 +8375,13 @@ export as_nl
12393 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
12394 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
12395 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
12396 -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
12397 +# Prefer a ksh shell builtin over an external printf program on Solaris,
12398 +# but without wasting forks for bash or zsh.
12399 +if test -z "$BASH_VERSION$ZSH_VERSION" \
12400 + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
12401 + as_echo='print -r --'
12402 + as_echo_n='print -rn --'
12403 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
12404 as_echo='printf %s\n'
12405 as_echo_n='printf %s'
12407 @@ -11505,7 +8392,7 @@ else
12408 as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
12409 as_echo_n_body='eval
12414 expr "X$arg" : "X\\(.*\\)$as_nl";
12415 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
12416 @@ -11528,13 +8415,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
12420 -# Support unset when possible.
12421 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
12429 # We need space, tab and new line, in precisely that order. Quoting is
12430 @@ -11544,15 +8424,15 @@ fi
12433 # Find who we are. Look in the path if we contain no directory separator.
12436 *[\\/]* ) as_myself=$0 ;;
12437 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12438 for as_dir in $PATH
12441 test -z "$as_dir" && as_dir=.
12442 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
12444 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
12449 @@ -11564,12 +8444,16 @@ if test "x$as_myself" = x; then
12451 if test ! -f "$as_myself"; then
12452 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
12453 - { (exit 1); exit 1; }
12457 -# Work around bugs in pre-3.0 UWIN ksh.
12458 -for as_var in ENV MAIL MAILPATH
12459 -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
12460 +# Unset variables that we do not need and which cause bugs (e.g. in
12461 +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
12462 +# suppresses any "Segmentation fault" message there. '((' could
12463 +# trigger a bug in pdksh 5.2.14.
12464 +for as_var in BASH_ENV ENV MAIL MAILPATH
12465 +do eval test x\${$as_var+set} = xset \
12466 + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
12470 @@ -11581,7 +8465,89 @@ export LC_ALL
12474 -# Required to use basename.
12476 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
12479 +# as_fn_error ERROR [LINENO LOG_FD]
12480 +# ---------------------------------
12481 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
12482 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
12483 +# script with status $?, using 1 if that was 0.
12486 + as_status=$?; test $as_status -eq 0 && as_status=1
12487 + if test "$3"; then
12488 + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
12489 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
12491 + $as_echo "$as_me: error: $1" >&2
12492 + as_fn_exit $as_status
12496 +# as_fn_set_status STATUS
12497 +# -----------------------
12498 +# Set $? to STATUS, without forking.
12499 +as_fn_set_status ()
12502 +} # as_fn_set_status
12504 +# as_fn_exit STATUS
12505 +# -----------------
12506 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
12510 + as_fn_set_status $1
12516 +# Portably unset VAR.
12519 + { eval $1=; unset $1;}
12521 +as_unset=as_fn_unset
12522 +# as_fn_append VAR VALUE
12523 +# ----------------------
12524 +# Append the text in VALUE to the end of the definition contained in VAR. Take
12525 +# advantage of any shell optimizations that allow amortized linear growth over
12526 +# repeated appends, instead of the typical quadratic growth present in naive
12527 +# implementations.
12528 +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
12529 + eval 'as_fn_append ()
12540 +# as_fn_arith ARG...
12541 +# ------------------
12542 +# Perform arithmetic evaluation on the ARGs, and store the result in the
12543 +# global $as_val. Take advantage of shells that can avoid forks. The arguments
12544 +# must be portable across $(()) and expr.
12545 +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
12546 + eval 'as_fn_arith ()
12553 + as_val=`expr "$@" || test $? -eq 1`
12558 if expr a : '\(a\)' >/dev/null 2>&1 &&
12559 test "X`expr 00001 : '.*\(...\)'`" = X001; then
12561 @@ -11595,8 +8561,12 @@ else
12565 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
12566 + as_dirname=dirname
12571 -# Name of the executable.
12572 as_me=`$as_basename -- "$0" ||
12573 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
12574 X"$0" : 'X\(//\)$' \| \
12575 @@ -11616,76 +8586,25 @@ $as_echo X/"$0" |
12584 - as_lineno_1=$LINENO
12585 - as_lineno_2=$LINENO
12586 - test "x$as_lineno_1" != "x$as_lineno_2" &&
12587 - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
12589 - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
12590 - # uniformly replaced by the line number. The first 'sed' inserts a
12591 - # line-number line after each line using $LINENO; the second 'sed'
12592 - # does the real work. The second script uses 'N' to pair each
12593 - # line-number line with the line containing $LINENO, and appends
12594 - # trailing '-' during substitution so that $LINENO is not a special
12595 - # case at line end.
12596 - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
12597 - # scripts with optimization help from Paolo Bonzini. Blame Lee
12598 - # E. McMahon (1931-1989) for sed's syntax. :-)
12604 - s/[$]LINENO.*/&-/
12610 - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
12613 - ' >$as_me.lineno &&
12614 - chmod +x "$as_me.lineno" ||
12615 - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
12616 - { (exit 1); exit 1; }; }
12618 - # Don't try to exec as it changes $[0], causing all sort of problems
12619 - # (the dirname of $[0] is not the place where we might find the
12620 - # original and so on. Autoconf is especially sensitive to this).
12621 - . "./$as_me.lineno"
12622 - # Exit status is that of the last command.
12627 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
12628 - as_dirname=dirname
12632 +# Avoid depending upon Character Ranges.
12633 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
12634 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
12635 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
12636 +as_cr_digits='0123456789'
12637 +as_cr_alnum=$as_cr_Letters$as_cr_digits
12639 ECHO_C= ECHO_N= ECHO_T=
12640 -case `echo -n x` in
12641 +case `echo -n x` in #(((((
12643 - case `echo 'x\c'` in
12644 + case `echo 'xy\c'` in
12645 *c*) ECHO_T=' ';; # ECHO_T is single tab character.
12647 + xy) ECHO_C='\c';;
12648 + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
12654 -if expr a : '\(a\)' >/dev/null 2>&1 &&
12655 - test "X`expr 00001 : '.*\(...\)'`" = X001; then
12661 rm -f conf$$ conf$$.exe conf$$.file
12662 if test -d conf$$.dir; then
12663 @@ -11714,8 +8633,56 @@ fi
12664 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
12665 rmdir conf$$.dir 2>/dev/null
12670 +# Create "$as_dir" as a directory, including parents if necessary.
12674 + case $as_dir in #(
12675 + -*) as_dir=./$as_dir;;
12677 + test -d "$as_dir" || eval $as_mkdir_p || {
12680 + case $as_dir in #(
12681 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
12682 + *) as_qdir=$as_dir;;
12684 + as_dirs="'$as_qdir' $as_dirs"
12685 + as_dir=`$as_dirname -- "$as_dir" ||
12686 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12687 + X"$as_dir" : 'X\(//\)[^/]' \| \
12688 + X"$as_dir" : 'X\(//\)$' \| \
12689 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
12690 +$as_echo X"$as_dir" |
12691 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
12695 + /^X\(\/\/\)[^/].*/{
12708 + test -d "$as_dir" && break
12710 + test -z "$as_dirs" || eval "mkdir $as_dirs"
12711 + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
12715 if mkdir -p . 2>/dev/null; then
12717 + as_mkdir_p='mkdir -p "$as_dir"'
12719 test -d ./-p && rmdir ./-p
12721 @@ -11734,10 +8701,10 @@ else
12722 if test -d "$1"; then
12729 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
12730 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
12731 ???[sx]*):;;*)false;;esac;fi
12734 @@ -11752,13 +8719,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
12738 +## ----------------------------------- ##
12739 +## Main body of $CONFIG_STATUS script. ##
12740 +## ----------------------------------- ##
12742 +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
12744 -# Save the log message, to keep $[0] and so on meaningful, and to
12745 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
12746 +# Save the log message, to keep $0 and so on meaningful, and to
12747 # report actual input values of CONFIG_FILES etc. instead of their
12748 # values after options handling.
12750 This file was extended by FuseCompress $as_me 2.0, which was
12751 -generated by GNU Autoconf 2.63. Invocation command line was
12752 +generated by GNU Autoconf 2.65. Invocation command line was
12754 CONFIG_FILES = $CONFIG_FILES
12755 CONFIG_HEADERS = $CONFIG_HEADERS
12756 @@ -11790,13 +8763,15 @@ _ACEOF
12758 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
12760 -\`$as_me' instantiates files from templates according to the
12761 -current configuration.
12762 +\`$as_me' instantiates files and other configuration actions
12763 +from templates according to the current configuration. Unless the files
12764 +and actions are specified as TAGs, all are instantiated by default.
12766 -Usage: $0 [OPTION]... [FILE]...
12767 +Usage: $0 [OPTION]... [TAG]...
12769 -h, --help print this help, then exit
12770 -V, --version print version number and configuration settings, then exit
12771 + --config print configuration, then exit
12772 -q, --quiet, --silent
12773 do not print progress messages
12774 -d, --debug don't remove temporary files
12775 @@ -11815,16 +8790,17 @@ $config_headers
12776 Configuration commands:
12779 -Report bugs to <bug-autoconf@gnu.org>."
12780 +Report bugs to <milan.svoboda@centrum.cz>."
12783 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
12784 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
12786 FuseCompress config.status 2.0
12787 -configured by $0, generated by GNU Autoconf 2.63,
12788 - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
12789 +configured by $0, generated by GNU Autoconf 2.65,
12790 + with options \\"\$ac_cs_config\\"
12792 -Copyright (C) 2008 Free Software Foundation, Inc.
12793 +Copyright (C) 2009 Free Software Foundation, Inc.
12794 This config.status script is free software; the Free Software Foundation
12795 gives unlimited permission to copy, distribute and modify it."
12797 @@ -11860,6 +8836,8 @@ do
12799 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
12800 $as_echo "$ac_cs_version"; exit ;;
12801 + --config | --confi | --conf | --con | --co | --c )
12802 + $as_echo "$ac_cs_config"; exit ;;
12803 --debug | --debu | --deb | --de | --d | -d )
12805 --file | --fil | --fi | --f )
12806 @@ -11867,20 +8845,19 @@ do
12808 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
12810 - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
12811 + as_fn_append CONFIG_FILES " '$ac_optarg'"
12812 ac_need_defaults=false;;
12813 --header | --heade | --head | --hea )
12816 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
12818 - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
12819 + as_fn_append CONFIG_HEADERS " '$ac_optarg'"
12820 ac_need_defaults=false;;
12822 # Conflict between --help and --header
12823 - { $as_echo "$as_me: error: ambiguous option: $1
12824 -Try \`$0 --help' for more information." >&2
12825 - { (exit 1); exit 1; }; };;
12826 + as_fn_error "ambiguous option: \`$1'
12827 +Try \`$0 --help' for more information.";;
12828 --help | --hel | -h )
12829 $as_echo "$ac_cs_usage"; exit ;;
12830 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
12831 @@ -11888,11 +8865,10 @@ Try \`$0 --help' for more information." >&2
12834 # This is an error.
12835 - -*) { $as_echo "$as_me: error: unrecognized option: $1
12836 -Try \`$0 --help' for more information." >&2
12837 - { (exit 1); exit 1; }; } ;;
12838 + -*) as_fn_error "unrecognized option: \`$1'
12839 +Try \`$0 --help' for more information." ;;
12841 - *) ac_config_targets="$ac_config_targets $1"
12842 + *) as_fn_append ac_config_targets " $1"
12843 ac_need_defaults=false ;;
12846 @@ -11949,9 +8925,7 @@ do
12847 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
12848 "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
12850 - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
12851 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
12852 - { (exit 1); exit 1; }; };;
12853 + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
12857 @@ -11978,7 +8952,7 @@ $debug ||
12858 trap 'exit_status=$?
12859 { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
12861 - trap '{ (exit 1); exit 1; }' 1 2 13 15
12862 + trap 'as_fn_exit 1' 1 2 13 15
12864 # Create a (secure) tmp directory for tmp files.
12866 @@ -11989,11 +8963,7 @@ $debug ||
12868 tmp=./conf$$-$RANDOM
12869 (umask 077 && mkdir "$tmp")
12872 - $as_echo "$as_me: cannot create a temporary directory in ." >&2
12873 - { (exit 1); exit 1; }
12875 +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
12877 # Set up the scripts for CONFIG_FILES section.
12878 # No need to generate them if there are no CONFIG_FILES.
12879 @@ -12001,10 +8971,16 @@ $debug ||
12880 if test -n "$CONFIG_FILES"; then
12884 +ac_cr=`echo X | tr X '\015'`
12885 +# On cygwin, bash can eat \r inside `` if the user requested igncr.
12886 +# But we know of no other shell where ac_cr would be empty at this
12887 +# point, so we can use a bashism as a fallback.
12888 +if test "x$ac_cr" = x; then
12889 + eval ac_cr=\$\'\\r\'
12891 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
12892 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
12893 - ac_cs_awk_cr='\\r'
12894 + ac_cs_awk_cr='\r'
12896 ac_cs_awk_cr=$ac_cr
12898 @@ -12018,24 +8994,18 @@ _ACEOF
12899 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
12901 } >conf$$subs.sh ||
12902 - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
12903 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
12904 - { (exit 1); exit 1; }; }
12905 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
12906 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
12908 for ac_last_try in false false false false false :; do
12909 . ./conf$$subs.sh ||
12910 - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
12911 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
12912 - { (exit 1); exit 1; }; }
12913 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
12915 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
12916 if test $ac_delim_n = $ac_delim_num; then
12918 elif $ac_last_try; then
12919 - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
12920 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
12921 - { (exit 1); exit 1; }; }
12922 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
12924 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
12926 @@ -12057,7 +9027,7 @@ s/'"$ac_delim"'$//
12930 -s/\(.\{148\}\).*/\1/
12931 +s/\(.\{148\}\)..*/\1/
12933 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
12935 @@ -12071,7 +9041,7 @@ s/.\{148\}//
12939 -s/\(.\{148\}\).*/\1/
12940 +s/\(.\{148\}\)..*/\1/
12942 s/["\\]/\\&/g; s/^/"/; s/$/"/
12944 @@ -12124,9 +9094,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
12947 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
12948 - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
12949 -$as_echo "$as_me: error: could not setup config files machinery" >&2;}
12950 - { (exit 1); exit 1; }; }
12951 + || as_fn_error "could not setup config files machinery" "$LINENO" 5
12954 # VPATH may cause trouble with some makes, so we remove $(srcdir),
12955 @@ -12167,9 +9135,7 @@ for ac_last_try in false false :; do
12956 if test -z "$ac_t"; then
12958 elif $ac_last_try; then
12959 - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
12960 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
12961 - { (exit 1); exit 1; }; }
12962 + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
12964 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
12966 @@ -12254,9 +9220,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
12969 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
12970 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
12971 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
12972 - { (exit 1); exit 1; }; }
12973 + as_fn_error "could not setup config headers machinery" "$LINENO" 5
12974 fi # test -n "$CONFIG_HEADERS"
12977 @@ -12269,9 +9233,7 @@ do
12979 case $ac_mode$ac_tag in
12981 - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
12982 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
12983 - { (exit 1); exit 1; }; };;
12984 + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
12985 :[FH]-) ac_tag=-:-;;
12986 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
12988 @@ -12299,12 +9261,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
12990 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
12992 - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
12993 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
12994 - { (exit 1); exit 1; }; };;
12995 + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
12997 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
12998 - ac_file_inputs="$ac_file_inputs '$ac_f'"
12999 + as_fn_append ac_file_inputs " '$ac_f'"
13002 # Let's still pretend it is `configure' which instantiates (i.e., don't
13003 @@ -12315,7 +9275,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
13005 if test x"$ac_file" != x-; then
13006 configure_input="$ac_file. $configure_input"
13007 - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
13008 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
13009 $as_echo "$as_me: creating $ac_file" >&6;}
13011 # Neutralize special characters interpreted by sed in replacement strings.
13012 @@ -12328,9 +9288,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
13015 *:-:* | *:-) cat >"$tmp/stdin" \
13016 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13017 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
13018 - { (exit 1); exit 1; }; } ;;
13019 + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
13023 @@ -12358,47 +9316,7 @@ $as_echo X"$ac_file" |
13027 - { as_dir="$ac_dir"
13028 - case $as_dir in #(
13029 - -*) as_dir=./$as_dir;;
13031 - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
13034 - case $as_dir in #(
13035 - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
13036 - *) as_qdir=$as_dir;;
13038 - as_dirs="'$as_qdir' $as_dirs"
13039 - as_dir=`$as_dirname -- "$as_dir" ||
13040 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
13041 - X"$as_dir" : 'X\(//\)[^/]' \| \
13042 - X"$as_dir" : 'X\(//\)$' \| \
13043 - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
13044 -$as_echo X"$as_dir" |
13045 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
13049 - /^X\(\/\/\)[^/].*/{
13062 - test -d "$as_dir" && break
13064 - test -z "$as_dirs" || eval "mkdir $as_dirs"
13065 - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
13066 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
13067 - { (exit 1); exit 1; }; }; }
13068 + as_dir="$ac_dir"; as_fn_mkdir_p
13072 @@ -12455,7 +9373,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
13073 # If the template does not know about datarootdir, expand it.
13074 # FIXME: This hack should be removed a few years after 2.60.
13075 ac_datarootdir_hack=; ac_datarootdir_seen=
13080 @@ -12465,12 +9382,11 @@ ac_sed_dataroot='
13087 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
13088 *datarootdir*) ac_datarootdir_seen=yes;;
13089 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
13090 - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
13091 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
13092 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
13094 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
13095 @@ -12480,7 +9396,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
13096 s&@infodir@&$infodir&g
13097 s&@localedir@&$localedir&g
13098 s&@mandir@&$mandir&g
13099 - s&\\\${datarootdir}&$datarootdir&g' ;;
13100 + s&\\\${datarootdir}&$datarootdir&g' ;;
13104 @@ -12509,14 +9425,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
13105 $ac_datarootdir_hack
13107 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
13108 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13109 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
13110 - { (exit 1); exit 1; }; }
13111 + || as_fn_error "could not create $ac_file" "$LINENO" 5
13113 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
13114 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
13115 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
13116 - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
13117 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
13118 which seems to be undefined. Please make sure it is defined." >&5
13119 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
13120 which seems to be undefined. Please make sure it is defined." >&2;}
13121 @@ -12526,9 +9440,7 @@ which seems to be undefined. Please make sure it is defined." >&2;}
13122 -) cat "$tmp/out" && rm -f "$tmp/out";;
13123 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
13125 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13126 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
13127 - { (exit 1); exit 1; }; }
13128 + || as_fn_error "could not create $ac_file" "$LINENO" 5
13132 @@ -12539,25 +9451,19 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
13133 $as_echo "/* $configure_input */" \
13134 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
13135 } >"$tmp/config.h" \
13136 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13137 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
13138 - { (exit 1); exit 1; }; }
13139 + || as_fn_error "could not create $ac_file" "$LINENO" 5
13140 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
13141 - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
13142 + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
13143 $as_echo "$as_me: $ac_file is unchanged" >&6;}
13146 mv "$tmp/config.h" "$ac_file" \
13147 - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
13148 -$as_echo "$as_me: error: could not create $ac_file" >&2;}
13149 - { (exit 1); exit 1; }; }
13150 + || as_fn_error "could not create $ac_file" "$LINENO" 5
13153 $as_echo "/* $configure_input */" \
13154 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
13155 - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
13156 -$as_echo "$as_me: error: could not create -" >&2;}
13157 - { (exit 1); exit 1; }; }
13158 + || as_fn_error "could not create -" "$LINENO" 5
13160 # Compute "$ac_file"'s index in $config_headers.
13162 @@ -12595,25 +9501,35 @@ $as_echo X"$_am_arg" |
13163 s/.*/./; q'`/stamp-h$_am_stamp_count
13166 - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
13167 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
13168 $as_echo "$as_me: executing $ac_file commands" >&6;}
13173 case $ac_file$ac_mode in
13174 - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
13175 - # Strip MF so we end up with the name of the file.
13176 - mf=`echo "$mf" | sed -e 's/:.*$//'`
13177 - # Check whether this is an Automake generated Makefile or not.
13178 - # We used to match only the files named `Makefile.in', but
13179 - # some people rename them; so instead we look at the file content.
13180 - # Grep'ing the first line is not enough: some people post-process
13181 - # each Makefile.in and add a new line on top of each file to say so.
13182 - # Grep'ing the whole file is not good either: AIX grep has a line
13183 - # limit of 2048, but all sed's we know have understand at least 4000.
13184 - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
13185 - dirpart=`$as_dirname -- "$mf" ||
13186 + "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
13187 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
13188 + # are listed without --file. Let's play safe and only enable the eval
13189 + # if we detect the quoting.
13190 + case $CONFIG_FILES in
13191 + *\'*) eval set x "$CONFIG_FILES" ;;
13192 + *) set x $CONFIG_FILES ;;
13197 + # Strip MF so we end up with the name of the file.
13198 + mf=`echo "$mf" | sed -e 's/:.*$//'`
13199 + # Check whether this is an Automake generated Makefile or not.
13200 + # We used to match only the files named `Makefile.in', but
13201 + # some people rename them; so instead we look at the file content.
13202 + # Grep'ing the first line is not enough: some people post-process
13203 + # each Makefile.in and add a new line on top of each file to say so.
13204 + # Grep'ing the whole file is not good either: AIX grep has a line
13205 + # limit of 2048, but all sed's we know have understand at least 4000.
13206 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
13207 + dirpart=`$as_dirname -- "$mf" ||
13208 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
13209 X"$mf" : 'X\(//\)[^/]' \| \
13210 X"$mf" : 'X\(//\)$' \| \
13211 @@ -12636,28 +9552,28 @@ $as_echo X"$mf" |
13218 - # Extract the definition of DEPDIR, am__include, and am__quote
13219 - # from the Makefile without running `make'.
13220 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
13221 - test -z "$DEPDIR" && continue
13222 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
13223 - test -z "am__include" && continue
13224 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
13225 - # When using ansi2knr, U may be empty or an underscore; expand it
13226 - U=`sed -n 's/^U = //p' < "$mf"`
13227 - # Find all dependency output files, they are included files with
13228 - # $(DEPDIR) in their names. We invoke sed twice because it is the
13229 - # simplest approach to changing $(DEPDIR) to its actual value in the
13231 - for file in `sed -n "
13232 - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
13233 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
13234 - # Make sure the directory exists.
13235 - test -f "$dirpart/$file" && continue
13236 - fdir=`$as_dirname -- "$file" ||
13240 + # Extract the definition of DEPDIR, am__include, and am__quote
13241 + # from the Makefile without running `make'.
13242 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
13243 + test -z "$DEPDIR" && continue
13244 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
13245 + test -z "am__include" && continue
13246 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
13247 + # When using ansi2knr, U may be empty or an underscore; expand it
13248 + U=`sed -n 's/^U = //p' < "$mf"`
13249 + # Find all dependency output files, they are included files with
13250 + # $(DEPDIR) in their names. We invoke sed twice because it is the
13251 + # simplest approach to changing $(DEPDIR) to its actual value in the
13253 + for file in `sed -n "
13254 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
13255 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
13256 + # Make sure the directory exists.
13257 + test -f "$dirpart/$file" && continue
13258 + fdir=`$as_dirname -- "$file" ||
13259 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
13260 X"$file" : 'X\(//\)[^/]' \| \
13261 X"$file" : 'X\(//\)$' \| \
13262 @@ -12680,66 +9596,24 @@ $as_echo X"$file" |
13266 - { as_dir=$dirpart/$fdir
13267 - case $as_dir in #(
13268 - -*) as_dir=./$as_dir;;
13270 - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
13273 - case $as_dir in #(
13274 - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
13275 - *) as_qdir=$as_dir;;
13277 - as_dirs="'$as_qdir' $as_dirs"
13278 - as_dir=`$as_dirname -- "$as_dir" ||
13279 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
13280 - X"$as_dir" : 'X\(//\)[^/]' \| \
13281 - X"$as_dir" : 'X\(//\)$' \| \
13282 - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
13283 -$as_echo X"$as_dir" |
13284 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
13288 - /^X\(\/\/\)[^/].*/{
13301 - test -d "$as_dir" && break
13302 + as_dir=$dirpart/$fdir; as_fn_mkdir_p
13303 + # echo "creating $dirpart/$file"
13304 + echo '# dummy' > "$dirpart/$file"
13306 - test -z "$as_dirs" || eval "mkdir $as_dirs"
13307 - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
13308 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
13309 - { (exit 1); exit 1; }; }; }
13310 - # echo "creating $dirpart/$file"
13311 - echo '# dummy' > "$dirpart/$file"
13321 -{ (exit 0); exit 0; }
13324 -chmod +x $CONFIG_STATUS
13325 ac_clean_files=$ac_clean_files_save
13327 test $ac_write_fail = 0 ||
13328 - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
13329 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
13330 - { (exit 1); exit 1; }; }
13331 + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
13334 # configure is writing to config.log, and then calls config.status.
13335 @@ -12760,10 +9634,10 @@ if test "$no_create" != yes; then
13337 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
13338 # would make configure fail if this is the last instruction.
13339 - $ac_cs_success || { (exit 1); exit 1; }
13340 + $ac_cs_success || as_fn_exit $?
13342 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
13343 - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
13344 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
13345 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
13348 diff --git a/configure.ac b/configure.ac
13349 index 3e4ba03..acf2d35 100755
13352 @@ -30,6 +30,43 @@ AX_BOOST_IOSTREAMS
13353 AX_BOOST_PROGRAM_OPTIONS
13354 AX_BOOST_FILESYSTEM
13356 +# Test the boost library whether it was compiled for 64bit system / 32bit
13357 +# system with long file support or not.
13359 +# If not, there is a little help with intructions to get boost library compiled:
13360 +# ./bjam "define=_FILE_OFFSET_BITS=64" release --toolset=gcc --build-type=minimal --layout=system --libdir=/usr/lib/ --prefix=/usr
13361 +# sudo ./bjam "define=_FILE_OFFSET_BITS=64" release --toolset=gcc --build-type=minimal --layout=system --libdir=/usr/lib/ --includedir=/usr/include/boost --prefix=/usr install
13363 +AC_ARG_ENABLE(crippled_boost,
13364 + AC_HELP_STRING([--enable-crippled_boost],
13365 + [enables use of boost without long file support. don't report bugs or ask for help if working with files bigger than 1.5GiB]),
13366 + USE_CRIPPLED_BOOST="yes",USE_CRIPPLED_BOOST="no")
13368 +if test "x$USE_CRIPPLED_BOOST" = "xno"; then
13370 +LIBS="$LIBS $BOOST_IOSTREAMS_LIB"
13371 +AC_LANG_PUSH([C++])
13373 +#include <iostream>
13374 +#include <fstream>
13375 +#include <sstream>
13376 +#include <sys/types.h>
13377 +#include <sys/mman.h>
13378 +#include <sys/stat.h>
13379 +#include <fcntl.h>
13380 +#include "src/boost/iostreams/device/nonclosable_file_descriptor.hpp"
13381 +int main(int argc, char **argv) {
13382 + int fd = open("bigfs.tmp", O_RDWR|O_CREAT, 0666);
13383 + boost::iostreams::nonclosable_file_descriptor file(fd);
13384 + long long ret = file.seek(3*1024*1024*1024LL, std::ios_base::beg);
13385 + return ret == 3*1024*1024*1024LL ? 0 : 1;
13388 +[AC_MSG_ERROR([Boost library compiled for 32bit architecture without long file support!])])
13389 +AC_LANG_POP([C++])
13393 # Checks for libraries.
13394 AC_CHECK_LIB([pthread], [pthread_mutex_lock],,
13395 [AC_MSG_ERROR([Can't find pthread.a])],)
13396 diff --git a/src/Block.cpp b/src/Block.cpp
13397 index bbae0d2..655b701 100755
13398 --- a/src/Block.cpp
13399 +++ b/src/Block.cpp
13402 + (C) Copyright Milan Svoboda 2009.
13404 + This file is part of FuseCompress.
13406 + FuseCompress is free software: you can redistribute it and/or modify
13407 + it under the terms of the GNU General Public License as published by
13408 + the Free Software Foundation, either version 2 of the License, or
13409 + (at your option) any later version.
13411 + Foobar is distributed in the hope that it will be useful,
13412 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13413 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13414 + GNU General Public License for more details.
13416 + You should have received a copy of the GNU General Public License
13417 + along with FuseCompress. If not, see <http://www.gnu.org/licenses/>.
13420 #include <boost/io/ios_state.hpp>
13422 #include "Block.hpp"
13423 diff --git a/src/Block.hpp b/src/Block.hpp
13424 index d5a4061..bcbba31 100755
13425 --- a/src/Block.hpp
13426 +++ b/src/Block.hpp
13429 + (C) Copyright Milan Svoboda 2009.
13431 + This file is part of FuseCompress.
13433 + FuseCompress is free software: you can redistribute it and/or modify
13434 + it under the terms of the GNU General Public License as published by
13435 + the Free Software Foundation, either version 2 of the License, or
13436 + (at your option) any later version.
13438 + Foobar is distributed in the hope that it will be useful,
13439 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13440 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13441 + GNU General Public License for more details.
13443 + You should have received a copy of the GNU General Public License
13444 + along with FuseCompress. If not, see <http://www.gnu.org/licenses/>.
13450 diff --git a/src/Compress.cpp b/src/Compress.cpp
13451 index 6ea3e90..d4ae959 100755
13452 --- a/src/Compress.cpp
13453 +++ b/src/Compress.cpp
13456 + (C) Copyright Milan Svoboda 2009.
13458 + This file is part of FuseCompress.
13460 + FuseCompress is free software: you can redistribute it and/or modify
13461 + it under the terms of the GNU General Public License as published by
13462 + the Free Software Foundation, either version 2 of the License, or
13463 + (at your option) any later version.
13465 + Foobar is distributed in the hope that it will be useful,
13466 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13467 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13468 + GNU General Public License for more details.
13470 + You should have received a copy of the GNU General Public License
13471 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
13475 -#include <assert.h>
13476 #include <algorithm>
13477 #include <iostream>
13480 -#include <rlog/rlog.h>
13482 #include <sys/types.h>
13483 #include <sys/mman.h>
13484 #include <sys/stat.h>
13485 @@ -18,21 +34,19 @@
13486 #include <boost/iostreams/filter/bytescounter.hpp>
13487 #include <boost/iostreams/filter/gzip.hpp>
13488 #include <boost/iostreams/device/nonclosable_file_descriptor.hpp>
13489 +#include <boost/iostreams/slice.hpp>
13491 #include <boost/archive/portable_binary_iarchive.hpp>
13492 #include <boost/archive/portable_binary_oarchive.hpp>
13494 #include "config.h"
13496 -#if defined(HAVE_ATTR_XATTR_H)
13497 -# include <attr/xattr.h>
13498 -#elif defined(HAVE_SYS_XATTR_H)
13499 -# include <sys/xattr.h>
13501 +#include "rlog/rlog.h"
13502 +#include "assert.h"
13504 #include "Compress.hpp"
13505 #include "FileUtils.hpp"
13506 #include "FileRememberTimes.hpp"
13507 +#include "FileRememberXattrs.hpp"
13508 #include "FileManager.hpp"
13510 #include "CompressedMagic.hpp"
13511 @@ -84,18 +98,20 @@ Compress::Compress(const struct stat *st, const char *name) :
13513 assert(m_fd == -1);
13518 restoreFileHeader(name);
13520 m_IsCompressed = m_fh.isValid();
13522 - if (m_IsCompressed)
13524 - m_RawFileSize = (m_fh.index == 0) ?
13525 - FileHeader::MaxSize : st->st_size;
13528 - catch (...) { m_IsCompressed = false; }
13531 + m_IsCompressed = false;
13533 + if (m_IsCompressed)
13535 + m_RawFileSize = (m_fh.index == 0) ?
13536 + FileHeader::MaxSize : st->st_size;
13540 if (m_IsCompressed)
13541 @@ -225,11 +241,10 @@ int Compress::open(const char *name, int flags)
13546 + catch (exception& e)
13548 - // TODO: Detect error and set 'errno' correctly.
13550 - rError("%s: Failed to restore LayerMap of file '%s'", __PRETTY_FUNCTION__, name);
13551 + rError("%s: Failed to restore LayerMap of file '%s', exception: %s",
13552 + __PRETTY_FUNCTION__, name, e.what());
13554 // Failed to restore LayerMap althrought it should be present. Mark the file
13555 // as not compressed to pass following release() correctly.
13556 @@ -316,9 +331,10 @@ off_t Compress::writeCompressed(LayerMap& lm, off_t offset, off_t coffset, const
13557 bl->clength = length.bytes();
13558 coffset = bl->coffset + bl->clength;
13561 + catch (exception& e)
13563 - rError("Failed to add a new Block to the file.");
13564 + rError("%s: Failed to add a new Block to the file, offset: %lx, coffset: %lx, exception: %s",
13565 + __PRETTY_FUNCTION__, bl->offset, bl->coffset, e.what());
13569 @@ -413,7 +429,7 @@ off_t Compress::readBlock(int fd, const Block& block, off_t size, off_t len, off
13571 io::filtering_istream in;
13572 block.type.push(in);
13574 + in.push(io::slice(file, 0 /* already seeked and no seek after */, block.clength));
13576 boost::scoped_array<char> buf_tmp(new char[block.length]);
13578 @@ -471,11 +487,13 @@ ssize_t Compress::readCompressed(char *buf, size_t size, off_t offset, int fd) c
13580 r = readBlock(fd, block, size, len, offset, buf);
13583 + catch (exception& e)
13585 - rError("%s: Block read failed: block.offset:%lx, block.coffset:%lx, block.length: %lx, block.clength: %lx",
13586 + rError("%s: Block read failed: offset:%lx, coffset:%lx, length: %lx, clength: %lx, exception: %s",
13587 __PRETTY_FUNCTION__, (long int) block.offset, (long int) block.coffset,
13588 - (long int) block.length, (long int) block.clength);
13589 + (long int) block.length, (long int) block.clength, e.what());
13595 @@ -605,12 +623,11 @@ int Compress::store()
13600 + catch (exception& e)
13602 - // TODO: Detect error and set 'errno' correctly.
13603 + rError("%s: Failed to store FileHeader and/or LayerMap, exception: %s",
13604 + __PRETTY_FUNCTION__, e.what());
13606 - rError("%s: Failed to store FileHeader and/or LayerMap",
13607 - __PRETTY_FUNCTION__);
13611 @@ -639,7 +656,6 @@ off_t Compress::copy(int readFd, off_t writeOffset, int writeFd, LayerMap& write
13612 writeOffset = writeCompressed(writeLm, readOffset, writeOffset, buf.get(), bytes, writeFd, writeOffset);
13613 if (writeOffset == -1)
13615 - assert (writeOffset == bytes);
13616 readOffset += bytes;
13618 return writeOffset;
13619 @@ -681,16 +697,15 @@ off_t Compress::cleverCopy(int readFd, off_t writeOffset, int writeFd, LayerMap&
13620 if (writeOffset == -1)
13623 - assert (r == writeOffset);
13629 + catch (exception& e)
13631 - rError("%s: Block read failed: block.offset:%lx, block.coffset:%lx, block.length: %lx, block.clength: %lx",
13632 + rError("%s: Block read failed: offset:%lx, coffset:%lx, length: %lx, clength: %lx, exception: %s",
13633 __PRETTY_FUNCTION__, (long int) block.offset, (long int) block.coffset,
13634 - (long int) block.length, (long int) block.clength);
13635 + (long int) block.length, (long int) block.clength, e.what());
13640 @@ -757,10 +772,17 @@ void Compress::DefragmentFast()
13644 + // Transfer file attributes like mode, owner, times and
13645 + // extended attributes.
13647 ::fchmod(tmp_fd, st.st_mode);
13648 ::fchown(tmp_fd, st.st_uid, st.st_gid);
13649 ::futimens(tmp_fd, m_times);
13651 + FileRememberXattrs xattrs;
13652 + xattrs.read(m_fd);
13653 + xattrs.write(tmp_fd);
13658 @@ -795,12 +817,9 @@ void Compress::DefragmentFast()
13660 if (::rename(tmp_name, m_name.c_str()) == -1)
13662 - g_FileManager->Unlock();
13664 - rError("Cannot rename '%s' to '%s'", tmp_name, m_name.c_str());
13666 + rError("%s: Cannot rename '%s' to '%s'",
13667 + __PRETTY_FUNCTION__, tmp_name, m_name.c_str());
13670 g_FileManager->Unlock();
13673 @@ -809,8 +828,3 @@ bool Compress::isCompressedOnlyWith(CompressionType& type)
13674 return m_lm.isCompressedOnlyWith(type);
13682 diff --git a/src/Compress.hpp b/src/Compress.hpp
13683 index 0a1a251..769e1b6 100755
13684 --- a/src/Compress.hpp
13685 +++ b/src/Compress.hpp
13688 + This file is part of FuseCompress.
13690 + FuseCompress is free software: you can redistribute it and/or modify
13691 + it under the terms of the GNU General Public License as published by
13692 + the Free Software Foundation, either version 2 of the License, or
13693 + (at your option) any later version.
13695 + Foobar is distributed in the hope that it will be useful,
13696 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13697 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13698 + GNU General Public License for more details.
13700 + You should have received a copy of the GNU General Public License
13701 + along with FuseCompress. If not, see <http://www.gnu.org/licenses/>.
13704 #ifndef COMPRESS_HPP
13705 #define COMPRESS_HPP
13707 diff --git a/src/CompressedMagic.cpp b/src/CompressedMagic.cpp
13708 index 8b6a24a..44c9095 100755
13709 --- a/src/CompressedMagic.cpp
13710 +++ b/src/CompressedMagic.cpp
13712 -#include <cassert>
13714 + (C) Copyright Milan Svoboda 2009.
13716 + This file is part of FuseCompress.
13718 + FuseCompress is free software: you can redistribute it and/or modify
13719 + it under the terms of the GNU General Public License as published by
13720 + the Free Software Foundation, either version 2 of the License, or
13721 + (at your option) any later version.
13723 + Foobar is distributed in the hope that it will be useful,
13724 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13725 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13726 + GNU General Public License for more details.
13728 + You should have received a copy of the GNU General Public License
13729 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
13734 -#include <rlog/rlog.h>
13735 #include <stdlib.h>
13737 #include <iostream>
13740 +#include <sys/ioctl.h>
13741 +#include <stdio.h>
13742 #include <boost/tokenizer.hpp>
13743 #include <boost/algorithm/string.hpp>
13745 +#include "rlog/rlog.h"
13747 using namespace std;
13749 #include "Lock.hpp"
13750 @@ -72,7 +93,17 @@ void CompressedMagic::PopulateTable()
13752 CompressedMagic::CompressedMagic()
13754 - m_magic = magic_open(MAGIC_MIME_TYPE|MAGIC_PRESERVE_ATIME);
13755 + // In newer versions of libmagic MAGIC_MIME is declared as MAGIC_MIME_TYPE | MAGIC_MIME_ENCODING.
13756 + // Older versions don't know MAGIC_MIME_TYPE, though -- the old MAGIC_MIME is the new MAGIC_MIME_TYPE,
13757 + // and the new MAGIC_MIME has been redefined.
13758 + // However, I recommend you to upgrade to the newest version of libmagic because at least
13759 + // one bug (memory leak) is fixed there.
13761 +#ifdef MAGIC_MIME_TYPE
13762 + m_magic = magic_open(MAGIC_MIME_TYPE | MAGIC_PRESERVE_ATIME);
13764 + m_magic = magic_open(MAGIC_MIME | MAGIC_PRESERVE_ATIME);
13768 rError("CompressedMagic::CompressedMagic magic_open failed with: %s",
13769 @@ -106,7 +137,12 @@ std::ostream &operator<<(std::ostream &os, const CompressedMagic &rObj)
13771 // Compute how many colums fit to a terminal.
13773 - unsigned int cols = (80 - 2) / (len + 5);
13774 + struct winsize w;
13775 + ioctl(0, TIOCGWINSZ, &w);
13777 + unsigned int cols = (w.ws_col - 2) / (len + 5);
13778 + cols = cols > 0 ? cols : 1;
13783 @@ -154,13 +190,13 @@ bool CompressedMagic::isNativelyCompressed(const char *buf, int len)
13787 - rDebug("Data identified as %s", mime);
13789 if (m_table.find(mime) != m_table.end())
13791 + rDebug("Data identified as already compressed (%s)", mime);
13795 + rDebug("Data identified as not compressed (%s)", mime);
13799 @@ -174,13 +210,13 @@ bool CompressedMagic::isNativelyCompressed(const char *name)
13803 - rDebug("Data identified as %s", mime);
13805 if (m_table.find(mime) != m_table.end())
13807 + rDebug("Data identified as already compressed (%s)", mime);
13811 + rDebug("Data identified as not compressed (%s)", mime);
13815 diff --git a/src/CompressedMagic.hpp b/src/CompressedMagic.hpp
13816 index 73a3482..31d0831 100755
13817 --- a/src/CompressedMagic.hpp
13818 +++ b/src/CompressedMagic.hpp
13821 + (C) Copyright Milan Svoboda 2009.
13823 + This file is part of FuseCompress.
13825 + FuseCompress is free software: you can redistribute it and/or modify
13826 + it under the terms of the GNU General Public License as published by
13827 + the Free Software Foundation, either version 2 of the License, or
13828 + (at your option) any later version.
13830 + Foobar is distributed in the hope that it will be useful,
13831 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13832 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13833 + GNU General Public License for more details.
13835 + You should have received a copy of the GNU General Public License
13836 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
13839 #ifndef __COMPRESSED_MAGIC__
13840 #define __COMPRESSED_MAGIC__
13842 diff --git a/src/CompressionType.cpp b/src/CompressionType.cpp
13843 index 071367e..6d9207c 100644
13844 --- a/src/CompressionType.cpp
13845 +++ b/src/CompressionType.cpp
13848 + This file is part of FuseCompress.
13850 + FuseCompress is free software: you can redistribute it and/or modify
13851 + it under the terms of the GNU General Public License as published by
13852 + the Free Software Foundation, either version 2 of the License, or
13853 + (at your option) any later version.
13855 + Foobar is distributed in the hope that it will be useful,
13856 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13857 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13858 + GNU General Public License for more details.
13860 + You should have received a copy of the GNU General Public License
13861 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
13864 #include "config.h"
13866 #ifdef HAVE_LIBLZMA
13867 diff --git a/src/CompressionType.hpp b/src/CompressionType.hpp
13868 index b836787..e9a9ab5 100644
13869 --- a/src/CompressionType.hpp
13870 +++ b/src/CompressionType.hpp
13873 + This file is part of FuseCompress.
13875 + FuseCompress is free software: you can redistribute it and/or modify
13876 + it under the terms of the GNU General Public License as published by
13877 + the Free Software Foundation, either version 2 of the License, or
13878 + (at your option) any later version.
13880 + Foobar is distributed in the hope that it will be useful,
13881 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13882 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13883 + GNU General Public License for more details.
13885 + You should have received a copy of the GNU General Public License
13886 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
13889 #ifndef COMPRESSIONTYPE_HPP
13890 #define COMPRESSIONTYPE_HPP
13892 diff --git a/src/File.cpp b/src/File.cpp
13893 index d0e3063..efc7152 100755
13898 + (C) Copyright Milan Svoboda 2009.
13900 + This file is part of FuseCompress.
13902 + FuseCompress is free software: you can redistribute it and/or modify
13903 + it under the terms of the GNU General Public License as published by
13904 + the Free Software Foundation, either version 2 of the License, or
13905 + (at your option) any later version.
13907 + Foobar is distributed in the hope that it will be useful,
13908 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13909 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13910 + GNU General Public License for more details.
13912 + You should have received a copy of the GNU General Public License
13913 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
13916 #include <unistd.h>
13920 -#include <assert.h>
13921 #include <iostream>
13923 #include <sys/types.h>
13924 #include <sys/stat.h>
13927 -#include <rlog/rlog.h>
13928 +#include "rlog/rlog.h"
13929 +#include "assert.h"
13931 #include "File.hpp"
13932 #include "FileUtils.hpp"
13933 diff --git a/src/File.hpp b/src/File.hpp
13934 index 5ee7959..914544f 100755
13939 + (C) Copyright Milan Svoboda 2009.
13941 + This file is part of FuseCompress.
13943 + FuseCompress is free software: you can redistribute it and/or modify
13944 + it under the terms of the GNU General Public License as published by
13945 + the Free Software Foundation, either version 2 of the License, or
13946 + (at your option) any later version.
13948 + Foobar is distributed in the hope that it will be useful,
13949 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13950 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13951 + GNU General Public License for more details.
13953 + You should have received a copy of the GNU General Public License
13954 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
13960 @@ -21,7 +40,7 @@ protected:
13963 // Reference counter. Used to open m_fd just once even
13964 - // for multiple users. Is value drops to zero, m_fd is
13965 + // for multiple users. If value drops to zero, m_fd is
13969 diff --git a/src/FileHeader.cpp b/src/FileHeader.cpp
13970 index 61ebb7c..75dc256 100755
13971 --- a/src/FileHeader.cpp
13972 +++ b/src/FileHeader.cpp
13975 + (C) Copyright Milan Svoboda 2009.
13977 + This file is part of FuseCompress.
13979 + FuseCompress is free software: you can redistribute it and/or modify
13980 + it under the terms of the GNU General Public License as published by
13981 + the Free Software Foundation, either version 2 of the License, or
13982 + (at your option) any later version.
13984 + Foobar is distributed in the hope that it will be useful,
13985 + but WITHOUT ANY WARRANTY; without even the implied warranty of
13986 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13987 + GNU General Public License for more details.
13989 + You should have received a copy of the GNU General Public License
13990 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
13993 #include <unistd.h>
13994 #include <stdint.h>
13995 #include <string.h>
13998 +#include <sys/types.h>
13999 #include <iostream>
14002 #include "config.h"
14004 -#include <sys/types.h>
14005 -#include <rlog/rlog.h>
14006 +#include "rlog/rlog.h"
14008 #include "FileHeader.hpp"
14009 #include "FileUtils.hpp"
14010 diff --git a/src/FileHeader.hpp b/src/FileHeader.hpp
14011 index 4b46d27..840844e 100755
14012 --- a/src/FileHeader.hpp
14013 +++ b/src/FileHeader.hpp
14016 + (C) Copyright Milan Svoboda 2009.
14018 + This file is part of FuseCompress.
14020 + FuseCompress is free software: you can redistribute it and/or modify
14021 + it under the terms of the GNU General Public License as published by
14022 + the Free Software Foundation, either version 2 of the License, or
14023 + (at your option) any later version.
14025 + Foobar is distributed in the hope that it will be useful,
14026 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14027 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14028 + GNU General Public License for more details.
14030 + You should have received a copy of the GNU General Public License
14031 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14034 #ifndef FILEHEADER_HPP
14035 #define FILEHEADER_HPP
14037 @@ -74,7 +93,7 @@ public:
14039 inline bool isValid() const
14041 - if ((id_0 != '\037') || (id_1 != '\135') || (id_2 != '\211'))
14042 + if ((id_0 != (signed char)'\037') || (id_1 != (signed char)'\135') || (id_2 != (signed char)'\211'))
14046 diff --git a/src/FileManager.cpp b/src/FileManager.cpp
14047 index 4857923..f0fefd2 100755
14048 --- a/src/FileManager.cpp
14049 +++ b/src/FileManager.cpp
14051 -#include <assert.h>
14053 + (C) Copyright Milan Svoboda 2009.
14055 + This file is part of FuseCompress.
14057 + FuseCompress is free software: you can redistribute it and/or modify
14058 + it under the terms of the GNU General Public License as published by
14059 + the Free Software Foundation, either version 2 of the License, or
14060 + (at your option) any later version.
14062 + Foobar is distributed in the hope that it will be useful,
14063 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14064 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14065 + GNU General Public License for more details.
14067 + You should have received a copy of the GNU General Public License
14068 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14072 #include <sys/types.h>
14073 #include <sys/stat.h>
14074 #include <unistd.h>
14077 -#include <rlog/rlog.h>
14078 +#include "rlog/rlog.h"
14079 +#include "assert.h"
14081 #include "FileManager.hpp"
14083 diff --git a/src/FileManager.hpp b/src/FileManager.hpp
14084 index 967354a..f3b4825 100755
14085 --- a/src/FileManager.hpp
14086 +++ b/src/FileManager.hpp
14089 + (C) Copyright Milan Svoboda 2009.
14091 + This file is part of FuseCompress.
14093 + FuseCompress is free software: you can redistribute it and/or modify
14094 + it under the terms of the GNU General Public License as published by
14095 + the Free Software Foundation, either version 2 of the License, or
14096 + (at your option) any later version.
14098 + Foobar is distributed in the hope that it will be useful,
14099 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14100 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14101 + GNU General Public License for more details.
14103 + You should have received a copy of the GNU General Public License
14104 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14107 #ifndef FILEMANAGER_H
14108 #define FILEMANAGER_H
14110 diff --git a/src/FileRememberTimes.cpp b/src/FileRememberTimes.cpp
14111 index 8e2b6b1..cb3a12a 100755
14112 --- a/src/FileRememberTimes.cpp
14113 +++ b/src/FileRememberTimes.cpp
14116 + (C) Copyright Milan Svoboda 2009.
14118 + This file is part of FuseCompress.
14120 + FuseCompress is free software: you can redistribute it and/or modify
14121 + it under the terms of the GNU General Public License as published by
14122 + the Free Software Foundation, either version 2 of the License, or
14123 + (at your option) any later version.
14125 + Foobar is distributed in the hope that it will be useful,
14126 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14127 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14128 + GNU General Public License for more details.
14130 + You should have received a copy of the GNU General Public License
14131 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14134 #include "FileRememberTimes.hpp"
14136 #include <sys/types.h>
14137 diff --git a/src/FileRememberTimes.hpp b/src/FileRememberTimes.hpp
14138 index dd8bbab..c1e2c08 100755
14139 --- a/src/FileRememberTimes.hpp
14140 +++ b/src/FileRememberTimes.hpp
14143 + (C) Copyright Milan Svoboda 2009.
14145 + This file is part of FuseCompress.
14147 + FuseCompress is free software: you can redistribute it and/or modify
14148 + it under the terms of the GNU General Public License as published by
14149 + the Free Software Foundation, either version 2 of the License, or
14150 + (at your option) any later version.
14152 + Foobar is distributed in the hope that it will be useful,
14153 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14154 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14155 + GNU General Public License for more details.
14157 + You should have received a copy of the GNU General Public License
14158 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14161 #include <sys/time.h>
14163 class FileRememberTimes
14164 diff --git a/src/FileRememberXattrs.cpp b/src/FileRememberXattrs.cpp
14165 new file mode 100644
14166 index 0000000..e63c16f
14168 +++ b/src/FileRememberXattrs.cpp
14171 + (C) Copyright Milan Svoboda 2009.
14173 + This file is part of FuseCompress.
14175 + FuseCompress is free software: you can redistribute it and/or modify
14176 + it under the terms of the GNU General Public License as published by
14177 + the Free Software Foundation, either version 2 of the License, or
14178 + (at your option) any later version.
14180 + Foobar is distributed in the hope that it will be useful,
14181 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14182 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14183 + GNU General Public License for more details.
14185 + You should have received a copy of the GNU General Public License
14186 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14189 +#include "config.h"
14191 +#include <algorithm>
14192 +#include <functional>
14193 +#include <errno.h>
14194 +#include <sys/types.h>
14196 +#if defined(HAVE_ATTR_XATTR_H)
14197 +# include <attr/xattr.h>
14198 +#elif defined(HAVE_SYS_XATTR_H)
14199 +# include <sys/xattr.h>
14202 +#include "rlog/rlog.h"
14204 +#include <FileRememberXattrs.hpp>
14206 +void FileRememberXattrs::read(int fd_source)
14208 + size_t list_size = 1024;
14210 + char* list = new char[list_size];
14211 + int r = ::flistxattr(fd_source, list, list_size);
14216 + if (ERANGE == errno)
14219 + goto try_list_again;
14223 + char *listp = list;
14226 + int attr_size = 1024;
14228 + char* attr = new char[attr_size];
14229 + int rr = ::fgetxattr(fd_source, listp, attr, attr_size);
14234 + if (ERANGE == errno)
14237 + goto try_attr_again;
14242 + std::string key(listp);
14243 + std::string value(attr, rr);
14244 + m_xattrs[key] = value;
14246 + listp += key.length() + 1;
14247 + r -= key.length() + 1;
14253 +void FileRememberXattrs::write(int fd_dest)
14255 + for (std::map<std::string, std::string>::const_iterator it = m_xattrs.begin(); it != m_xattrs.end(); ++it)
14257 + fsetxattr(fd_dest, it->first.c_str(), it->second.c_str(), it->second.size(), 0);
14261 diff --git a/src/FileRememberXattrs.hpp b/src/FileRememberXattrs.hpp
14262 new file mode 100644
14263 index 0000000..3d9fcad
14265 +++ b/src/FileRememberXattrs.hpp
14268 + (C) Copyright Milan Svoboda 2009.
14270 + This file is part of FuseCompress.
14272 + FuseCompress is free software: you can redistribute it and/or modify
14273 + it under the terms of the GNU General Public License as published by
14274 + the Free Software Foundation, either version 2 of the License, or
14275 + (at your option) any later version.
14277 + Foobar is distributed in the hope that it will be useful,
14278 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14279 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14280 + GNU General Public License for more details.
14282 + You should have received a copy of the GNU General Public License
14283 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14286 +#ifndef FILEREMEMBERXATTRS_HPP
14287 +#define FILEREMEMBERXATTRS_HPP
14292 +/** Class that copies all extended file attributes from one file
14293 + * to an another one.
14295 +class FileRememberXattrs
14297 + std::map<std::string, std::string> m_xattrs;
14299 + void read(int fd_source);
14300 + void write(int fd_dest);
14305 diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp
14306 index 380eac1..25142ee 100755
14307 --- a/src/FileUtils.cpp
14308 +++ b/src/FileUtils.cpp
14311 + (C) Copyright Milan Svoboda 2009.
14313 + This file is part of FuseCompress.
14315 + FuseCompress is free software: you can redistribute it and/or modify
14316 + it under the terms of the GNU General Public License as published by
14317 + the Free Software Foundation, either version 2 of the License, or
14318 + (at your option) any later version.
14320 + Foobar is distributed in the hope that it will be useful,
14321 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14322 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14323 + GNU General Public License for more details.
14325 + You should have received a copy of the GNU General Public License
14326 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14329 #include <unistd.h>
14331 #include <sys/types.h>
14332 diff --git a/src/FileUtils.hpp b/src/FileUtils.hpp
14333 index c5494be..6e03296 100755
14334 --- a/src/FileUtils.hpp
14335 +++ b/src/FileUtils.hpp
14339 + (C) Copyright Milan Svoboda 2009.
14341 + This file is part of FuseCompress.
14343 + FuseCompress is free software: you can redistribute it and/or modify
14344 + it under the terms of the GNU General Public License as published by
14345 + the Free Software Foundation, either version 2 of the License, or
14346 + (at your option) any later version.
14348 + Foobar is distributed in the hope that it will be useful,
14349 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14350 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14351 + GNU General Public License for more details.
14353 + You should have received a copy of the GNU General Public License
14354 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14357 +#include <sys/stat.h>
14361 diff --git a/src/FuseCompress.cpp b/src/FuseCompress.cpp
14362 index 6219df2..0d79ee0 100755
14363 --- a/src/FuseCompress.cpp
14364 +++ b/src/FuseCompress.cpp
14366 -#include <assert.h>
14368 + (C) Copyright Milan Svoboda 2009.
14370 + This file is part of FuseCompress.
14372 + FuseCompress is free software: you can redistribute it and/or modify
14373 + it under the terms of the GNU General Public License as published by
14374 + the Free Software Foundation, either version 2 of the License, or
14375 + (at your option) any later version.
14377 + Foobar is distributed in the hope that it will be useful,
14378 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14379 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14380 + GNU General Public License for more details.
14382 + You should have received a copy of the GNU General Public License
14383 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14386 +#include "config.h"
14388 #include <sys/fsuid.h>
14389 #include <dirent.h>
14390 #include <sys/types.h>
14391 #include <string.h>
14396 #include <iostream>
14397 -#include <rlog/rlog.h>
14398 +#if defined(HAVE_ATTR_XATTR_H)
14399 +# include <attr/xattr.h>
14400 +#elif defined(HAVE_SYS_XATTR_H)
14401 +# include <sys/xattr.h>
14404 +#include "rlog/rlog.h"
14405 +#include "assert.h"
14407 #include "FuseCompress.hpp"
14408 #include "FileManager.hpp"
14409 @@ -47,6 +73,10 @@ FuseCompress::FuseCompress()
14410 m_ops.release = FuseCompress::release;
14411 m_ops.fsync = FuseCompress::fsync;
14412 m_ops.statfs = FuseCompress::statfs;
14413 + m_ops.setxattr = FuseCompress::setxattr;
14414 + m_ops.getxattr = FuseCompress::getxattr;
14415 + m_ops.listxattr = FuseCompress::listxattr;
14416 + m_ops.removexattr = FuseCompress::removexattr;
14419 FuseCompress::~FuseCompress()
14420 @@ -656,3 +686,41 @@ int FuseCompress::statfs(const char *name, struct statvfs *buf)
14424 +int FuseCompress::setxattr(const char *path, const char *name, const char *value, size_t size, int flags)
14426 + path = getpath(path);
14428 + if (-1 == ::lsetxattr(path, name, value, size, flags))
14433 +int FuseCompress::getxattr(const char *path, const char *name, char *value, size_t size)
14435 + path = getpath(path);
14438 + if (-1 == (r = ::lgetxattr(path, name, value, size)))
14443 +int FuseCompress::listxattr(const char *path, char *list, size_t size)
14445 + path = getpath(path);
14448 + if (-1 == (r = ::llistxattr(path, list, size)))
14453 +int FuseCompress::removexattr(const char *path, const char *name)
14455 + path = getpath(path);
14457 + if (-1 == ::lremovexattr(path, name))
14462 diff --git a/src/FuseCompress.hpp b/src/FuseCompress.hpp
14463 index ad9f2c6..48a0edf 100755
14464 --- a/src/FuseCompress.hpp
14465 +++ b/src/FuseCompress.hpp
14468 + (C) Copyright Milan Svoboda 2009.
14470 + This file is part of FuseCompress.
14472 + FuseCompress is free software: you can redistribute it and/or modify
14473 + it under the terms of the GNU General Public License as published by
14474 + the Free Software Foundation, either version 2 of the License, or
14475 + (at your option) any later version.
14477 + Foobar is distributed in the hope that it will be useful,
14478 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14479 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14480 + GNU General Public License for more details.
14482 + You should have received a copy of the GNU General Public License
14483 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14486 #ifndef FUSECOMPRESS_H
14487 #define FUSECOMPRESS_H
14489 diff --git a/src/LayerMap.cpp b/src/LayerMap.cpp
14490 index 984dc6d..cf83358 100755
14491 --- a/src/LayerMap.cpp
14492 +++ b/src/LayerMap.cpp
14494 -#include "LayerMap.hpp"
14496 + (C) Copyright Milan Svoboda 2009.
14498 + This file is part of FuseCompress.
14500 + FuseCompress is free software: you can redistribute it and/or modify
14501 + it under the terms of the GNU General Public License as published by
14502 + the Free Software Foundation, either version 2 of the License, or
14503 + (at your option) any later version.
14505 + Foobar is distributed in the hope that it will be useful,
14506 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14507 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14508 + GNU General Public License for more details.
14510 + You should have received a copy of the GNU General Public License
14511 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14514 #include <algorithm>
14515 -#include <cassert>
14517 #include <boost/io/ios_state.hpp>
14518 -#include <rlog/rlog.h>
14520 +#include "rlog/rlog.h"
14522 +#include "LayerMap.hpp"
14524 using namespace std;
14526 @@ -38,7 +57,13 @@ void LayerMap::Put(Block *pBl, bool bKeepLevel)
14527 // Preserve a level if already set.
14531 pBl->level = m_MaxLevel++;
14533 + // Check that m_MaxLevel didn't overrun.
14535 + assert(m_MaxLevel > 0);
14537 con_t::iterator it = m_Map.insert(pBl);
14538 if (m_MaxLength < pBl->length)
14539 m_MaxLength = pBl->length;
14540 diff --git a/src/LayerMap.hpp b/src/LayerMap.hpp
14541 index 1b6a197..6ddaf00 100755
14542 --- a/src/LayerMap.hpp
14543 +++ b/src/LayerMap.hpp
14546 + (C) Copyright Milan Svoboda 2009.
14548 + This file is part of FuseCompress.
14550 + FuseCompress is free software: you can redistribute it and/or modify
14551 + it under the terms of the GNU General Public License as published by
14552 + the Free Software Foundation, either version 2 of the License, or
14553 + (at your option) any later version.
14555 + Foobar is distributed in the hope that it will be useful,
14556 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14557 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14558 + GNU General Public License for more details.
14560 + You should have received a copy of the GNU General Public License
14561 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14567 diff --git a/src/LinearMap.cpp b/src/LinearMap.cpp
14568 index 7a8c96e..6aa0381 100644
14569 --- a/src/LinearMap.cpp
14570 +++ b/src/LinearMap.cpp
14572 -#include "LinearMap.hpp"
14574 + (C) Copyright Milan Svoboda 2009.
14576 + (C) Copyright Milan Svoboda 2009.
14578 + This file is part of FuseCompress.
14580 + FuseCompress is free software: you can redistribute it and/or modify
14581 + it under the terms of the GNU General Public License as published by
14582 + the Free Software Foundation, either version 2 of the License, or
14583 + (at your option) any later version.
14585 + Foobar is distributed in the hope that it will be useful,
14586 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14587 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14588 + GNU General Public License for more details.
14590 + You should have received a copy of the GNU General Public License
14591 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14595 #include <stdlib.h>
14597 -#include <cassert>
14598 -#include <rlog/rlog.h>
14599 +#include "rlog/rlog.h"
14600 +#include "assert.h"
14602 #include <boost/io/ios_state.hpp>
14604 +#include "LinearMap.hpp"
14606 extern size_t g_BufferedMemorySize;
14608 LinearMap::LinearMap()
14609 diff --git a/src/LinearMap.hpp b/src/LinearMap.hpp
14610 index 6a4afb2..deb490e 100644
14611 --- a/src/LinearMap.hpp
14612 +++ b/src/LinearMap.hpp
14615 + This file is part of FuseCompress.
14617 + FuseCompress is free software: you can redistribute it and/or modify
14618 + it under the terms of the GNU General Public License as published by
14619 + the Free Software Foundation, either version 2 of the License, or
14620 + (at your option) any later version.
14622 + Foobar is distributed in the hope that it will be useful,
14623 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14624 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14625 + GNU General Public License for more details.
14627 + You should have received a copy of the GNU General Public License
14628 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14631 #ifndef LinearMap_HPP
14632 #define LinearMap_HPP
14634 diff --git a/src/Lock.hpp b/src/Lock.hpp
14635 index 2097848..2c88ca9 100755
14640 + (C) Copyright Milan Svoboda 2009.
14642 + This file is part of FuseCompress.
14644 + FuseCompress is free software: you can redistribute it and/or modify
14645 + it under the terms of the GNU General Public License as published by
14646 + the Free Software Foundation, either version 2 of the License, or
14647 + (at your option) any later version.
14649 + Foobar is distributed in the hope that it will be useful,
14650 + but WITHOUT ANY WARRANTY; without even the implied warranty of
14651 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14652 + GNU General Public License for more details.
14654 + You should have received a copy of the GNU General Public License
14655 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
14661 diff --git a/src/Makefile.am b/src/Makefile.am
14662 index cd0dbda..0bccb49 100755
14663 --- a/src/Makefile.am
14664 +++ b/src/Makefile.am
14665 @@ -6,6 +6,7 @@ common = \
14667 CompressedMagic.cpp \
14668 FileRememberTimes.cpp \
14669 + FileRememberXattrs.cpp \
14673 @@ -26,13 +27,10 @@ noinst_HEADERS = \
14674 boost/archive/portable_binary_iarchive.hpp \
14675 boost/integer/cover_operators.hpp \
14676 boost/integer/endian.hpp \
14677 - boost/math/fpclassify.hpp \
14678 - boost/math/nonfinite_num_facets.hpp \
14679 - boost/math/signbit.hpp \
14680 - boost/math/detail/fp_traits.hpp \
14681 CompressionType.hpp \
14682 CompressedMagic.hpp \
14683 FileRememberTimes.hpp \
14684 + FileRememberXattrs.hpp \
14688 @@ -71,7 +69,7 @@ dist_man_MANS = fusecompress.1 fusecompress_offline.1
14691 cd $(DESTDIR)$(bindir) && \
14692 - $(LN_S) fusecompress mount.fusecompress
14693 + $(LN_S) -f fusecompress mount.fusecompress
14696 cd $(DESTDIR)$(bindir) && \
14697 diff --git a/src/Makefile.in b/src/Makefile.in
14698 index db99c55..59d2019 100644
14699 --- a/src/Makefile.in
14700 +++ b/src/Makefile.in
14702 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
14703 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
14704 # @configure_input@
14706 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
14707 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
14708 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
14710 # This Makefile.in is free software; the Free Software Foundation
14711 # gives unlimited permission to copy and/or distribute it,
14712 # with or without modifications, as long as this notice is preserved.
14716 pkgdatadir = $(datadir)/@PACKAGE@
14717 -pkglibdir = $(libdir)/@PACKAGE@
14718 pkgincludedir = $(includedir)/@PACKAGE@
14719 +pkglibdir = $(libdir)/@PACKAGE@
14720 +pkglibexecdir = $(libexecdir)/@PACKAGE@
14721 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
14722 install_sh_DATA = $(install_sh) -c -m 644
14723 install_sh_PROGRAM = $(install_sh) -c
14724 @@ -48,15 +50,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
14725 mkinstalldirs = $(install_sh) -d
14726 CONFIG_HEADER = $(top_builddir)/config.h
14727 CONFIG_CLEAN_FILES =
14728 +CONFIG_CLEAN_VPATH_FILES =
14729 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
14730 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
14731 PROGRAMS = $(bin_PROGRAMS)
14732 am__objects_1 = lzma.$(OBJEXT) CompressionType.$(OBJEXT) \
14733 FileHeader.$(OBJEXT) CompressedMagic.$(OBJEXT) \
14734 - FileRememberTimes.$(OBJEXT) FuseCompress.$(OBJEXT) \
14735 - File.$(OBJEXT) FileUtils.$(OBJEXT) Compress.$(OBJEXT) \
14736 - Memory.$(OBJEXT) FileManager.$(OBJEXT) Block.$(OBJEXT) \
14737 - LayerMap.$(OBJEXT) LinearMap.$(OBJEXT)
14738 + FileRememberTimes.$(OBJEXT) FileRememberXattrs.$(OBJEXT) \
14739 + FuseCompress.$(OBJEXT) File.$(OBJEXT) FileUtils.$(OBJEXT) \
14740 + Compress.$(OBJEXT) Memory.$(OBJEXT) FileManager.$(OBJEXT) \
14741 + Block.$(OBJEXT) LayerMap.$(OBJEXT) LinearMap.$(OBJEXT)
14742 am_fusecompress_OBJECTS = $(am__objects_1) main.$(OBJEXT)
14743 fusecompress_OBJECTS = $(am_fusecompress_OBJECTS)
14744 am__DEPENDENCIES_1 =
14745 @@ -73,6 +75,7 @@ fusecompress_offline_DEPENDENCIES = $(am__DEPENDENCIES_1) \
14746 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
14747 depcomp = $(SHELL) $(top_srcdir)/depcomp
14748 am__depfiles_maybe = depfiles
14750 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
14751 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
14753 @@ -80,6 +83,27 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
14755 SOURCES = $(fusecompress_SOURCES) $(fusecompress_offline_SOURCES)
14756 DIST_SOURCES = $(fusecompress_SOURCES) $(fusecompress_offline_SOURCES)
14757 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
14758 +am__vpath_adj = case $$p in \
14759 + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
14762 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
14763 +am__install_max = 40
14764 +am__nobase_strip_setup = \
14765 + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
14766 +am__nobase_strip = \
14767 + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
14768 +am__nobase_list = $(am__nobase_strip_setup); \
14769 + for p in $$list; do echo "$$p $$p"; done | \
14770 + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
14771 + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
14772 + if (++n[$$2] == $(am__install_max)) \
14773 + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
14774 + END { for (dir in files) print dir, files[dir] }'
14776 + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
14777 + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
14778 man1dir = $(mandir)/man1
14780 MANS = $(dist_man_MANS)
14781 @@ -138,6 +162,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
14782 PACKAGE_NAME = @PACKAGE_NAME@
14783 PACKAGE_STRING = @PACKAGE_STRING@
14784 PACKAGE_TARNAME = @PACKAGE_TARNAME@
14785 +PACKAGE_URL = @PACKAGE_URL@
14786 PACKAGE_VERSION = @PACKAGE_VERSION@
14787 PATH_SEPARATOR = @PATH_SEPARATOR@
14788 PKG_CONFIG = @PKG_CONFIG@
14789 @@ -199,6 +224,7 @@ common = \
14791 CompressedMagic.cpp \
14792 FileRememberTimes.cpp \
14793 + FileRememberXattrs.cpp \
14797 @@ -226,6 +252,7 @@ noinst_HEADERS = \
14798 CompressionType.hpp \
14799 CompressedMagic.hpp \
14800 FileRememberTimes.hpp \
14801 + FileRememberXattrs.hpp \
14805 @@ -266,14 +293,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
14806 @for dep in $?; do \
14807 case '$(am__configure_deps)' in \
14809 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
14811 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
14812 + && { if test -f $@; then exit 0; else break; fi; }; \
14816 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
14817 - cd $(top_srcdir) && \
14818 - $(AUTOMAKE) --foreign src/Makefile
14819 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
14820 + $(am__cd) $(top_srcdir) && \
14821 + $(AUTOMAKE) --foreign src/Makefile
14822 .PRECIOUS: Makefile
14823 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14825 @@ -291,26 +318,41 @@ $(top_srcdir)/configure: $(am__configure_deps)
14826 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14827 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
14828 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
14829 +$(am__aclocal_m4_deps):
14830 install-binPROGRAMS: $(bin_PROGRAMS)
14832 test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
14833 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
14834 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
14837 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
14838 - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
14839 - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
14842 + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
14843 + for p in $$list; do echo "$$p $$p"; done | \
14844 + sed 's/$(EXEEXT)$$//' | \
14845 + while read p p1; do if test -f $$p; \
14846 + then echo "$$p"; echo "$$p"; else :; fi; \
14848 + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
14849 + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
14850 + sed 'N;N;N;s,\n, ,g' | \
14851 + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
14852 + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
14853 + if ($$2 == $$4) files[d] = files[d] " " $$1; \
14854 + else { print "f", $$3 "/" $$4, $$1; } } \
14855 + END { for (d in files) print "f", d, files[d] }' | \
14856 + while read type dir files; do \
14857 + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
14858 + test -z "$$files" || { \
14859 + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
14860 + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
14864 uninstall-binPROGRAMS:
14865 @$(NORMAL_UNINSTALL)
14866 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
14867 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
14868 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
14869 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
14871 + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
14872 + files=`for p in $$list; do echo "$$p"; done | \
14873 + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
14874 + -e 's/$$/$(EXEEXT)/' `; \
14875 + test -n "$$list" || exit 0; \
14876 + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
14877 + cd "$(DESTDIR)$(bindir)" && rm -f $$files
14880 -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
14881 @@ -335,6 +377,7 @@ distclean-compile:
14882 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileHeader.Po@am__quote@
14883 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileManager.Po@am__quote@
14884 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileRememberTimes.Po@am__quote@
14885 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileRememberXattrs.Po@am__quote@
14886 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileUtils.Po@am__quote@
14887 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuseCompress.Po@am__quote@
14888 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LayerMap.Po@am__quote@
14889 @@ -346,90 +389,83 @@ distclean-compile:
14892 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
14893 -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
14894 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
14895 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
14896 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
14897 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
14900 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
14901 -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
14902 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
14903 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
14904 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
14905 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
14907 lzma.o: boost/iostreams/filter/lzma.cpp
14908 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lzma.o -MD -MP -MF $(DEPDIR)/lzma.Tpo -c -o lzma.o `test -f 'boost/iostreams/filter/lzma.cpp' || echo '$(srcdir)/'`boost/iostreams/filter/lzma.cpp
14909 -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/lzma.Tpo $(DEPDIR)/lzma.Po
14910 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/lzma.Tpo $(DEPDIR)/lzma.Po
14911 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='boost/iostreams/filter/lzma.cpp' object='lzma.o' libtool=no @AMDEPBACKSLASH@
14912 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
14913 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lzma.o `test -f 'boost/iostreams/filter/lzma.cpp' || echo '$(srcdir)/'`boost/iostreams/filter/lzma.cpp
14915 lzma.obj: boost/iostreams/filter/lzma.cpp
14916 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lzma.obj -MD -MP -MF $(DEPDIR)/lzma.Tpo -c -o lzma.obj `if test -f 'boost/iostreams/filter/lzma.cpp'; then $(CYGPATH_W) 'boost/iostreams/filter/lzma.cpp'; else $(CYGPATH_W) '$(srcdir)/boost/iostreams/filter/lzma.cpp'; fi`
14917 -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/lzma.Tpo $(DEPDIR)/lzma.Po
14918 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/lzma.Tpo $(DEPDIR)/lzma.Po
14919 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='boost/iostreams/filter/lzma.cpp' object='lzma.obj' libtool=no @AMDEPBACKSLASH@
14920 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
14921 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lzma.obj `if test -f 'boost/iostreams/filter/lzma.cpp'; then $(CYGPATH_W) 'boost/iostreams/filter/lzma.cpp'; else $(CYGPATH_W) '$(srcdir)/boost/iostreams/filter/lzma.cpp'; fi`
14922 -install-man1: $(man1_MANS) $(man_MANS)
14923 +install-man1: $(dist_man_MANS)
14925 test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
14926 - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
14927 - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
14928 - for i in $$l2; do \
14930 - *.1*) list="$$list $$i" ;; \
14932 + @list=''; test -n "$(man1dir)" || exit 0; \
14933 + { for i in $$list; do echo "$$i"; done; \
14934 + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
14935 + sed -n '/\.1[a-z]*$$/p'; \
14936 + } | while read p; do \
14937 + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
14938 + echo "$$d$$p"; echo "$$p"; \
14940 + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
14941 + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
14942 + sed 'N;N;s,\n, ,g' | { \
14943 + list=; while read file base inst; do \
14944 + if test "$$base" = "$$inst"; then list="$$list $$file"; else \
14945 + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
14946 + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
14949 - for i in $$list; do \
14950 - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
14951 - else file=$$i; fi; \
14952 - ext=`echo $$i | sed -e 's/^.*\\.//'`; \
14953 - case "$$ext" in \
14957 - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
14958 - inst=`echo $$inst | sed -e 's/^.*\///'`; \
14959 - inst=`echo $$inst | sed '$(transform)'`.$$ext; \
14960 - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
14961 - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
14963 + for i in $$list; do echo "$$i"; done | $(am__base_list) | \
14964 + while read files; do \
14965 + test -z "$$files" || { \
14966 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
14967 + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
14971 @$(NORMAL_UNINSTALL)
14972 - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
14973 - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
14974 - for i in $$l2; do \
14976 - *.1*) list="$$list $$i" ;; \
14979 - for i in $$list; do \
14980 - ext=`echo $$i | sed -e 's/^.*\\.//'`; \
14981 - case "$$ext" in \
14985 - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
14986 - inst=`echo $$inst | sed -e 's/^.*\///'`; \
14987 - inst=`echo $$inst | sed '$(transform)'`.$$ext; \
14988 - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
14989 - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
14991 + @list=''; test -n "$(man1dir)" || exit 0; \
14992 + files=`{ for i in $$list; do echo "$$i"; done; \
14993 + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
14994 + sed -n '/\.1[a-z]*$$/p'; \
14995 + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
14996 + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
14997 + test -z "$$files" || { \
14998 + echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
14999 + cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
15001 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
15002 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
15003 unique=`for i in $$list; do \
15004 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
15006 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
15007 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
15008 END { if (nonempty) { for (i in files) print i; }; }'`; \
15012 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
15013 $(TAGS_FILES) $(LISP)
15017 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
15018 unique=`for i in $$list; do \
15019 @@ -437,34 +473,52 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
15021 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
15022 END { if (nonempty) { for (i in files) print i; }; }'`; \
15023 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
15025 + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
15026 test -n "$$unique" || unique=$$empty_fix; \
15027 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
15028 - $$tags $$unique; \
15029 + if test $$# -gt 0; then \
15030 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
15031 + "$$@" $$unique; \
15033 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
15038 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
15039 $(TAGS_FILES) $(LISP)
15041 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
15042 unique=`for i in $$list; do \
15043 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
15045 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
15046 END { if (nonempty) { for (i in files) print i; }; }'`; \
15047 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
15048 + test -z "$(CTAGS_ARGS)$$unique" \
15049 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
15054 here=`$(am__cd) $(top_builddir) && pwd` \
15055 - && cd $(top_srcdir) \
15056 - && gtags -i $(GTAGS_ARGS) $$here
15057 + && $(am__cd) $(top_srcdir) \
15058 + && gtags -i $(GTAGS_ARGS) "$$here"
15061 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
15063 distdir: $(DISTFILES)
15064 + @list='$(MANS)'; if test -n "$$list"; then \
15065 + list=`for p in $$list; do \
15066 + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
15067 + if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
15068 + if test -n "$$list" && \
15069 + grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
15070 + echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
15071 + grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
15072 + echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
15073 + echo " typically \`make maintainer-clean' will remove them" >&2; \
15077 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
15078 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
15079 list='$(DISTFILES)'; \
15080 @@ -480,13 +534,17 @@ distdir: $(DISTFILES)
15081 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
15082 if test -d $$d/$$file; then \
15083 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
15084 + if test -d "$(distdir)/$$file"; then \
15085 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15087 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
15088 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
15089 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
15090 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
15092 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
15093 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
15095 - test -f $(distdir)/$$file \
15096 - || cp -p $$d/$$file $(distdir)/$$file \
15097 + test -f "$(distdir)/$$file" \
15098 + || cp -p $$d/$$file "$(distdir)/$$file" \
15102 @@ -517,6 +575,7 @@ clean-generic:
15105 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
15106 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
15108 maintainer-clean-generic:
15109 @echo "This command is intended for maintainers to use"
15110 @@ -537,6 +596,8 @@ dvi-am:
15119 @@ -545,20 +606,29 @@ install-data-am: install-man
15121 install-dvi: install-dvi-am
15125 install-exec-am: install-binPROGRAMS
15127 $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
15129 install-html: install-html-am
15133 install-info: install-info-am
15137 install-man: install-man1
15139 install-pdf: install-pdf-am
15143 install-ps: install-ps-am
15149 maintainer-clean: maintainer-clean-am
15150 @@ -581,7 +651,6 @@ ps-am:
15151 uninstall-am: uninstall-binPROGRAMS uninstall-man
15153 $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
15155 uninstall-man: uninstall-man1
15157 .MAKE: install-am install-exec-am install-strip uninstall-am
15158 @@ -603,11 +672,12 @@ uninstall-man: uninstall-man1
15161 cd $(DESTDIR)$(bindir) && \
15162 - $(LN_S) fusecompress mount.fusecompress
15163 + $(LN_S) -f fusecompress mount.fusecompress
15166 cd $(DESTDIR)$(bindir) && \
15167 rm mount.fusecompress
15169 # Tell versions [3.59,3.63) of GNU make to not export all variables.
15170 # Otherwise a system limit (for SysV at least) may be exceeded.
15172 diff --git a/src/Memory.cpp b/src/Memory.cpp
15173 index f711673..7daafef 100755
15174 --- a/src/Memory.cpp
15175 +++ b/src/Memory.cpp
15178 + (C) Copyright Milan Svoboda 2009.
15180 + This file is part of FuseCompress.
15182 + FuseCompress is free software: you can redistribute it and/or modify
15183 + it under the terms of the GNU General Public License as published by
15184 + the Free Software Foundation, either version 2 of the License, or
15185 + (at your option) any later version.
15187 + Foobar is distributed in the hope that it will be useful,
15188 + but WITHOUT ANY WARRANTY; without even the implied warranty of
15189 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15190 + GNU General Public License for more details.
15192 + You should have received a copy of the GNU General Public License
15193 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
15196 #include <algorithm>
15197 #include <iostream>
15199 -#include <rlog/rlog.h>
15203 -#include <assert.h>
15204 #include <signal.h>
15205 #include <sys/types.h>
15206 #include <sys/mman.h>
15207 #include <sys/stat.h>
15210 +#include "rlog/rlog.h"
15211 +#include "assert.h"
15213 #include "FileUtils.hpp"
15214 #include "Memory.hpp"
15215 #include "LinearMap.hpp"
15216 diff --git a/src/Memory.hpp b/src/Memory.hpp
15217 index f8838f7..bfe1ce4 100755
15218 --- a/src/Memory.hpp
15219 +++ b/src/Memory.hpp
15222 + (C) Copyright Milan Svoboda 2009.
15224 + This file is part of FuseCompress.
15226 + FuseCompress is free software: you can redistribute it and/or modify
15227 + it under the terms of the GNU General Public License as published by
15228 + the Free Software Foundation, either version 2 of the License, or
15229 + (at your option) any later version.
15231 + Foobar is distributed in the hope that it will be useful,
15232 + but WITHOUT ANY WARRANTY; without even the implied warranty of
15233 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15234 + GNU General Public License for more details.
15236 + You should have received a copy of the GNU General Public License
15237 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
15243 diff --git a/src/Mutex.hpp b/src/Mutex.hpp
15244 index 4e32c87..fe46160 100755
15245 --- a/src/Mutex.hpp
15246 +++ b/src/Mutex.hpp
15249 + (C) Copyright Milan Svoboda 2009.
15251 + This file is part of FuseCompress.
15253 + FuseCompress is free software: you can redistribute it and/or modify
15254 + it under the terms of the GNU General Public License as published by
15255 + the Free Software Foundation, either version 2 of the License, or
15256 + (at your option) any later version.
15258 + Foobar is distributed in the hope that it will be useful,
15259 + but WITHOUT ANY WARRANTY; without even the implied warranty of
15260 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15261 + GNU General Public License for more details.
15263 + You should have received a copy of the GNU General Public License
15264 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
15270 #include <pthread.h>
15271 #include <signal.h>
15272 #include <string.h>
15273 -#include <rlog/rlog.h>
15275 +#include "rlog/rlog.h"
15279 diff --git a/src/assert.h b/src/assert.h
15280 index a1c0b93..550b367 100644
15285 + (C) Copyright Milan Svoboda 2009.
15287 + This file is part of FuseCompress.
15289 + FuseCompress is free software: you can redistribute it and/or modify
15290 + it under the terms of the GNU General Public License as published by
15291 + the Free Software Foundation, either version 2 of the License, or
15292 + (at your option) any later version.
15294 + Foobar is distributed in the hope that it will be useful,
15295 + but WITHOUT ANY WARRANTY; without even the implied warranty of
15296 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15297 + GNU General Public License for more details.
15299 + You should have received a copy of the GNU General Public License
15300 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
15306 -#include <rlog/rlog.h>
15307 #include <stdlib.h>
15308 +#include "rlog/rlog.h"
15310 #define assert(eval) \
15312 diff --git a/src/boost/archive/portable_binary_iarchive.hpp b/src/boost/archive/portable_binary_iarchive.hpp
15313 index a3c5a90..37aabf9 100644
15314 --- a/src/boost/archive/portable_binary_iarchive.hpp
15315 +++ b/src/boost/archive/portable_binary_iarchive.hpp
15319 #include <boost/integer/endian.hpp>
\r
15320 -#include <boost/math/fpclassify.hpp>
\r
15321 +#include <boost/math/special_functions/fpclassify.hpp>
\r
15322 #include <boost/utility/enable_if.hpp>
\r
15323 #include <boost/lexical_cast.hpp>
\r
15325 @@ -239,7 +239,13 @@ public:
15328 #include <boost/archive/impl/basic_binary_iarchive.ipp>
\r
15330 +#if BOOST_VERSION < 104000
\r
15331 #include <boost/archive/impl/archive_pointer_iserializer.ipp>
\r
15333 +#include <boost/archive/impl/archive_serializer_map.ipp>
\r
15336 #include <boost/archive/impl/basic_binary_iprimitive.ipp>
\r
15338 namespace boost {
\r
15339 @@ -266,7 +272,11 @@ template class binary_iarchive_impl<
15343 +#if BOOST_VERSION < 104000
\r
15344 template class detail::archive_pointer_iserializer<portable_binary_iarchive> ;
\r
15346 +template class detail::archive_serializer_map<portable_binary_iarchive> ;
\r
15349 } // namespace archive
\r
15350 } // namespace boost
\r
15351 diff --git a/src/boost/archive/portable_binary_oarchive.hpp b/src/boost/archive/portable_binary_oarchive.hpp
15352 index 7586474..fd2a270 100644
15353 --- a/src/boost/archive/portable_binary_oarchive.hpp
15354 +++ b/src/boost/archive/portable_binary_oarchive.hpp
15358 #include <boost/integer/endian.hpp>
\r
15359 -#include <boost/math/fpclassify.hpp>
\r
15360 +#include <boost/math/special_functions/fpclassify.hpp>
\r
15361 #include <boost/utility/enable_if.hpp>
\r
15363 #include <boost/type_traits/is_unsigned.hpp>
\r
15364 @@ -229,7 +229,12 @@ public:
15367 #include <boost/archive/impl/basic_binary_oarchive.ipp>
\r
15369 +#if BOOST_VERSION < 104000
\r
15370 #include <boost/archive/impl/archive_pointer_oserializer.ipp>
\r
15371 +// archive_serializer_map will get included in portable_binary_iarchive.hpp
\r
15374 #include <boost/archive/impl/basic_binary_oprimitive.ipp>
\r
15376 namespace boost {
\r
15377 @@ -254,7 +259,11 @@ template class binary_oarchive_impl<
15378 , std::ostream::traits_type
\r
15382 +#if BOOST_VERSION < 104000
\r
15383 template class detail::archive_pointer_oserializer<portable_binary_oarchive> ;
\r
15384 +// defined in portable_binary_iarchive.hpp
\r
15387 } // namespace archive
\r
15388 } // namespace boost
\r
15389 diff --git a/src/boost/integer/endian.hpp b/src/boost/integer/endian.hpp
15390 index 29c8f99..c9b5b09 100755
15391 --- a/src/boost/integer/endian.hpp
15392 +++ b/src/boost/integer/endian.hpp
15393 @@ -211,7 +211,7 @@ namespace boost
15395 #ifdef BOOST_BIG_ENDIAN
\r
15396 endian(T val) : integer(val) { }
\r
15397 - endian & operator=(T val) { integer = val); return *this; }
\r
15398 + endian & operator=(T val) { integer = val; return *this; }
\r
15399 operator T() const { return integer; }
\r
15401 endian(T val) { detail::store_big_endian<T, sizeof(T)>(&integer, val); }
\r
15402 diff --git a/src/boost/iostreams/device/nonclosable_file_descriptor.hpp b/src/boost/iostreams/device/nonclosable_file_descriptor.hpp
15403 index 948b691..0b3147e 100644
15404 --- a/src/boost/iostreams/device/nonclosable_file_descriptor.hpp
15405 +++ b/src/boost/iostreams/device/nonclosable_file_descriptor.hpp
15407 +// (C) Copyright Milan Svoboda 2009.
15408 +// Distributed under the Boost Software License, Version 1.0. (See accompanying
15409 +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.)
15411 +// See http://www.boost.org/libs/iostreams for documentation.
15413 #ifndef NONCLOSABLE_FILE_DESCRIPTOR_HPP
15414 #define NONCLOSABLE_FILE_DESCRIPTOR_HPP
15416 #include <boost/iostreams/device/file_descriptor.hpp>
15417 +#include <boost/version.hpp>
15419 namespace boost { namespace iostreams {
15421 +#if BOOST_VERSION < 104400
15422 +static const bool never_close_handle = false;
15425 class BOOST_IOSTREAMS_DECL nonclosable_file_descriptor : public file_descriptor {
15428 @@ -13,19 +24,17 @@ public:
15430 nonclosable_file_descriptor() : file_descriptor() { }
15431 explicit nonclosable_file_descriptor(int fd)
15432 - : file_descriptor(fd, false)
15433 + : file_descriptor(fd, boost::iostreams::never_close_handle)
15435 #ifdef BOOST_IOSTREAMS_WINDOWS
15436 explicit nonclosable_file_descriptor(handle_type handle)
15437 - : file_descriptor(handle, false)
15438 + : file_descriptor(handle, boost::iostreams::never_close_handle)
15441 explicit nonclosable_file_descriptor( const std::string& path,
15442 BOOST_IOS::openmode mode =
15443 - BOOST_IOS::in | BOOST_IOS::out,
15444 - BOOST_IOS::openmode base_mode =
15445 BOOST_IOS::in | BOOST_IOS::out )
15446 - : file_descriptor(path, mode, base_mode) {}
15447 + : file_descriptor(path, mode) {}
15451 diff --git a/src/boost/iostreams/filter/bytescounter.hpp b/src/boost/iostreams/filter/bytescounter.hpp
15452 index fc25237..e2c9321 100644
15453 --- a/src/boost/iostreams/filter/bytescounter.hpp
15454 +++ b/src/boost/iostreams/filter/bytescounter.hpp
15456 +// (C) Copyright Milan Svoboda 2009.
15457 +// Distributed under the Boost Software License, Version 1.0. (See accompanying
15458 +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.)
15460 +// See http://www.boost.org/libs/iostreams for documentation.
15462 #ifndef BOOST_IOSTREAMS_BYTESCOUNTER_HPP_INCLUDED
15463 #define BOOST_IOSTREAMS_BYTESCOUNTER_HPP_INCLUDED
15465 diff --git a/src/boost/iostreams/filter/lzma.cpp b/src/boost/iostreams/filter/lzma.cpp
15466 index 59296e9..6e35ab3 100644
15467 --- a/src/boost/iostreams/filter/lzma.cpp
15468 +++ b/src/boost/iostreams/filter/lzma.cpp
15469 @@ -28,10 +28,10 @@ namespace lzma {
15471 // Compression levels
15473 -const lzma_easy_level no_compression = LZMA_EASY_COPY;
15474 -const lzma_easy_level best_speed = LZMA_EASY_LZMA2_1;
15475 -const lzma_easy_level best_compression = LZMA_EASY_LZMA_9;
15476 -const lzma_easy_level default_compression = LZMA_EASY_LZMA_7;
15477 +const uint32_t no_compression = 0;
15478 +const uint32_t best_speed = 1;
15479 +const uint32_t best_compression = 9;
15480 +const uint32_t default_compression = 2;
15484 @@ -39,7 +39,7 @@ const int okay = LZMA_OK;
15485 const int stream_end = LZMA_STREAM_END;
15486 const int unsupported_check = LZMA_UNSUPPORTED_CHECK;
15487 const int mem_error = LZMA_MEM_ERROR;
15488 -const int header_error = LZMA_HEADER_ERROR;
15489 +const int options_error = LZMA_OPTIONS_ERROR;
15490 const int data_error = LZMA_DATA_ERROR;
15491 const int buf_error = LZMA_BUF_ERROR;
15492 const int prog_error = LZMA_PROG_ERROR;
15493 @@ -135,7 +135,7 @@ void lzma_base::do_init
15497 - lzma_easy_encoder(s, p.level) :
15498 + lzma_easy_encoder(s, p.level, LZMA_CHECK_CRC32) :
15499 lzma_stream_decoder(s, 100 * 1024 * 1024, 0 )
15502 diff --git a/src/boost/iostreams/filter/lzma.hpp b/src/boost/iostreams/filter/lzma.hpp
15503 index 83f8c9f..7dfd368 100644
15504 --- a/src/boost/iostreams/filter/lzma.hpp
15505 +++ b/src/boost/iostreams/filter/lzma.hpp
15506 @@ -47,10 +47,10 @@ typedef void (*free_func)(void*, void*);
15508 // Compression levels
15510 -BOOST_IOSTREAMS_DECL extern const lzma_easy_level no_compression;
15511 -BOOST_IOSTREAMS_DECL extern const lzma_easy_level best_speed;
15512 -BOOST_IOSTREAMS_DECL extern const lzma_easy_level best_compression;
15513 -BOOST_IOSTREAMS_DECL extern const lzma_easy_level default_compression;
15514 +BOOST_IOSTREAMS_DECL extern const uint32_t no_compression;
15515 +BOOST_IOSTREAMS_DECL extern const uint32_t best_speed;
15516 +BOOST_IOSTREAMS_DECL extern const uint32_t best_compression;
15517 +BOOST_IOSTREAMS_DECL extern const uint32_t default_compression;
15521 @@ -58,7 +58,7 @@ BOOST_IOSTREAMS_DECL extern const int okay;
15522 BOOST_IOSTREAMS_DECL extern const int stream_end;
15523 BOOST_IOSTREAMS_DECL extern const int unsupported_check;
15524 BOOST_IOSTREAMS_DECL extern const int mem_error;
15525 -BOOST_IOSTREAMS_DECL extern const int header_error;
15526 +BOOST_IOSTREAMS_DECL extern const int options_error;
15527 BOOST_IOSTREAMS_DECL extern const int data_error;
15528 BOOST_IOSTREAMS_DECL extern const int buf_error;
15529 BOOST_IOSTREAMS_DECL extern const int prog_error;
15530 @@ -88,10 +88,10 @@ const int null = 0;
15531 struct lzma_params {
15533 // Non-explicit constructor.
15534 - lzma_params( lzma_easy_level level = lzma::default_compression )
15535 + lzma_params( uint32_t level = lzma::default_compression )
15538 - lzma_easy_level level;
15543 diff --git a/src/boost/iostreams/filter/lzo.hpp b/src/boost/iostreams/filter/lzo.hpp
15544 index 7dbd07d..50cf2fb 100644
15545 --- a/src/boost/iostreams/filter/lzo.hpp
15546 +++ b/src/boost/iostreams/filter/lzo.hpp
15548 +// (C) Copyright Milan Svoboda 2009.
15549 +// Distributed under the Boost Software License, Version 1.0. (See accompanying
15550 +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.)
15552 +// See http://www.boost.org/libs/iostreams for documentation.
15554 #ifndef LZO_FILTER_HPP
15555 #define LZO_FILTER_HPP
15557 @@ -37,11 +43,7 @@ class basic_lzo_compressor : public boost::iostreams::aggregate_filter<Ch, Alloc
15558 lzo_uint len = src.size() + src.size() / 16 + 64 + 3;
15560 HEAP_ALLOC(wrkmem, LZO1X_1_MEM_COMPRESS);
15563 - tmp.reserve(len);
15564 - for (unsigned int i = 0; i < tmp.capacity(); ++i)
15565 - tmp.push_back(0);
15566 + vector_type tmp(len);
15568 lzo1x_1_compress((lzo_bytep) &src[0], src.size(),
15569 (lzo_bytep) &tmp[0], &len, wrkmem);
15570 @@ -87,29 +89,26 @@ class basic_lzo_decompressor : public boost::iostreams::aggregate_filter<Ch, All
15571 void do_filter(const vector_type& src, vector_type& dest)
15574 - lzo_uint srcSize = src.size();
15576 + int compressionFactor = 10;
15580 - len = srcSize * 10;
15581 + len = src.size() * compressionFactor;
15582 + tmp.assign(len, 0);
15584 - tmp.reserve(len);
15585 - for (unsigned int i = 0; i < tmp.capacity(); ++i)
15586 - tmp.push_back(0);
15589 - if ((ret = lzo1x_decompress_safe((lzo_bytep) &src[0], src.size(),
15590 - (lzo_bytep) &tmp[0], &len, NULL)) == LZO_E_OUTPUT_OVERRUN) {
15593 + if (lzo1x_decompress_safe((lzo_bytep) &src[0], src.size(),
15594 + (lzo_bytep) &tmp[0], &len, NULL) == LZO_E_OUTPUT_OVERRUN)
15596 + compressionFactor *= 2;
15602 + dest.assign(len, 0);
15603 for (unsigned int i = 0; i < len; ++i)
15604 - dest.push_back(tmp[i]);
15605 + dest[i] = tmp[i];
15609 diff --git a/src/boost/iostreams/filter/xor.hpp b/src/boost/iostreams/filter/xor.hpp
15610 index ad2bd7a..3c3fbf1 100644
15611 --- a/src/boost/iostreams/filter/xor.hpp
15612 +++ b/src/boost/iostreams/filter/xor.hpp
15614 +// (C) Copyright Milan Svoboda 2009.
15615 +// Distributed under the Boost Software License, Version 1.0. (See accompanying
15616 +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.)
15618 +// See http://www.boost.org/libs/iostreams for documentation.
15620 #ifndef XOR_FILTER_HPP
15621 #define XOR_FILTER_HPP
15623 diff --git a/src/fusecompress.1 b/src/fusecompress.1
15624 index 614a8b6..4f430d2 100755
15625 --- a/src/fusecompress.1
15626 +++ b/src/fusecompress.1
15629 .de Vb \" Begin verbatim text
15632 @@ -28,7 +27,7 @@ Storage directory is /tmp/fc and mount point is /mnt/fc in all following example
15634 o Unmount directory
15636 - fusermount -u /mnt/fc
15637 + fusermount \-u /mnt/fc
15639 .B Tips and tricks:
15641 @@ -37,8 +36,8 @@ Storage directory is /tmp/fc and mount point is /mnt/fc in all following example
15642 o Run this command in the mountPoint directory when mounted with FuseCompress:
15646 - du -sh --apparent-size
15647 + du \-sh # actual size on disk
15648 + du \-sh \-\-apparent-size # actual size of files
15651 .B File and magic utilities:
15652 @@ -60,7 +59,7 @@ Prints version.
15653 .B \-o, \-\-options
15656 -set compression method (lzo/bzip2/zlib/lzma/none) (default:zlib)
15657 +set compression method (lzo/bzip2/zlib/lzma) (default:zlib)
15660 set size of the blocks in kilobytes (default:100)
15661 diff --git a/src/fusecompress_offline.1 b/src/fusecompress_offline.1
15662 index 06fad0b..2adb914 100755
15663 --- a/src/fusecompress_offline.1
15664 +++ b/src/fusecompress_offline.1
15666 fusecompress_offline \- decompress or compress data without need to mount the compressed virtual filesystem
15668 .B fusecompress_offline
15669 -[-h] [-v] [-c TYPE] [-b SIZE] targetDir
15670 +[\-h] [\-v] [\-o OPTIONS] path
15672 -fusecompress_offline decompress or compress data without need to mount the compressed virtual filesystem. It works like the tar or zip.
15674 -If compression method is set the data will be compressed by required compression method. Files already compressed by a different compression method are recompressed to required compression method. Files already compressed by the required compression method are left untouched.
15675 +If compression method is set the data will be compressed by required compression method. Files already compressed by a different compression method are recompressed to the required compression method. Files already compressed by the required compression method are left untouched.
15676 +If compression method is not set (using -o fc_c) then file(s) are decompressed.
15678 -targetDir may be a single file or a directory. In the latter case the directory will be processed recursively and all found files are processed.
15679 +Path may be directory or file. Directories are processed recursively.
15681 +This allows you to, among other things, "compress" an existing folder (ex:)
15682 +$ fusecompress_offline -o fc_c:lzma formerly_uncompressed_folder
15684 +and to "decompress" an existing compressed folder (ex:)
15686 +$ fusecompress_offline compressed_folder
15690 @@ -22,7 +29,7 @@ Prints version.
15691 .B \-o, \-\-options
15694 -set compression method (lzo/bzip2/zlib/lzma/none) (default:zlib)
15695 +set compression method (lzo/bzip2/zlib/lzma) (default:zlib)
15698 set size of the blocks in kilobytes (default:100)
15699 @@ -36,7 +43,7 @@ files with passed mime types to be always not compressed
15700 .B fc_mr:"arg1;arg2"
15701 files with passed mime types to be always compressed
15703 -Lzo is the fastest, bzip2 has high compression ratio, but it is the slowest, zlib is somewhere between them in terms of speed and compression ratio and lzma has highest compression ratio, it's compression speed is better than bzip2 and decompression is fast. The none compression method is there for testing only as it doesn't compress data, it copies the data without any modification (fusecompress' header is added).
15704 +Lzo is the fastest, bzip2 has high compression ratio, but it is the slowest, zlib is somewhere between them in terms of speed and compression ratio and lzma has highest compression ratio, it's compression speed is better than bzip2 and decompression is fast.
15706 Block size influences compression ratio. Bigger block size allows better compression ratio, but random access to data will be slower and memory requirements will be bigger.
15708 diff --git a/src/main.cpp b/src/main.cpp
15709 index d27b028..9ecdf9c 100755
15714 + (C) Copyright Milan Svoboda 2009.
15716 + This file is part of FuseCompress.
15718 + FuseCompress is free software: you can redistribute it and/or modify
15719 + it under the terms of the GNU General Public License as published by
15720 + the Free Software Foundation, either version 2 of the License, or
15721 + (at your option) any later version.
15723 + Foobar is distributed in the hope that it will be useful,
15724 + but WITHOUT ANY WARRANTY; without even the implied warranty of
15725 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15726 + GNU General Public License for more details.
15728 + You should have received a copy of the GNU General Public License
15729 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
15732 #include "config.h"
15739 -#include <rlog/rlog.h>
15740 +#include "rlog/rlog.h"
15742 using namespace std;
15744 @@ -71,10 +90,10 @@ int main(int argc, char **argv)
15745 po::options_description desc("Usage: " PACKAGE " [options] dir_lower dir_mount\n" "\nAllowed options");
15747 ("options,o", po::value<string>(&commandLineOptions),
15748 - "fc_c:arg - set compression method\n"
15749 - " (lzo/bzip2/zlib/lzma/none)\n"
15750 + "fc_c:arg - compression method\n"
15751 + " (lzo/bzip2/zlib/lzma)\n"
15752 " (default: zlib)\n"
15753 - "fc_b:arg - set size of blocks in kilobytes\n"
15754 + "fc_b:arg - size of blocks in kilobytes\n"
15755 " (default: 100)\n"
15756 "fc_d - run in debug mode\n"
15757 "fc_ma:\"arg1;arg2\" - files with passed mime types to be\n"
15758 diff --git a/src/main_offline.cpp b/src/main_offline.cpp
15759 index ed60150..a88c660 100755
15760 --- a/src/main_offline.cpp
15761 +++ b/src/main_offline.cpp
15764 + (C) Copyright Milan Svoboda 2009.
15766 + This file is part of FuseCompress.
15768 + FuseCompress is free software: you can redistribute it and/or modify
15769 + it under the terms of the GNU General Public License as published by
15770 + the Free Software Foundation, either version 2 of the License, or
15771 + (at your option) any later version.
15773 + Foobar is distributed in the hope that it will be useful,
15774 + but WITHOUT ANY WARRANTY; without even the implied warranty of
15775 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15776 + GNU General Public License for more details.
15778 + You should have received a copy of the GNU General Public License
15779 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
15782 #include "config.h"
15784 #include <sys/types.h>
15785 @@ -11,11 +30,12 @@
15787 #include <limits.h>
15789 -#include <rlog/rlog.h>
15790 +#include "rlog/rlog.h"
15792 #include "Compress.hpp"
15793 #include "CompressedMagic.hpp"
15794 #include "CompressionType.hpp"
15795 +#include "FileRememberXattrs.hpp"
15797 #include <boost/scoped_array.hpp>
15798 #include <boost/algorithm/string.hpp>
15803 -using namespace std;
15805 namespace po = boost::program_options;
15806 namespace fs = boost::filesystem;
15808 @@ -160,7 +178,11 @@ bool copy(const char *i, const char *o, const struct stat *i_st, const struct st
15812 - std::cout << std::endl;
15813 + // Remember extended attributes.
15815 + FileRememberXattrs xattrs;
15816 + xattrs.read(i_fd);
15817 + xattrs.write(o_fd);
15821 @@ -178,6 +200,11 @@ int compress(const char *i, const struct stat *i_st, int mode, struct FTW *n)
15823 rInfo("Processing file (%s)", input.string().c_str());
15825 + // Remember times of the input file.
15827 + struct stat stbuf;
15828 + lstat(input.string().c_str(), &stbuf);
15830 int o_fd = mkstemp(const_cast<char *>(output.string().c_str()));
15833 @@ -191,8 +218,10 @@ int compress(const char *i, const struct stat *i_st, int mode, struct FTW *n)
15834 if (fstat(o_fd, &o_st) == -1)
15836 rError("Failed to read stat of temporary file (%s)", output.string().c_str());
15842 if (!copy(i, output.string().c_str(), i_st, &o_st))
15844 @@ -212,6 +241,15 @@ int compress(const char *i, const struct stat *i_st, int mode, struct FTW *n)
15848 + // Write back original times.
15850 + struct timespec times[2];
15851 + times[0].tv_sec = stbuf.st_atime;
15852 + times[0].tv_nsec = stbuf.st_atim.tv_nsec;
15853 + times[1].tv_sec = stbuf.st_mtime;
15854 + times[1].tv_nsec = stbuf.st_mtim.tv_nsec;
15855 + utimensat(AT_FDCWD, i, times, AT_SYMLINK_NOFOLLOW);
15860 @@ -239,18 +277,18 @@ int main(int argc, char **argv)
15861 string compressorName;
15862 string commandLineOptions;
15864 - vector<string> fuseOptions;
15865 + std::vector<string> fuseOptions;
15866 fuseOptions.push_back(argv[0]);
15868 - po::options_description desc("Usage: " PACKAGE "_offline [OPTIONS] dir_lower\n"
15869 - "\nInput file may also be a directory name. Files in\n"
15870 - "specified directory will be processed recursively.\n\n"
15871 + po::options_description desc("Usage: " PACKAGE "_offline [options] path\n"
15872 + "\nPath may be directory or file.\n"
15873 + "\nNo options mean decompression mode.\n\n"
15874 "Allowed options");
15876 ("options,o", po::value<string>(&commandLineOptions),
15877 - "fc_c:arg - set compression method (lzo/bzip2/zlib/lzma/none)\n"
15878 + "fc_c:arg - compression method (lzo/bzip2/zlib/lzma)\n"
15880 - "fc_b:arg - set size of blocks in kilobytes\n"
15881 + "fc_b:arg - size of blocks in kilobytes\n"
15882 " (default: 100)\n"
15883 "fc_d - run in debug mode\n"
15884 "fc_ma:arg - files with passed mime types to be\n"
15885 @@ -258,7 +296,7 @@ int main(int argc, char **argv)
15886 "fc_mr:arg - files with passed mime types to be\n"
15887 " always compressed\n"
15888 "\nOther options are passed directly to fuse library. See fuse documentation for full list of supported options.\n")
15889 - ("dir_lower", po::value<string>(&g_dirLower), "storage directory")
15890 + ("dir_lower", po::value<string>(&g_dirLower), "path")
15891 ("help,h", "print this help")
15892 ("version,v", "print version")
15893 ("quiet,q", "quiet mode")
15894 diff --git a/src/rlog/rlog.h b/src/rlog/rlog.h
15895 index cc448f4..3c3c28f 100644
15896 --- a/src/rlog/rlog.h
15897 +++ b/src/rlog/rlog.h
15900 + (C) Copyright Milan Svoboda 2009.
15902 + This file is part of FuseCompress.
15904 + FuseCompress is free software: you can redistribute it and/or modify
15905 + it under the terms of the GNU General Public License as published by
15906 + the Free Software Foundation, either version 2 of the License, or
15907 + (at your option) any later version.
15909 + Foobar is distributed in the hope that it will be useful,
15910 + but WITHOUT ANY WARRANTY; without even the implied warranty of
15911 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15912 + GNU General Public License for more details.
15914 + You should have received a copy of the GNU General Public License
15915 + along with Foobar. If not, see <http://www.gnu.org/licenses/>.
15922 #include <syslog.h>
15923 #include <stdarg.h>
15925 diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
15926 index 4cf00f0..905f64e 100644
15927 --- a/src/tests/Makefile.am
15928 +++ b/src/tests/Makefile.am
15930 -bin_PROGRAMS = print_compress
15931 +bin_PROGRAMS = print_compress xattrs
15933 +xattrs_SOURCES = xattrs.cpp
15934 +xattrs_LDADD =../lzma.o \
15935 + ../CompressionType.o \
15936 + ../FileHeader.o \
15937 + ../CompressedMagic.o \
15938 + ../FileRememberTimes.o \
15939 + ../FileRememberXattrs.o \
15940 + ../FuseCompress.o \
15945 + ../FileManager.o \
15949 + $(BOOST_SERIALIZATION_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(FUSE_LIBS)
15952 print_compress_SOURCES = print_compress.cpp
15953 print_compress_LDADD =../lzma.o \
15954 @@ -6,6 +25,7 @@ print_compress_LDADD =../lzma.o \
15956 ../CompressedMagic.o \
15957 ../FileRememberTimes.o \
15958 + ../FileRememberXattrs.o \
15959 ../FuseCompress.o \
15962 @@ -32,5 +52,5 @@ AM_CPPFLAGS = \
15967 + -fpermissive -O0 -g
15969 diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
15970 index 4d18456..236356e 100644
15971 --- a/src/tests/Makefile.in
15972 +++ b/src/tests/Makefile.in
15974 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
15975 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
15976 # @configure_input@
15978 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
15979 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
15980 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
15982 # This Makefile.in is free software; the Free Software Foundation
15983 # gives unlimited permission to copy and/or distribute it,
15984 # with or without modifications, as long as this notice is preserved.
15988 pkgdatadir = $(datadir)/@PACKAGE@
15989 -pkglibdir = $(libdir)/@PACKAGE@
15990 pkgincludedir = $(includedir)/@PACKAGE@
15991 +pkglibdir = $(libdir)/@PACKAGE@
15992 +pkglibexecdir = $(libexecdir)/@PACKAGE@
15993 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
15994 install_sh_DATA = $(install_sh) -c -m 644
15995 install_sh_PROGRAM = $(install_sh) -c
15996 @@ -31,7 +33,7 @@ NORMAL_UNINSTALL = :
15999 build_triplet = @build@
16000 -bin_PROGRAMS = print_compress$(EXEEXT)
16001 +bin_PROGRAMS = print_compress$(EXEEXT) xattrs$(EXEEXT)
16003 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
16004 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
16005 @@ -46,29 +48,41 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
16006 mkinstalldirs = $(install_sh) -d
16007 CONFIG_HEADER = $(top_builddir)/config.h
16008 CONFIG_CLEAN_FILES =
16009 +CONFIG_CLEAN_VPATH_FILES =
16010 am__installdirs = "$(DESTDIR)$(bindir)"
16011 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
16012 PROGRAMS = $(bin_PROGRAMS)
16013 am_print_compress_OBJECTS = print_compress.$(OBJEXT)
16014 print_compress_OBJECTS = $(am_print_compress_OBJECTS)
16015 am__DEPENDENCIES_1 =
16016 print_compress_DEPENDENCIES = ../lzma.o ../CompressionType.o \
16017 ../FileHeader.o ../CompressedMagic.o ../FileRememberTimes.o \
16018 - ../FuseCompress.o ../File.o ../FileUtils.o ../Compress.o \
16019 - ../Memory.o ../FileManager.o ../Block.o ../LayerMap.o \
16020 - ../LinearMap.o $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
16021 + ../FileRememberXattrs.o ../FuseCompress.o ../File.o \
16022 + ../FileUtils.o ../Compress.o ../Memory.o ../FileManager.o \
16023 + ../Block.o ../LayerMap.o ../LinearMap.o $(am__DEPENDENCIES_1) \
16024 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
16025 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
16026 + $(am__DEPENDENCIES_1)
16027 +am_xattrs_OBJECTS = xattrs.$(OBJEXT)
16028 +xattrs_OBJECTS = $(am_xattrs_OBJECTS)
16029 +xattrs_DEPENDENCIES = ../lzma.o ../CompressionType.o ../FileHeader.o \
16030 + ../CompressedMagic.o ../FileRememberTimes.o \
16031 + ../FileRememberXattrs.o ../FuseCompress.o ../File.o \
16032 + ../FileUtils.o ../Compress.o ../Memory.o ../FileManager.o \
16033 + ../Block.o ../LayerMap.o ../LinearMap.o $(am__DEPENDENCIES_1) \
16034 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
16035 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
16036 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
16037 + $(am__DEPENDENCIES_1)
16038 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
16039 depcomp = $(SHELL) $(top_srcdir)/depcomp
16040 am__depfiles_maybe = depfiles
16042 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
16043 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
16045 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
16047 -SOURCES = $(print_compress_SOURCES)
16048 -DIST_SOURCES = $(print_compress_SOURCES)
16049 +SOURCES = $(print_compress_SOURCES) $(xattrs_SOURCES)
16050 +DIST_SOURCES = $(print_compress_SOURCES) $(xattrs_SOURCES)
16053 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
16054 @@ -123,6 +137,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16055 PACKAGE_NAME = @PACKAGE_NAME@
16056 PACKAGE_STRING = @PACKAGE_STRING@
16057 PACKAGE_TARNAME = @PACKAGE_TARNAME@
16058 +PACKAGE_URL = @PACKAGE_URL@
16059 PACKAGE_VERSION = @PACKAGE_VERSION@
16060 PATH_SEPARATOR = @PATH_SEPARATOR@
16061 PKG_CONFIG = @PKG_CONFIG@
16062 @@ -178,12 +193,31 @@ target_alias = @target_alias@
16063 top_build_prefix = @top_build_prefix@
16064 top_builddir = @top_builddir@
16065 top_srcdir = @top_srcdir@
16066 +xattrs_SOURCES = xattrs.cpp
16067 +xattrs_LDADD = ../lzma.o \
16068 + ../CompressionType.o \
16069 + ../FileHeader.o \
16070 + ../CompressedMagic.o \
16071 + ../FileRememberTimes.o \
16072 + ../FileRememberXattrs.o \
16073 + ../FuseCompress.o \
16078 + ../FileManager.o \
16082 + $(BOOST_SERIALIZATION_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(FUSE_LIBS)
16084 print_compress_SOURCES = print_compress.cpp
16085 print_compress_LDADD = ../lzma.o \
16086 ../CompressionType.o \
16088 ../CompressedMagic.o \
16089 ../FileRememberTimes.o \
16090 + ../FileRememberXattrs.o \
16091 ../FuseCompress.o \
16094 @@ -208,7 +242,7 @@ AM_CPPFLAGS = \
16099 + -fpermissive -O0 -g
16103 @@ -218,14 +252,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
16104 @for dep in $?; do \
16105 case '$(am__configure_deps)' in \
16107 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
16109 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
16110 + && { if test -f $@; then exit 0; else break; fi; }; \
16114 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/Makefile'; \
16115 - cd $(top_srcdir) && \
16116 - $(AUTOMAKE) --foreign src/tests/Makefile
16117 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/Makefile'; \
16118 + $(am__cd) $(top_srcdir) && \
16119 + $(AUTOMAKE) --foreign src/tests/Makefile
16120 .PRECIOUS: Makefile
16121 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
16123 @@ -243,32 +277,50 @@ $(top_srcdir)/configure: $(am__configure_deps)
16124 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16125 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
16126 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
16127 +$(am__aclocal_m4_deps):
16128 install-binPROGRAMS: $(bin_PROGRAMS)
16130 test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
16131 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
16132 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
16135 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
16136 - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
16137 - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
16140 + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
16141 + for p in $$list; do echo "$$p $$p"; done | \
16142 + sed 's/$(EXEEXT)$$//' | \
16143 + while read p p1; do if test -f $$p; \
16144 + then echo "$$p"; echo "$$p"; else :; fi; \
16146 + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
16147 + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
16148 + sed 'N;N;N;s,\n, ,g' | \
16149 + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
16150 + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
16151 + if ($$2 == $$4) files[d] = files[d] " " $$1; \
16152 + else { print "f", $$3 "/" $$4, $$1; } } \
16153 + END { for (d in files) print "f", d, files[d] }' | \
16154 + while read type dir files; do \
16155 + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
16156 + test -z "$$files" || { \
16157 + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
16158 + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
16162 uninstall-binPROGRAMS:
16163 @$(NORMAL_UNINSTALL)
16164 - @list='$(bin_PROGRAMS)'; for p in $$list; do \
16165 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
16166 - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
16167 - rm -f "$(DESTDIR)$(bindir)/$$f"; \
16169 + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
16170 + files=`for p in $$list; do echo "$$p"; done | \
16171 + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
16172 + -e 's/$$/$(EXEEXT)/' `; \
16173 + test -n "$$list" || exit 0; \
16174 + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
16175 + cd "$(DESTDIR)$(bindir)" && rm -f $$files
16178 -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
16179 print_compress$(EXEEXT): $(print_compress_OBJECTS) $(print_compress_DEPENDENCIES)
16180 @rm -f print_compress$(EXEEXT)
16181 $(CXXLINK) $(print_compress_OBJECTS) $(print_compress_LDADD) $(LIBS)
16182 +xattrs$(EXEEXT): $(xattrs_OBJECTS) $(xattrs_DEPENDENCIES)
16183 + @rm -f xattrs$(EXEEXT)
16184 + $(CXXLINK) $(xattrs_OBJECTS) $(xattrs_LDADD) $(LIBS)
16186 mostlyclean-compile:
16188 @@ -277,17 +329,18 @@ distclean-compile:
16191 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_compress.Po@am__quote@
16192 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xattrs.Po@am__quote@
16195 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
16196 -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
16197 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
16198 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
16199 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
16200 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
16203 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
16204 -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
16205 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
16206 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
16207 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
16208 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
16209 @@ -297,14 +350,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
16210 unique=`for i in $$list; do \
16211 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
16213 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
16214 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
16215 END { if (nonempty) { for (i in files) print i; }; }'`; \
16219 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
16220 $(TAGS_FILES) $(LISP)
16224 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
16225 unique=`for i in $$list; do \
16226 @@ -312,29 +365,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
16228 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
16229 END { if (nonempty) { for (i in files) print i; }; }'`; \
16230 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
16232 + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
16233 test -n "$$unique" || unique=$$empty_fix; \
16234 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
16235 - $$tags $$unique; \
16236 + if test $$# -gt 0; then \
16237 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
16238 + "$$@" $$unique; \
16240 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
16245 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
16246 $(TAGS_FILES) $(LISP)
16248 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
16249 unique=`for i in $$list; do \
16250 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
16252 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
16253 END { if (nonempty) { for (i in files) print i; }; }'`; \
16254 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
16255 + test -z "$(CTAGS_ARGS)$$unique" \
16256 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
16261 here=`$(am__cd) $(top_builddir) && pwd` \
16262 - && cd $(top_srcdir) \
16263 - && gtags -i $(GTAGS_ARGS) $$here
16264 + && $(am__cd) $(top_srcdir) \
16265 + && gtags -i $(GTAGS_ARGS) "$$here"
16268 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
16269 @@ -355,13 +413,17 @@ distdir: $(DISTFILES)
16270 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
16271 if test -d $$d/$$file; then \
16272 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
16273 + if test -d "$(distdir)/$$file"; then \
16274 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16276 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
16277 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
16278 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
16279 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
16281 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
16282 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
16284 - test -f $(distdir)/$$file \
16285 - || cp -p $$d/$$file $(distdir)/$$file \
16286 + test -f "$(distdir)/$$file" \
16287 + || cp -p $$d/$$file "$(distdir)/$$file" \
16291 @@ -392,6 +454,7 @@ clean-generic:
16294 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
16295 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
16297 maintainer-clean-generic:
16298 @echo "This command is intended for maintainers to use"
16299 @@ -412,6 +475,8 @@ dvi-am:
16308 @@ -420,18 +485,28 @@ install-data-am:
16310 install-dvi: install-dvi-am
16314 install-exec-am: install-binPROGRAMS
16316 install-html: install-html-am
16320 install-info: install-info-am
16326 install-pdf: install-pdf-am
16330 install-ps: install-ps-am
16336 maintainer-clean: maintainer-clean-am
16337 @@ -468,6 +543,7 @@ uninstall-am: uninstall-binPROGRAMS
16338 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
16339 uninstall-am uninstall-binPROGRAMS
16342 # Tell versions [3.59,3.63) of GNU make to not export all variables.
16343 # Otherwise a system limit (for SysV at least) may be exceeded.
16345 diff --git a/src/tests/print_compress.cpp b/src/tests/print_compress.cpp
16346 index e32836e..13fe92c 100755
16347 --- a/src/tests/print_compress.cpp
16348 +++ b/src/tests/print_compress.cpp
16351 #include <limits.h>
16353 -#include <rlog/rlog.h>
16354 +#include "rlog/rlog.h"
16356 #include "Compress.hpp"
16357 #include "CompressedMagic.hpp"
16358 diff --git a/src/tests/xattrs.cpp b/src/tests/xattrs.cpp
16359 new file mode 100644
16360 index 0000000..8b5d7b2
16362 +++ b/src/tests/xattrs.cpp
16364 +#include <sys/types.h>
16365 +#include <sys/stat.h>
16366 +#include <fcntl.h>
16368 +#include "rlog/rlog.h"
16370 +#include "FileRememberXattrs.hpp"
16371 +#include "CompressedMagic.hpp"
16372 +#include "CompressionType.hpp"
16374 +bool g_DebugMode = true;
16375 +unsigned int g_BufferedMemorySize;
16376 +CompressedMagic g_CompressedMagic;
16377 +CompressionType g_CompressionType;
16378 +std::string g_dirLower;
16379 +std::string g_dirMount;
16380 +rlog::RLog *g_RLog;
16382 +int main(int argc, char **argv)
16384 + g_RLog = new rlog::RLog("xattrs", g_DebugMode ? LOG_DEBUG : LOG_INFO, g_DebugMode);
16386 + int fd_s = open(argv[1], O_RDONLY);
16387 + int fd_d = open(argv[2], O_WRONLY);
16388 + FileRememberXattrs xattrs;
16389 + xattrs.read(fd_s);
16390 + xattrs.write(fd_d);