summaryrefslogtreecommitdiff
path: root/Build/source/libs/zziplib
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-07 15:22:43 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-07 15:22:43 +0000
commit7c2986ff4a631b3ad967d64df9502c03463d41f7 (patch)
tree8937630e3c6fbb2d799ef8ff0c2bb8d0526b8f5b /Build/source/libs/zziplib
parent1c2a7c6d12cd8d1cb6ca50cd0a71d2a1605fc4d4 (diff)
zziplib 0.13.59
git-svn-id: svn://tug.org/texlive/trunk@20965 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zziplib')
-rw-r--r--Build/source/libs/zziplib/ChangeLog5
-rwxr-xr-xBuild/source/libs/zziplib/configure24
-rw-r--r--Build/source/libs/zziplib/configure.ac4
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/patch-02-aix-strcasecmp13
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/patch-03-inline24
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.59/msvc8/README.TXT36
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60-PATCHES/ChangeLog (renamed from Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/ChangeLog)6
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60-PATCHES/TL-Changes (renamed from Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/TL-Changes)2
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/COPYING.LIB (renamed from Build/source/libs/zziplib/zziplib-0.13.59/COPYING.LIB)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/ChangeLog (renamed from Build/source/libs/zziplib/zziplib-0.13.59/ChangeLog)63
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/Makefile.am (renamed from Build/source/libs/zziplib/zziplib-0.13.59/Makefile.am)31
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/Makefile.in (renamed from Build/source/libs/zziplib/zziplib-0.13.59/Makefile.in)50
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/Makefile.mk (renamed from Build/source/libs/zziplib/zziplib-0.13.59/Makefile.mk)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/README (renamed from Build/source/libs/zziplib/zziplib-0.13.59/README)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/SDL/Makefile.am (renamed from Build/source/libs/zziplib/zziplib-0.13.59/SDL/Makefile.am)14
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/SDL/Makefile.in (renamed from Build/source/libs/zziplib/zziplib-0.13.59/SDL/Makefile.in)18
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzcat.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzcat.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzip.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzip.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzip.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzip.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzip.pc (renamed from Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzip.pc)2
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/TODO (renamed from Build/source/libs/zziplib/zziplib-0.13.59/TODO)4
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/Makefile.am (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/Makefile.am)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/Makefile.in (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/Makefile.in)4
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/unzip-mem.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/unzip-mem.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzip.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzip.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipcat-mem.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipcat-mem.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipcat-seeko.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipcat-seeko.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipcat.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipcat.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipdir-mem.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipdir-mem.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipdir.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipdir.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/zzcat.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/zzcat.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/zzdir.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/zzdir.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/zzip.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/zzip.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/zziplib.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/zziplib.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/zziptest.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/zziptest.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/zzobfuscated.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/zzobfuscated.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/zzxorcat.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/zzxorcat.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/zzxorcopy.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/zzxorcopy.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/bins/zzxordir.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/bins/zzxordir.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/config.h.in (renamed from Build/source/libs/zziplib/zziplib-0.13.59/config.h.in)3
-rwxr-xr-xBuild/source/libs/zziplib/zziplib-0.13.60/configure (renamed from Build/source/libs/zziplib/zziplib-0.13.59/configure)7905
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/configure.ac (renamed from Build/source/libs/zziplib/zziplib-0.13.59/configure.ac)19
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/64on32.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/64on32.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/COPYING.LIB (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/COPYING.LIB)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/COPYING.MPL (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/COPYING.MPL)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/COPYING.ZLIB (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/COPYING.ZLIB)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/Makefile.am (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/Makefile.am)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/Makefile.in (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/Makefile.in)4
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/README.MSVC6 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/README.MSVC6)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/README.SDL (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/README.SDL)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/body.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/body.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/configs.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/configs.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/copying.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/copying.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/developer.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/developer.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/download.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/download.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/faq.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/faq.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/fseeko.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/fseeko.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/functions.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/functions.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/future.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/future.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/history.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/history.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/make-dbk.pl (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/make-dbk.pl)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/make-doc.pl (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/make-doc.pl)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/make-doc.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/make-doc.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/makedocs.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/makedocs.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/memdisk.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/memdisk.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/mksite.pl (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/mksite.pl)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/mksite.sh (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/mksite.sh)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/mmapped.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/mmapped.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/notes.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/notes.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/referentials.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/referentials.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/sdocbook.css (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/sdocbook.css)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/sfx-make.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/sfx-make.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zip-php.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zip-php.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-api.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-api.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-basics.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-basics.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-crypt.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-crypt.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-cryptoid.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-cryptoid.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-extio.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-extio.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-extras.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-extras.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-file.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-file.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-index.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-index.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-parse.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-parse.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-sdl-rwops.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-sdl-rwops.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-xor.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-xor.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-zip.htm (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-zip.htm)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/__init__.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/__init__.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/commentmarkup.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/commentmarkup.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/dbk2htm.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/dbk2htm.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/docbookdocument.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/docbookdocument.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionheader.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionheader.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionlisthtmlpage.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionlisthtmlpage.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionlistreference.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionlistreference.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionprototype.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionprototype.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/htm2dbk.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/htm2dbk.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/htmldocument.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/htmldocument.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/match.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/match.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/options.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/options.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/textfile.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/textfile.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/textfileheader.py (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/textfileheader.py)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipfseeko.html (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipfseeko.html)2
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib-manpages.dbk (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib-manpages.dbk)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib-manpages.tar (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib-manpages.tar)bin174080 -> 174080 bytes
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib-master.dbk (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib-master.dbk)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib.html (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib.html)10
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipmmapped.html (renamed from Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipmmapped.html)2
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ac_compile_check_sizeof.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ac_compile_check_sizeof.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ac_set_default_paths_system.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ac_set_default_paths_system.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ac_sys_largefile_sensitive.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ac_sys_largefile_sensitive.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/acx_restrict.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/acx_restrict.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_gcc_option.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_gcc_option.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_no_writable_strings.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_no_writable_strings.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_strict_prototypes.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_strict_prototypes.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_warn_all.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_warn_all.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_check_aligned_access_required.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_check_aligned_access_required.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_configure_args.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_configure_args.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_create_pkgconfig_info.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_create_pkgconfig_info.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_enable_builddir_uname.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_enable_builddir_uname.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_expand_prefix.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_expand_prefix.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_maintainer_mode_auto_silent.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_maintainer_mode_auto_silent.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_not_enable_frame_pointer.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_not_enable_frame_pointer.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_pax_tar.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_pax_tar.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_prefix_config_h.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_prefix_config_h.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_set_version_info.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_set_version_info.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_spec_file.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_spec_file.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_spec_package_version.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_spec_package_version.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_warning_default_aclocaldir.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_warning_default_aclocaldir.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_warning_default_pkgconfig.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_warning_default_pkgconfig.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/libtool.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/libtool.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ltoptions.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ltoptions.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ltsugar.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ltsugar.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/ltversion.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/ltversion.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/lt~obsolete.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/lt~obsolete.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/patch_libtool_on_darwin_zsh_overquoting.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/patch_libtool_on_darwin_zsh_overquoting.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/patch_libtool_sys_lib_search_path_spec.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/patch_libtool_sys_lib_search_path_spec.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/m4/patch_libtool_to_add_host_cc.m4 (renamed from Build/source/libs/zziplib/zziplib-0.13.59/m4/patch_libtool_to_add_host_cc.m4)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzcat.dsp (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzcat.dsp)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzdir.dsp (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzdir.dsp)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzip.dsp (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzip.dsp)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zziplib.dsp (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zziplib.dsp)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zziplib.dsw (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zziplib.dsw)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zziptest.dsp (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zziptest.dsp)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzipwrap.dsp (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzipwrap.dsp)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzobfuscated.dsp (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzobfuscated.dsp)0
-rwxr-xr-xBuild/source/libs/zziplib/zziplib-0.13.60/msvc7/pkzip.exe (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/pkzip.exe)bin42163 -> 42163 bytes
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/test.zip (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/test.zip)bin545 -> 545 bytes
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/test1.zip (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/test1.zip)bin1183 -> 1183 bytes
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzcat.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzcat.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzcat.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzcat.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzdir.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzdir.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzdir.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzdir.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzip.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzip.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzip.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzip.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziplib.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziplib.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziplib.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziplib.vcproj)0
-rwxr-xr-xBuild/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.bat (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.bat)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.txt (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.txt)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipsetstub.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipsetstub.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipsetstub.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipsetstub.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziptest.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziptest.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziptest.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziptest.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzobfuscated.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzobfuscated.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzobfuscated.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzobfuscated.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/README.TXT61
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/test.zip (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/test.zip)bin545 -> 545 bytes
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/test1.zip (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/test1.zip)bin1183 -> 1183 bytes
-rwxr-xr-xBuild/source/libs/zziplib/zziplib-0.13.60/msvc8/zip.exe (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zip.exe)bin135135 -> 135135 bytes
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzcat.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzcat.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzcat.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzcat.vcproj)3
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzdir.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzdir.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzdir.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzdir.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzip.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzip.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzip.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzip.vcproj)0
-rwxr-xr-xBuild/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipfseeko.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipfseeko.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziplib.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziplib.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziplib.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziplib.vcproj)8
-rwxr-xr-xBuild/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipmmapped.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipmmapped.vcproj)0
-rwxr-xr-xBuild/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.bat (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.bat)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.txt (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.txt)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipsetstub.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipsetstub.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipsetstub.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipsetstub.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziptest.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziptest.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziptest.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziptest.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzobfuscated.sln (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzobfuscated.sln)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzobfuscated.vcproj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzobfuscated.vcproj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/test/Makefile.am (renamed from Build/source/libs/zziplib/zziplib-0.13.59/test/Makefile.am)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/test/Makefile.in (renamed from Build/source/libs/zziplib/zziplib-0.13.59/test/Makefile.in)4
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/test/README (renamed from Build/source/libs/zziplib/zziplib-0.13.59/test/README)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/test/test.zip (renamed from Build/source/libs/zziplib/zziplib-0.13.59/test/test.zip)bin1293 -> 1293 bytes
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/test/test1.zip (renamed from Build/source/libs/zziplib/zziplib-0.13.59/test/test1.zip)bin1183 -> 1183 bytes
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/test/zzipself.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/test/zzipself.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/test/zzipsetstub.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/test/zzipsetstub.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/Makefile.am (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/Makefile.am)3
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/Makefile.in (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/Makefile.in)7
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/__debug.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/__debug.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/__dirent.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/__dirent.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/__fnmatch.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/__fnmatch.h)1
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/__hints.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/__hints.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/__mmap.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/__mmap.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/_msvc.sed (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/_msvc.sed)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/autoconf.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/autoconf.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/conf.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/conf.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/dir.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/dir.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/err.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/err.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/fetch.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/fetch.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/fetch.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/fetch.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/file.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/file.c)5
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/file.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/file.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/format.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/format.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/fseeko.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/fseeko.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/fseeko.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/fseeko.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/info.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/info.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/info.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/info.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/lib.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/lib.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/memdisk.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/memdisk.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/memdisk.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/memdisk.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/mmapped.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/mmapped.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/mmapped.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/mmapped.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/plugin.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/plugin.c)6
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/plugin.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/plugin.h)7
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/stat.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/stat.c)3
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/stdint.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/stdint.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/types.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/types.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/write.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/write.c)2
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/write.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/write.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/zip.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/zip.c)21
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzip-zlib-config.pc (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzip-zlib-config.pc)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzip.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzip.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzip32.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzip32.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzipfseeko.pc (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzipfseeko.pc)4
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/zziplib.pc (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/zziplib.pc)4
-rwxr-xr-xBuild/source/libs/zziplib/zziplib-0.13.60/zzip/zziplib.wpj (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/zziplib.wpj)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzipmmapped.pc (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzipmmapped.pc)4
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzipback.sed (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzipback.sed)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zziplib.spec (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zziplib.spec)46
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/Makefile.am (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/Makefile.am)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/Makefile.in (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/Makefile.in)4
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/wrap.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/wrap.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/wrap.h (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/wrap.h)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/zzipwrap.c (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/zzipwrap.c)0
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/zzipwrap.pc (renamed from Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/zzipwrap.pc)2
244 files changed, 2797 insertions, 5643 deletions
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog
index 3d004c5eeb3..25e2b1f7154 100644
--- a/Build/source/libs/zziplib/ChangeLog
+++ b/Build/source/libs/zziplib/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import zziplib-0.13.60.
+ * configure.ac: Adapted.
+
2010-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
Import zziplib-0.13.59.
diff --git a/Build/source/libs/zziplib/configure b/Build/source/libs/zziplib/configure
index 5e77e574d0c..b5024233441 100755
--- a/Build/source/libs/zziplib/configure
+++ b/Build/source/libs/zziplib/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for zziplib for TeX Live 0.13.59.
+# Generated by GNU Autoconf 2.68 for zziplib for TeX Live 0.13.60.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -560,12 +560,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='zziplib for TeX Live'
PACKAGE_TARNAME='zziplib-for-tex-live'
-PACKAGE_VERSION='0.13.59'
-PACKAGE_STRING='zziplib for TeX Live 0.13.59'
+PACKAGE_VERSION='0.13.60'
+PACKAGE_STRING='zziplib for TeX Live 0.13.60'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="zziplib-0.13.59/zziplib.spec"
+ac_unique_file="zziplib-0.13.60/zziplib.spec"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1271,7 +1271,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures zziplib for TeX Live 0.13.59 to adapt to many kinds of systems.
+\`configure' configures zziplib for TeX Live 0.13.60 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1342,7 +1342,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of zziplib for TeX Live 0.13.59:";;
+ short | recursive ) echo "Configuration of zziplib for TeX Live 0.13.60:";;
esac
cat <<\_ACEOF
@@ -1443,7 +1443,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-zziplib for TeX Live configure 0.13.59
+zziplib for TeX Live configure 0.13.60
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2044,7 +2044,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by zziplib for TeX Live $as_me 0.13.59, which was
+It was created by zziplib for TeX Live $as_me 0.13.60, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2863,7 +2863,7 @@ fi
# Define the identity of the package.
PACKAGE='zziplib-for-tex-live'
- VERSION='0.13.59'
+ VERSION='0.13.60'
cat >>confdefs.h <<_ACEOF
@@ -5758,7 +5758,7 @@ LIBS=$kpse_save_LIBS
echo timestamp >config.force
fi
-ZZIPLIB_TREE=zziplib-0.13.59
+ZZIPLIB_TREE=zziplib-0.13.60
# -----------------------------------------------------------------------
@@ -6319,7 +6319,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by zziplib for TeX Live $as_me 0.13.59, which was
+This file was extended by zziplib for TeX Live $as_me 0.13.60, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6385,7 +6385,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-zziplib for TeX Live config.status 0.13.59
+zziplib for TeX Live config.status 0.13.60
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/zziplib/configure.ac b/Build/source/libs/zziplib/configure.ac
index 63667b386b0..dd7a01bbe72 100644
--- a/Build/source/libs/zziplib/configure.ac
+++ b/Build/source/libs/zziplib/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl based on zziplib-0.13.58:
dnl Copyright (C) 2009 Guido Draheim <guido@gmx.de> for ZZipLib.SF.net
@@ -9,7 +9,7 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-m4_define([zziplib_version], [0.13.59])[]dnl using unmodified zziplib source tree
+m4_define([zziplib_version], [0.13.60])[]dnl using unmodified zziplib source tree
AC_INIT([zziplib for TeX Live], zziplib_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([zziplib-]zziplib_version[/zziplib.spec])
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/patch-02-aix-strcasecmp b/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/patch-02-aix-strcasecmp
deleted file mode 100644
index 96f86edfdf3..00000000000
--- a/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/patch-02-aix-strcasecmp
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur zziplib-0.13.59.orig/zzip/stat.c zziplib-0.13.59/zzip/stat.c
---- zziplib-0.13.59.orig/zzip/stat.c 2009-08-23 13:38:22.000000000 +0200
-+++ zziplib-0.13.59/zzip/stat.c 2010-05-31 21:06:01.000000000 +0200
-@@ -21,6 +21,9 @@
- #include <zzip/lib.h> /* exported... */
- #include <zzip/file.h>
- #include <string.h>
-+#if defined(_AIX)
-+#include <strings.h> /* for strcasecmp */
-+#endif
- #include <sys/stat.h>
-
- #define ZZIP_USE_INTERNAL
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/patch-03-inline b/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/patch-03-inline
deleted file mode 100644
index 9ce738d3768..00000000000
--- a/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/patch-03-inline
+++ /dev/null
@@ -1,24 +0,0 @@
- Otherwise, the Sun Studio C compiler may require a global
- non-inline definition.
-
-diff -ur zziplib-0.13.59.orig/zzip/zip.c zziplib-0.13.59/zzip/zip.c
---- zziplib-0.13.59.orig/zzip/zip.c 2009-09-24 23:57:00.000000000 +0200
-+++ zziplib-0.13.59/zzip/zip.c 2010-10-04 19:22:53.571501418 +0200
-@@ -90,7 +90,7 @@
- struct zzip_dir_hdr **hdr_return,
- zzip_plugin_io_t io);
-
--_zzip_inline char *__zzip_aligned4(char *p);
-+_zzip_inline static char *__zzip_aligned4(char *p);
-
- /* ------------------------ harden routines ------------------------------ */
-
-@@ -377,7 +377,7 @@
- * to pointer types but we do need only the lower bits in this implementation,
- * so we can just cast the value to a long value.
- */
--_zzip_inline char *
-+_zzip_inline static char *
- __zzip_aligned4(char *p)
- {
- #define aligned4 __zzip_aligned4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/README.TXT b/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/README.TXT
deleted file mode 100644
index 3a4547990be..00000000000
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/README.TXT
+++ /dev/null
@@ -1,36 +0,0 @@
-These project files were tested with the
-free Microsoft Visual C++ 2005 Express Edition.
-
-Visual C++ Express does NOT include the Win32 SDK Headers.
-They must be downloaded separately as documented in the
-installation instructions at Microsoft - consequently that
-extra installation must be referenced via a system variable:
-Set MSSdk=C:\Program Files\Microsoft Platform SDK
-
-In order to compile you need a valid Zlib SDK - you can
-download it from zlib.org in the archive zlib123-dll.zip -
-I had unpacked them to $(zziplibdir)/zlib inside the
-toplevel of the zziplib source tree. That SDK does ship
-with a "zlib1.dll" runtime and "zdll.lib" import library.
-
-The new Visual Studio has depracated most of the Win32 API
-just as well as most of the Posix API. That provokes a lot
-of warning message in surplus of the many warning message
-that occur on every implicit conversion between signed and
-unsigned types. Other compilers are more clever about
-detecting real conversion issues, therefore they are not
-going to be "patched away" with an explicit conversion in
-the source files (I expect Microsoft to get it right somewhen).
-
-== Download Places ==
-download.microsoft.com/download/a/5/f/a5f0d781-e201-4ab6-8c6a-9bb4efed1e1a/
-PSDK-x86.exe = Win32 SDK - online installer
-download.microsoft.com/download/A/9/1/A91D6B2B-A798-47DF-9C7E-A97854B7DD18/
-VC.iso = Visual C++ Express CD-image
-download.microsoft.com/download/C/6/F/C6F4733B-67C7-4C15-9F21-61F7A3167505/
-VCS.iso = Visual C# Express CD-image
-
-== Compiling Error ==
-'can not delete debug/*.idb' - occurs when running MSVC in a VMWare box
-pointing to a Unix drive; create a symlink `ln -s Debug debug` to fix it.
-There are Pre/Post-Build Rules to remove *.idb but sometimes its left over.
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/ChangeLog b/Build/source/libs/zziplib/zziplib-0.13.60-PATCHES/ChangeLog
index 2821acfab87..f13334c3bca 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/ChangeLog
+++ b/Build/source/libs/zziplib/zziplib-0.13.60-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Adapted to zziplib-0.13.60.
+ * patch-02-aix-strcasecmp, patch-03-inline (removed):
+ Now in source tree.
+
2010-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
Adapted to zziplib-0.13.59.
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/TL-Changes b/Build/source/libs/zziplib/zziplib-0.13.60-PATCHES/TL-Changes
index 48f596a7086..ca2c7f1caeb 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59-PATCHES/TL-Changes
+++ b/Build/source/libs/zziplib/zziplib-0.13.60-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the zziplib-0.13.59/ tree as obtained from:
+Changes applied to the zziplib-0.13.60/ tree as obtained from:
http://zziplib.sourceforge.net/
Copied:
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/COPYING.LIB b/Build/source/libs/zziplib/zziplib-0.13.60/COPYING.LIB
index eb685a5ec98..eb685a5ec98 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/COPYING.LIB
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/COPYING.LIB
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/ChangeLog b/Build/source/libs/zziplib/zziplib-0.13.60/ChangeLog
index 61ec34b3593..37d4be2cd21 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/ChangeLog
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/ChangeLog
@@ -1,3 +1,66 @@
+2010-12-29 guidod <guidod@gmx.de>
+ * Makefile.am: allow nonstaic build
+ * wrap fd.open like in the Fedora patch
+
+2010-12-28 guidod <guidod@gmx.de>
+ * zziplib.spec - simplify the spec based on distro specs.
+
+2010-12-27 guidod <guidod@gmx.de>
+ * adding fetch.h/fetch.c to msvc8/zziplib.vcproj to allow
+ tests with Visual Studio C++ Express 2005
+
+2010-12-27 guidod <guidod@gmx.de>
+ * fix stat.c to check ZZIP_CASELESS instead of the deprecated
+ ZZIP_CASEINSENSITIVE. The latter is still recognized for
+ compatibility reasons and implicitly mapped to ZZIP_CASELESS.
+ * fixes the zziplib-Patches-3078188 which reported the bug.
+
+2010-12-27 guidod <guidod@gmx.de>
+ * apply patches by Peter Breitenlohner for better compatibility
+ with AIX host system. Also the Sun Studio compiler insists on
+ static inline functions or else assumes extern inline.
+ * also fixes zziplib-Patches-3011551 on the AIX problem.
+
+2010-12-27 guidod <guidod@gmx.de>
+ * add hints that the ext_io plugin handlers should be static.
+
+2010-05-09 guidod <guidod@gmx.de>
+
+ * zzip/__fnmatch.h: add include <string.h> to make mingw32 happy.
+ Patches item #2995373 by Gregory Smith
+
+2010-05-08 guidod <guidod@gmx.de>
+
+ * SDL/Makefile.am: fix generation of sdl-uninstalled.pc that was
+ not recognized during compilation.
+
+2010-04-05 guidod <guidod@gmx.de>
+
+ * Makefile.am: fix "osc rm" and fix "test-sdl" if SDL was not found.
+ * configure.ac: SDL example builds on pkgconfig/sdl.pc which
+
+ was introduced with SDL 1.2.11 - CentOs5 ships 1.2.10 which
+ does only have "sdl-config" and it made for a mismatch in
+ in the build configuration: sdl-devel yes, pkgconfig sdl no.
+ * zzip/zip.c (__zzip_parse_root_directory): move the check for
+ zzip_disk_entry_check_magic to be after the the check that
+ the seek-value is more than a header's size before the end.
+ (based on a segfault report by Tulipánt Gergely when the
+ new modulo_entries code is enabled (which is off by default))
+
+2010-03-30 guidod <guidod@gmx.de>
+
+ * zzip/Makefile.am: fixing symlinks for lib* - use only for Linux
+ Thanks to Ryan Schmidt (macports):
+ ... likes to install some symlinks that don't make sense on Mac OS X:
+ $ ls -l /opt/local/lib/*zzip*so*
+ lrwxr-xr-x /opt/local/lib/libzzip*.so.10 -> libzzip*.so.13
+ lrwxr-xr-x /opt/local/lib/libzzip*.so.11 -> libzzip*.so.13
+ lrwxr-xr-x /opt/local/lib/libzzip*.so.12 -> libzzip*.so.13
+ Yes, the filenames literally contain an asterisk.
+
+ * prepare 0.13.60
+
2010-03-29 guidod <guidod@gmx.de>
* Makefile.am: change osc to new home:guidod:zziplib-13
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/Makefile.am b/Build/source/libs/zziplib/zziplib-0.13.60/Makefile.am
index 67f050d5328..47ccc75896d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/Makefile.am
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/Makefile.am
@@ -37,7 +37,7 @@ osc-ci osc-commit upload-osc: osc-copy
; ls $(OSC_SRCDIR)/$(OSC_PROJECT)/$(OSC_PACKAGE)/*.tar.* \
| { while read f; do tarname=`basename $$f` \
; if test "$$tarname" != "$$tarball" \
- ; then echo osc rm $$f ; osc rm $$f \
+ ; then echo osc rm -f $$f ; osc rm -f $$f \
; else echo osc add $$f ; osc add $$f \
; fi ; done }
osc status $(OSC_SRCDIR)/$(OSC_PROJECT)/$(OSC_PACKAGE)/
@@ -69,7 +69,8 @@ upload-sourceforge www:
(cd docs && $(MAKE) `basename $@`)
sdl testsdl test-sdl install-sdl :
- (cd SDL && $(MAKE) `basename $@`)
+ if test -z "$(SDL)"; then echo "skip $@ (no SDL)"; else \
+ (cd SDL && $(MAKE) `basename $@`) ; fi
check-test0 check-test1 check-zzdir check-zzcat \
check-zzxor check-zzxordir check-zzxorcat \
@@ -145,25 +146,25 @@ zzip64-install: zzip64-install.tmp
zzip64-install.tmp : zzip64-build.tmp
cd zzip64 && $(MAKE) install $(_RELEASEINFO64)
cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip64.so
- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip64.a
+ - cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip64.a
cd $(DESTDIR)$(libdir) && \
- sed -e 's/zzip.so/zzip64.so/' \
- -e 's/zzip.a/zzip64.a/' libzzip.la > libzzip64.la
+ sed -e 's/zzip.so/zzip64.so/' -e 's/zzip.a/zzip64.a/' \
+ libzzip.la > libzzip64.la
cd $(DESTDIR)$(libdir)/pkgconfig && \
sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \
- -e 's/-lzzip/-lzzip64/' \
- -e 's/zziplib/zziplib64/' zziplib.pc > zziplib64.pc
+ -e 's/-lzzip/-lzzip64/' -e 's/zziplib/zziplib64/' \
+ zziplib.pc > zziplib64.pc
zzip32-postinstall:
- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip32.so
- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip32.a
- cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
- cd $(DESTDIR)$(libdir) && ln -s libzzip32.a libzzip.a
+ cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip32.so
+ - cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip32.a
+ cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
+ - cd $(DESTDIR)$(libdir) && ln -s libzzip32.a libzzip.a
cd $(DESTDIR)$(libdir) && \
- sed -e 's/zzip.so/zzip32.so/' \
- -e 's/zzip.a/zzip32.a/' libzzip.la > libzzip32.la
+ sed -e 's/zzip.so/zzip32.so/' -e 's/zzip.a/zzip32.a/' \
+ libzzip.la > libzzip32.la
cd $(DESTDIR)$(libdir)/pkgconfig && \
- sed -e 's/-lzzip/-lzzip32/' \
- -e 's/zziplib/zziplib32/' zziplib.pc > zziplib32.pc
+ sed -e 's/-lzzip/-lzzip32/' -e 's/zziplib/zziplib32/' \
+ zziplib.pc > zziplib32.pc
zzip-postinstall:
: "the 12.8x and 11.8x and 10.8x packages are all the same actually"
cd $(DESTDIR)$(libdir) || exit 1 \
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/Makefile.in b/Build/source/libs/zziplib/zziplib-0.13.60/Makefile.in
index 588317f4409..a08cc4796b4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/Makefile.in
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -188,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PAX = @PAX@
@@ -200,6 +201,7 @@ RANLIB = @RANLIB@
RELEASE_INFO = @RELEASE_INFO@
RESOLVES = @RESOLVES@
SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -397,7 +399,7 @@ distclean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -422,7 +424,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -586,7 +588,8 @@ distdir: $(DISTFILES)
fi; \
done
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -630,17 +633,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -836,7 +839,7 @@ osc-ci osc-commit upload-osc: osc-copy
; ls $(OSC_SRCDIR)/$(OSC_PROJECT)/$(OSC_PACKAGE)/*.tar.* \
| { while read f; do tarname=`basename $$f` \
; if test "$$tarname" != "$$tarball" \
- ; then echo osc rm $$f ; osc rm $$f \
+ ; then echo osc rm -f $$f ; osc rm -f $$f \
; else echo osc add $$f ; osc add $$f \
; fi ; done }
osc status $(OSC_SRCDIR)/$(OSC_PROJECT)/$(OSC_PACKAGE)/
@@ -867,7 +870,8 @@ upload-sourceforge www:
(cd docs && $(MAKE) `basename $@`)
sdl testsdl test-sdl install-sdl :
- (cd SDL && $(MAKE) `basename $@`)
+ if test -z "$(SDL)"; then echo "skip $@ (no SDL)"; else \
+ (cd SDL && $(MAKE) `basename $@`) ; fi
check-test0 check-test1 check-zzdir check-zzcat \
check-zzxor check-zzxordir check-zzxorcat \
@@ -911,25 +915,25 @@ zzip64-install: zzip64-install.tmp
zzip64-install.tmp : zzip64-build.tmp
cd zzip64 && $(MAKE) install $(_RELEASEINFO64)
cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip64.so
- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip64.a
+ - cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip64.a
cd $(DESTDIR)$(libdir) && \
- sed -e 's/zzip.so/zzip64.so/' \
- -e 's/zzip.a/zzip64.a/' libzzip.la > libzzip64.la
+ sed -e 's/zzip.so/zzip64.so/' -e 's/zzip.a/zzip64.a/' \
+ libzzip.la > libzzip64.la
cd $(DESTDIR)$(libdir)/pkgconfig && \
sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \
- -e 's/-lzzip/-lzzip64/' \
- -e 's/zziplib/zziplib64/' zziplib.pc > zziplib64.pc
+ -e 's/-lzzip/-lzzip64/' -e 's/zziplib/zziplib64/' \
+ zziplib.pc > zziplib64.pc
zzip32-postinstall:
- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip32.so
- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip32.a
- cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
- cd $(DESTDIR)$(libdir) && ln -s libzzip32.a libzzip.a
+ cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip32.so
+ - cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip32.a
+ cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
+ - cd $(DESTDIR)$(libdir) && ln -s libzzip32.a libzzip.a
cd $(DESTDIR)$(libdir) && \
- sed -e 's/zzip.so/zzip32.so/' \
- -e 's/zzip.a/zzip32.a/' libzzip.la > libzzip32.la
+ sed -e 's/zzip.so/zzip32.so/' -e 's/zzip.a/zzip32.a/' \
+ libzzip.la > libzzip32.la
cd $(DESTDIR)$(libdir)/pkgconfig && \
- sed -e 's/-lzzip/-lzzip32/' \
- -e 's/zziplib/zziplib32/' zziplib.pc > zziplib32.pc
+ sed -e 's/-lzzip/-lzzip32/' -e 's/zziplib/zziplib32/' \
+ zziplib.pc > zziplib32.pc
zzip-postinstall:
: "the 12.8x and 11.8x and 10.8x packages are all the same actually"
cd $(DESTDIR)$(libdir) || exit 1 \
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/Makefile.mk b/Build/source/libs/zziplib/zziplib-0.13.60/Makefile.mk
index 2fad269481a..2fad269481a 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/Makefile.mk
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/Makefile.mk
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/README b/Build/source/libs/zziplib/zziplib-0.13.60/README
index 5668eda043a..5668eda043a 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/README
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/README
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/Makefile.am b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/Makefile.am
index 80a19f895d2..99dd540180f 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/Makefile.am
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/Makefile.am
@@ -10,8 +10,8 @@ check_PROGRAMS = zzcatsdl
zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c
ZZIP_CFLAGS= `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --cflags`
ZZIP_LIBS= `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --libs`
-SDL_CFLAGS= `pkg-config sdl --cflags`
-SDL_LIBS= `pkg-config sdl --libs`
+SDL_CFLAGS= `export PKG_CONFIG_PATH=.; pkg-config sdl --cflags`
+SDL_LIBS= `export PKG_CONFIG_PATH=.; pkg-config sdl --libs`
CFLAGS= -I$(srcdir) $(ZZIP_CFLAGS) $(SDL_CFLAGS)
LIBS= $(ZZIP_LIBS) $(SDL_LIBS)
@@ -26,6 +26,7 @@ testsdl test-sdl : test.zip zzcatsdl$(EXEEXT)
./zzcatsdl$(EXEEXT) test/README > test.out
diff -q @top_srcdir@/README test.out && rm test.out
+all: @SDL_GENERATE@
sdl : all
install-sdl : install-data # and not the binary
@@ -45,3 +46,12 @@ SDL_rwops_zzip.pc : Makefile
@ echo "Description: SDL_rwops for ZZipLib" >>$@
echo 'Requires: sdl, zziplib' >>$@
echo 'Cflags: -I$${zzipsdldir}' >>$@
+
+sdl-pc : sdl-uninstalled.pc
+sdl-uninstalled.pc : Makefile
+ @ echo "prefix=`sdl-config --prefix`" >$@
+ @ echo "Name: sdl" >>$@
+ @ echo "Version: `sdl-config --version`" >>$@
+ @ echo "Description: sdl - Simple DirectMedia Layer" >>$@
+ echo "Libs: `sdl-config --libs`" >> $@
+ echo "Cflags: `sdl-config --cflags`" >>$@
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/Makefile.in b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/Makefile.in
index 8e7c5a7d51e..8239e31db4f 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/Makefile.in
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -181,6 +181,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PAX = @PAX@
@@ -193,6 +194,7 @@ RANLIB = @RANLIB@
RELEASE_INFO = @RELEASE_INFO@
RESOLVES = @RESOLVES@
SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -278,8 +280,8 @@ EXTRA_DIST = $(sdl_DATA)
zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c
ZZIP_CFLAGS = `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --cflags`
ZZIP_LIBS = `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --libs`
-SDL_CFLAGS = `pkg-config sdl --cflags`
-SDL_LIBS = `pkg-config sdl --libs`
+SDL_CFLAGS = `export PKG_CONFIG_PATH=.; pkg-config sdl --cflags`
+SDL_LIBS = `export PKG_CONFIG_PATH=.; pkg-config sdl --libs`
CLEANFILES = *.pc *.omf
pkgconfig_HEADERS = SDL_rwops_zzip.pc
ERRNULL = 2>/dev/null
@@ -622,6 +624,7 @@ testsdl test-sdl : test.zip zzcatsdl$(EXEEXT)
./zzcatsdl$(EXEEXT) test/README > test.out
diff -q @top_srcdir@/README test.out && rm test.out
+all: @SDL_GENERATE@
sdl : all
install-sdl : install-data # and not the binary
@@ -635,6 +638,15 @@ SDL_rwops_zzip.pc : Makefile
echo 'Requires: sdl, zziplib' >>$@
echo 'Cflags: -I$${zzipsdldir}' >>$@
+sdl-pc : sdl-uninstalled.pc
+sdl-uninstalled.pc : Makefile
+ @ echo "prefix=`sdl-config --prefix`" >$@
+ @ echo "Name: sdl" >>$@
+ @ echo "Version: `sdl-config --version`" >>$@
+ @ echo "Description: sdl - Simple DirectMedia Layer" >>$@
+ echo "Libs: `sdl-config --libs`" >> $@
+ echo "Cflags: `sdl-config --cflags`" >>$@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzcat.c b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzcat.c
index d8706b1da29..d8706b1da29 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzcat.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzcat.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzip.c b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzip.c
index b273a811470..b273a811470 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzip.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzip.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzip.h b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzip.h
index 1a2d188de83..1a2d188de83 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzip.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzip.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzip.pc b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzip.pc
index 34d65b0b7de..433b19ee77e 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/SDL/SDL_rwops_zzip.pc
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/SDL/SDL_rwops_zzip.pc
@@ -2,7 +2,7 @@ prefix=/usr/local
zzipsdldir=/usr/local/include/SDL_rwops_zzip
Name: SDL_rwops_zzip
-Version: 0.13.59
+Version: 0.13.60
Description: SDL_rwops for ZZipLib
Requires: sdl, zziplib
Cflags: -I${zzipsdldir}
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/TODO b/Build/source/libs/zziplib/zziplib-0.13.60/TODO
index 1a408e4a12d..bda20cdc46d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/TODO
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/TODO
@@ -3,6 +3,10 @@ SHORTTERM
- most is multithreaded ... but zzip_dir_open (Thorsten Schöning)
- rboerdijk@ does also report errors on overlapping reads, another
one pointed to the usage of seek_set that may cause the problems
+- ubuntu packager added man.1 for the zz*-binaries, could be upstream.
+
+
+
WISHLIST
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/Makefile.am b/Build/source/libs/zziplib/zziplib-0.13.60/bins/Makefile.am
index a65b939f0ca..a65b939f0ca 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/Makefile.am
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/Makefile.am
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/Makefile.in b/Build/source/libs/zziplib/zziplib-0.13.60/bins/Makefile.in
index 737bae7aba0..8c17c16ea41 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/Makefile.in
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -231,6 +231,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PAX = @PAX@
@@ -243,6 +244,7 @@ RANLIB = @RANLIB@
RELEASE_INFO = @RELEASE_INFO@
RESOLVES = @RESOLVES@
SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzip-mem.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzip-mem.c
index 3f7d7f0631e..3f7d7f0631e 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzip-mem.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzip-mem.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzip.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzip.c
index ae8b3b97969..ae8b3b97969 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzip.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzip.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipcat-mem.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipcat-mem.c
index 7474854187e..7474854187e 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipcat-mem.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipcat-mem.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipcat-seeko.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipcat-seeko.c
index f16f0b96566..f16f0b96566 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipcat-seeko.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipcat-seeko.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipcat.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipcat.c
index 4282cb36be9..4282cb36be9 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipcat.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipcat.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipdir-mem.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipdir-mem.c
index dc020772309..dc020772309 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipdir-mem.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipdir-mem.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipdir.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipdir.c
index 3c570c5548f..3c570c5548f 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/unzzipdir.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/unzzipdir.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzcat.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzcat.c
index 27225820784..27225820784 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzcat.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzcat.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzdir.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzdir.c
index 5345f0852da..5345f0852da 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzdir.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzdir.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzip.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzip.c
index a1e990c3907..a1e990c3907 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzip.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzip.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zziplib.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zziplib.m4
index 4029ca546e3..4029ca546e3 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zziplib.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zziplib.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zziptest.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zziptest.c
index 2fde5d27bcf..2fde5d27bcf 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zziptest.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zziptest.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzobfuscated.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzobfuscated.c
index 352afc29a13..352afc29a13 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzobfuscated.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzobfuscated.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzxorcat.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzxorcat.c
index 97fcd51fd32..97fcd51fd32 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzxorcat.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzxorcat.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzxorcopy.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzxorcopy.c
index 1c06e534126..1c06e534126 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzxorcopy.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzxorcopy.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzxordir.c b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzxordir.c
index c1e1f141446..c1e1f141446 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/bins/zzxordir.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/bins/zzxordir.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/config.h.in b/Build/source/libs/zziplib/zziplib-0.13.60/config.h.in
index d649051b55b..1b66813f2d8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/config.h.in
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/config.h.in
@@ -113,6 +113,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/configure b/Build/source/libs/zziplib/zziplib-0.13.60/configure
index 7af8f4d8e85..55f51dee81c 100755
--- a/Build/source/libs/zziplib/zziplib-0.13.59/configure
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/configure
@@ -1,21 +1,25 @@
#! /bin/sh
# From configure.ac Revision: 1.15 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63.
+# Generated by GNU Autoconf 2.65.
+#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
# Guido Draheim <guido@gmx.de> for ZZipLib.SF.net
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -23,23 +27,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -47,7 +43,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -58,7 +60,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -81,13 +83,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -97,15 +92,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -117,12 +112,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -134,330 +133,299 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
else
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
+ if test "x$CONFIG_SHELL" != x; then :
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
fi
-
-
fi
-
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-exitcode=0
-if as_func_success; then
- :
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
else
- exitcode=1
- echo as_func_success failed.
-fi
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-if as_func_ret_success; then
- :
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_expr=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
fi
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf@gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -474,8 +442,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
@@ -485,29 +452,18 @@ test \$exitcode = 0") || {
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -537,7 +493,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -556,10 +512,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in
+ case $1 in #(
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -574,7 +530,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -723,7 +678,8 @@ fi
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -741,7 +697,6 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME=
@@ -749,6 +704,7 @@ PACKAGE_TARNAME=
PACKAGE_VERSION=
PACKAGE_STRING=
PACKAGE_BUGREPORT=
+PACKAGE_URL=
ac_unique_file="zziplib.spec"
# Factoring default headers for most tests.
@@ -798,6 +754,7 @@ PKG_CONFIG
RESOLVES
ZZIPLIB_LDFLAGS
ZIPTESTS
+SDL_GENERATE
SDL
ZLIB_VERSION
LARGEFILE_CFLAGS
@@ -925,6 +882,7 @@ bindir
program_transform_name
prefix
exec_prefix
+PACKAGE_URL
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
@@ -1075,8 +1033,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1102,8 +1059,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1307,8 +1263,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1324,8 +1279,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1355,17 +1309,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1382,15 +1336,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1413,8 +1365,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1444,11 +1395,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1487,13 +1436,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1642,13 +1589,14 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to the package provider.
_ACEOF
ac_status=$?
fi
@@ -1712,10 +1660,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
@@ -1723,12 +1670,418 @@ Guido Draheim <guido@gmx.de> for ZZipLib.SF.net
_ACEOF
exit
fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -1764,8 +2117,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
} >&5
@@ -1802,9 +2155,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1820,13 +2173,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -1851,13 +2204,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -1929,39 +2282,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
+
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
@@ -1979,8 +2334,8 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
@@ -1988,10 +2343,10 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1999,7 +2354,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -2014,11 +2369,11 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
@@ -2028,17 +2383,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
@@ -2050,35 +2405,20 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -2092,24 +2432,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_aux_dir=
for ac_dir in uses "$srcdir"/uses; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in uses \"$srcdir\"/uses" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in uses \"$srcdir\"/uses" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find install-sh, install.sh, or shtool in uses \"$srcdir\"/uses" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2125,35 +2457,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# =======================================================================
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
+if test "${ac_cv_build+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -2169,28 +2493,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
+if test "${ac_cv_host+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -2206,28 +2526,24 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then
+if test "${ac_cv_target+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "x$target_alias" = x; then
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-$as_echo "$as_me: error: invalid value of canonical target" >&2;}
- { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -2250,6 +2566,7 @@ test -n "$target_alias" &&
NONENONEs,x,x, &&
program_prefix=${target_alias}-
+
# [$]@ is unsable in 2.60+ but earlier autoconf had no ac_configure_args
if test "${ac_configure_args+set}" != "set" ; then
ac_configure_args=
@@ -2261,7 +2578,7 @@ test -n "$target_alias" &&
ax_enable_builddir="."
# Check whether --enable-builddir was given.
-if test "${enable_builddir+set}" = set; then
+if test "${enable_builddir+set}" = set; then :
enableval=$enable_builddir; ax_enable_builddir="$enableval"
else
ax_enable_builddir="yes"
@@ -2270,7 +2587,7 @@ fi
if test ".$ac_srcdir_defaulted" != ".no" ; then
if test ".$srcdir" = ".." ; then
if test -f config.status ; then
- { $as_echo "$as_me:$LINENO: toplevel srcdir already configured... skipping subdir build" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: toplevel srcdir already configured... skipping subdir build" >&5
$as_echo "$as_me: toplevel srcdir already configured... skipping subdir build" >&6;}
else
test ".$ax_enable_builddir" = "." && ax_enable_builddir="."
@@ -2278,57 +2595,15 @@ $as_echo "$as_me: toplevel srcdir already configured... skipping subdir build" >
test ".$BUILD" = "." && BUILD=`uname -msr | tr " /" "__"`.d
test ".$ax_enable_builddir" = ".yes" && ax_enable_builddir="$BUILD"
if test ".$ax_enable_builddir" != ".." ; then # we know where to go and
- { as_dir=$ax_enable_builddir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir=$ax_enable_builddir; as_fn_mkdir_p
echo __.$ax_enable_builddir.__ > $ax_enable_builddir/conftest.tmp
cd $ax_enable_builddir
if grep __.$ax_enable_builddir.__ conftest.tmp >/dev/null 2>/dev/null ; then
rm conftest.tmp
- { $as_echo "$as_me:$LINENO: result: continue configure in default builddir \"./$ax_enable_builddir\"" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: continue configure in default builddir \"./$ax_enable_builddir\"" >&5
$as_echo "continue configure in default builddir \"./$ax_enable_builddir\"" >&6; }
else
- { { $as_echo "$as_me:$LINENO: error: could not change to default builddir \"./$ax_enable_builddir\"" >&5
-$as_echo "$as_me: error: could not change to default builddir \"./$ax_enable_builddir\"" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not change to default builddir \"./$ax_enable_builddir\"" "$LINENO" 5
fi
srcdir=`echo "$ax_enable_builddir" |
sed -e 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g;s,[/]$,,;'`
@@ -2337,7 +2612,7 @@ $as_echo "$as_me: error: could not change to default builddir \"./$ax_enable_bui
test -f $srcdir/confdefs.h && mv $srcdir/confdefs.h .
test -f $srcdir/conftest.log && mv $srcdir/conftest.log .
test -f $srcdir/$cache_file && mv $srcdir/$cache_file .
- { $as_echo "$as_me:$LINENO: result: ....exec $SHELL \"$srcdir/$0\" \"--srcdir=$srcdir\" \"--enable-builddir=$ax_enable_builddir\" $ac_configure_args" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ....exec $SHELL \"$srcdir/$0\" \"--srcdir=$srcdir\" \"--enable-builddir=$ax_enable_builddir\" $ac_configure_args" >&5
$as_echo "....exec $SHELL \"$srcdir/$0\" \"--srcdir=$srcdir\" \"--enable-builddir=$ax_enable_builddir\" $ac_configure_args" >&6; }
case "$0" in # restart
/\\*) eval $SHELL "'$0'" "'--srcdir=$srcdir'" "'--enable-builddir=$ax_enable_builddir'" $ac_configure_args ;;
@@ -2348,9 +2623,9 @@ $as_echo "....exec $SHELL \"$srcdir/$0\" \"--srcdir=$srcdir\" \"--enable-builddi
fi fi
# Extract the first word of "gsed sed", so it can be a program name with args.
set dummy gsed sed; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ax_enable_builddir_sed+set}" = set; then
+if test "${ac_cv_path_ax_enable_builddir_sed+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ax_enable_builddir_sed in
@@ -2363,14 +2638,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ax_enable_builddir_sed="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_ax_enable_builddir_sed" && ac_cv_path_ax_enable_builddir_sed="sed"
@@ -2379,10 +2654,10 @@ esac
fi
ax_enable_builddir_sed=$ac_cv_path_ax_enable_builddir_sed
if test -n "$ax_enable_builddir_sed"; then
- { $as_echo "$as_me:$LINENO: result: $ax_enable_builddir_sed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_enable_builddir_sed" >&5
$as_echo "$ax_enable_builddir_sed" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -2393,7 +2668,7 @@ ac_config_commands="$ac_config_commands buildir"
case "$prefix:$ac_default_prefix" in
NONE:/usr/local)
result=""
- { $as_echo "$as_me:$LINENO: checking default prefix path" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking default prefix path" >&5
$as_echo_n "checking default prefix path... " >&6; }
case "${target_os}" in
*cygwin* | *mingw* | *uwin* | *djgpp | *emx* )
@@ -2415,11 +2690,11 @@ $as_echo_n "checking default prefix path... " >&6; }
fi
;;
esac
- { $as_echo "$as_me:$LINENO: result: $ac_default_prefix $result" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_default_prefix $result" >&5
$as_echo "$ac_default_prefix $result" >&6; }
;;
esac
-{ $as_echo "$as_me:$LINENO: checking default prefix system" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default prefix system" >&5
$as_echo_n "checking default prefix system... " >&6; }
result="$prefix" ; test "$result" = "NONE" && result="$ac_default_prefix"
case ${result} in
@@ -2476,13 +2751,13 @@ case ${result} in
|sed -e 's:^..prefix./com$:${sysconfdir}/default:'`
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
$as_echo "$result" >&6; }
# --------------------------------------------------------
# -----------------------------------------------------------------------
# Check whether --enable-thread-safe was given.
-if test "${enable_thread_safe+set}" = set; then
+if test "${enable_thread_safe+set}" = set; then :
enableval=$enable_thread_safe;
else
enable_thread_safe="yes"
@@ -2493,18 +2768,18 @@ test "$enable_thread_safe" = "yes" && THREAD_SAFE="-thread-safe"
test "$enable_thread_safe" = "$host_os" && THREAD_SAFE="-thread-safe"
if test -n "$THREAD_SAFE" ; then
- { $as_echo "$as_me:$LINENO: result: ...using thread-safe linkage" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...using thread-safe linkage" >&5
$as_echo "...using thread-safe linkage" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: disabled thread-safe linkage" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled thread-safe linkage" >&5
$as_echo "disabled thread-safe linkage" >&6; }
fi
# ----------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: checking zlib install prefix" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking zlib install prefix" >&5
$as_echo_n "checking zlib install prefix... " >&6; }
# Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then
+if test "${with_zlib+set}" = set; then :
withval=$with_zlib;
else
with_zlib="no"
@@ -2512,45 +2787,39 @@ fi
if test "${with_zlib}" = yes ; then # choose --prefix paths
if test "${prefix}" = NONE ; then
- { $as_echo "$as_me:$LINENO: result: oops, but only itself..." >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: oops, but only itself..." >&5
$as_echo "oops, but only itself..." >&6; }
- { { $as_echo "$as_me:$LINENO: error: --with-zlib requires a path argument or a --prefix path set" >&5
-$as_echo "$as_me: error: --with-zlib requires a path argument or a --prefix path set" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "--with-zlib requires a path argument or a --prefix path set" "$LINENO" 5
fi
with_zlib="$prefix"
fi
case ".$with_zlib" in
.no|.no,*)
- { $as_echo "$as_me:$LINENO: result: none" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
$as_echo "none" >&6; }
with_zlib="no, not configured" ;;
./usr)
- { $as_echo "$as_me:$LINENO: result: oops, ignored (may try --with-zlib=/usr/.)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: oops, ignored (may try --with-zlib=/usr/.)" >&5
$as_echo "oops, ignored (may try --with-zlib=/usr/.)" >&6; }
with_zlib="no, /usr ignored" ;;
*) if test ! -d "$with_zlib/include" ; then
- { $as_echo "$as_me:$LINENO: result: oops, given but..." >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: oops, given but..." >&5
$as_echo "oops, given but..." >&6; }
- { { $as_echo "$as_me:$LINENO: error: \"$with_zlib/include\" is not a directory" >&5
-$as_echo "$as_me: error: \"$with_zlib/include\" is not a directory" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "\"$with_zlib/include\" is not a directory" "$LINENO" 5
fi
if test ! -d "$with_zlib/lib" ; then
- { $as_echo "$as_me:$LINENO: result: oops, given but..." >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: oops, given but..." >&5
$as_echo "oops, given but..." >&6; }
- { { $as_echo "$as_me:$LINENO: error: \"$with_zlib/lib\" is not a directory" >&5
-$as_echo "$as_me: error: \"$with_zlib/lib\" is not a directory" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "\"$with_zlib/lib\" is not a directory" "$LINENO" 5
fi
- { $as_echo "$as_me:$LINENO: result: $with_zlib" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_zlib" >&5
$as_echo "$with_zlib" >&6; }
ZLIB_INCL="-I$with_zlib/include"
ZLIB_LDIR="-L$with_zlib/lib"
- { $as_echo "$as_me:$LINENO: result: ..adding CPPFLAGS $ZLIB_INCL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ..adding CPPFLAGS $ZLIB_INCL" >&5
$as_echo "..adding CPPFLAGS $ZLIB_INCL" >&6; }
- { $as_echo "$as_me:$LINENO: result: ..adding LDFLAGS $ZLIB_LDIR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ..adding LDFLAGS $ZLIB_LDIR" >&5
$as_echo "..adding LDFLAGS $ZLIB_LDIR" >&6; }
CPPFLAGS="$CPPFLAGS $ZLIB_INCL"
LDFLAGS="$LDFLAGS $ZLIB_LDIR"
@@ -2560,7 +2829,7 @@ esac
# -----------------------------------------------------------------------
- { $as_echo "$as_me:$LINENO: checking rpm spec file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking rpm spec file" >&5
$as_echo_n "checking rpm spec file... " >&6; }
if test "." != "." ; then
ax_spec_file_=""
@@ -2599,17 +2868,15 @@ EOF
./*) if test "$ax_spec_file" = "./$ax_spec_file_" ; then
ax_spec_file="$ax_spec_file_"
fi
- { $as_echo "$as_me:$LINENO: result: $ax_spec_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_spec_file" >&5
$as_echo "$ax_spec_file" >&6; } ;;
- */*) { $as_echo "$as_me:$LINENO: result: $ax_spec_file" >&5
+ */*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_spec_file" >&5
$as_echo "$ax_spec_file" >&6; } ;;
- *) { { $as_echo "$as_me:$LINENO: error: no rpm spec file found" >&5
-$as_echo "$as_me: error: no rpm spec file found" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *) as_fn_error "no rpm spec file found" "$LINENO" 5 ;;
esac
- { $as_echo "$as_me:$LINENO: checking for spec package" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spec package" >&5
$as_echo_n "checking for spec package... " >&6; }
if test ".$PACKAGE_NAME" = "." ; then if test ! -f $ax_spec_file
then k="(w/o spec)"
@@ -2643,10 +2910,10 @@ $as_echo_n "checking for spec package... " >&6; }
test ".$PACKAGE_NAME" = ".TODO" && PACKAGE_NAME="foo"
test "PACKAGE_NAME" = "PACKAGE_NAME" && test ".$PACKAGE" = "." && PACKAGE="$PACKAGE_NAME"
- { $as_echo "$as_me:$LINENO: result: $PACKAGE_NAME $k" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_NAME $k" >&5
$as_echo "$PACKAGE_NAME $k" >&6; }
- { $as_echo "$as_me:$LINENO: checking for spec version" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spec version" >&5
$as_echo_n "checking for spec version... " >&6; }
if test ".$PACKAGE_VERSION" = "." ; then if test ! -f $ax_spec_file
then k="(w/o spec)"
@@ -2686,10 +2953,10 @@ $as_echo_n "checking for spec version... " >&6; }
*) PACKAGE_VERSION=`$as_echo "$PACKAGE_VERSION" | $as_tr_sh` ; PACKAGE_VERSION="$PACKAGE_VERSION.`date +%y.%W%w`" ;;
esac
PACKAGE_VERSION=`echo $PACKAGE_VERSION | sed -e "s/[.]0\\(0-9\\)/.\\1/g"`
- { $as_echo "$as_me:$LINENO: result: $PACKAGE_VERSION $k" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_VERSION $k" >&5
$as_echo "$PACKAGE_VERSION $k" >&6; }
- { $as_echo "$as_me:$LINENO: checking for spec license type" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spec license type" >&5
$as_echo_n "checking for spec license type... " >&6; }
if test ".$PACKAGE_LICENSE" = "." ; then if test ! -f $ax_spec_file
then k="(w/o spec)"
@@ -2749,10 +3016,10 @@ $as_echo_n "checking for spec license type... " >&6; }
test "$PACKAGE_LICENSE" = "GPL" && PACKAGE_LICENSE="GNU GPL"
test "$PACKAGE_LICENSE" = "LGPL" && PACKAGE_LICENSE="GNU LGPL"
- { $as_echo "$as_me:$LINENO: result: $PACKAGE_LICENSE $k" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_LICENSE $k" >&5
$as_echo "$PACKAGE_LICENSE $k" >&6; }
- { $as_echo "$as_me:$LINENO: checking for spec summary" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spec summary" >&5
$as_echo_n "checking for spec summary... " >&6; }
if test ".$PACKAGE_SUMMARY" = "." ; then if test ! -f $ax_spec_file
then k="(w/o spec)"
@@ -2785,10 +3052,10 @@ $as_echo_n "checking for spec summary... " >&6; }
test ".$ltmain" != "." && PACKAGE_SUMMARY="$PACKAGE_SUMMARY library"
fi
- { $as_echo "$as_me:$LINENO: result: $PACKAGE_SUMMARY $k" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_SUMMARY $k" >&5
$as_echo "$PACKAGE_SUMMARY $k" >&6; }
- { $as_echo "$as_me:$LINENO: checking for spec category" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spec category" >&5
$as_echo_n "checking for spec category... " >&6; }
if test ".$PACKAGE_CATEGORY" = "." ; then if test ! -f $ax_spec_file
then k="(w/o spec)"
@@ -2822,10 +3089,10 @@ $as_echo_n "checking for spec category... " >&6; }
else PACKAGE_CATEGORY="Development/Other"
fi fi
- { $as_echo "$as_me:$LINENO: result: $PACKAGE_CATEGORY $k" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_CATEGORY $k" >&5
$as_echo "$PACKAGE_CATEGORY $k" >&6; }
- { $as_echo "$as_me:$LINENO: checking for spec icon" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spec icon" >&5
$as_echo_n "checking for spec icon... " >&6; }
if test ".$PACKAGE_ICON" = "." ; then if test ! -f $ax_spec_file
then k="(w/o spec)"
@@ -2855,7 +3122,7 @@ $as_echo_n "checking for spec icon... " >&6; }
test ".$PACKAGE_ICON" = "." && k="(fallback)"
if test ".$PACKAGE_ICON" = "." ; then PACKAGE_ICON="$PACKAGE-icon.png" ; fi
- { $as_echo "$as_me:$LINENO: result: $PACKAGE_ICON $k" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_ICON $k" >&5
$as_echo "$PACKAGE_ICON $k" >&6; }
@@ -2875,10 +3142,10 @@ am__api_version='1.11'
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+if test "${ac_cv_path_install+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2886,11 +3153,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2927,7 +3194,7 @@ case $as_dir/ in
;;
esac
-done
+ done
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
@@ -2943,7 +3210,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2954,7 +3221,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
@@ -2965,15 +3232,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2995,11 +3258,8 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
+alias in your environment" "$LINENO" 5
fi
test "$2" = conftest.file
@@ -3008,13 +3268,10 @@ then
# Ok.
:
else
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -3042,7 +3299,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -3063,9 +3320,9 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -3076,24 +3333,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
$as_echo "$STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3103,9 +3360,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -3116,24 +3373,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
$as_echo "$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3142,7 +3399,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3155,10 +3412,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
+ if test "${ac_cv_path_mkdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3166,7 +3423,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
+ for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -3178,11 +3435,12 @@ do
esac
done
done
-done
+ done
IFS=$as_save_IFS
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -3190,11 +3448,10 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
@@ -3207,9 +3464,9 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
+if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -3220,24 +3477,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
$as_echo "$AWK" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3245,11 +3502,11 @@ fi
test -n "$AWK" && break
done
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -3267,11 +3524,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -3291,9 +3548,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -3357,9 +3612,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3370,24 +3625,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3397,9 +3652,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3410,24 +3665,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3436,7 +3691,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3450,9 +3705,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3463,24 +3718,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3490,9 +3745,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3504,18 +3759,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -3534,10 +3789,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3549,9 +3804,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3562,24 +3817,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3593,9 +3848,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3606,24 +3861,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -3636,7 +3891,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -3647,57 +3902,37 @@ fi
fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3713,8 +3948,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -3730,17 +3965,17 @@ do
done
rm -f $ac_rmfiles
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -3757,7 +3992,7 @@ do
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -3776,84 +4011,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
else
ac_file=''
fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
- $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
- fi
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3868,32 +4061,83 @@ for ac_file in conftest.exe conftest conftest.*; do
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3905,17 +4149,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
@@ -3928,31 +4172,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -3966,37 +4202,16 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
@@ -4005,20 +4220,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4029,35 +4240,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4068,36 +4255,12 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
- ac_c_werror_flag=$ac_save_c_werror_flag
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4108,42 +4271,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -4160,18 +4298,14 @@ else
CFLAGS=
fi
fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -4228,32 +4362,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_c89=$ac_arg
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -4264,17 +4375,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
$as_echo "none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -4293,7 +4406,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
@@ -4321,12 +4434,12 @@ if test "$am__include" = "#"; then
fi
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
fi
@@ -4346,9 +4459,9 @@ fi
depcc="$CC" am_compiler_list=
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4456,7 +4569,7 @@ else
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -4471,98 +4584,6 @@ else
fi
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- rm -rf conftest.one conftest.two conftest.dir
- echo one > conftest.one
- echo two > conftest.two
- mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
- test -s conftest.one && test -s conftest.two &&
- test -s conftest.dir/conftest.one &&
- test -s conftest.dir/conftest.two
- then
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- fi
- done
- done
- ;;
-esac
-
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
enable_win32_dll=yes
@@ -4571,9 +4592,9 @@ case $host in
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AS+set}" = set; then
+if test "${ac_cv_prog_AS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
@@ -4584,24 +4605,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AS="${ac_tool_prefix}as"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AS=$ac_cv_prog_AS
if test -n "$AS"; then
- { $as_echo "$as_me:$LINENO: result: $AS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
$as_echo "$AS" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4611,9 +4632,9 @@ if test -z "$ac_cv_prog_AS"; then
ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
@@ -4624,24 +4645,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AS="as"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_AS=$ac_cv_prog_ac_ct_AS
if test -n "$ac_ct_AS"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
$as_echo "$ac_ct_AS" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4650,7 +4671,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -4663,9 +4684,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
@@ -4676,24 +4697,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
DLLTOOL=$ac_cv_prog_DLLTOOL
if test -n "$DLLTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
$as_echo "$DLLTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4703,9 +4724,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
@@ -4716,24 +4737,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
if test -n "$ac_ct_DLLTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
$as_echo "$ac_ct_DLLTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4742,7 +4763,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -4755,9 +4776,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -4768,24 +4789,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OBJDUMP=$ac_cv_prog_OBJDUMP
if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
$as_echo "$OBJDUMP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4795,9 +4816,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -4808,24 +4829,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
if test -n "$ac_ct_OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
$as_echo "$ac_ct_OBJDUMP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -4834,7 +4855,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -4869,7 +4890,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
case `pwd` in
*\ * | *\ *)
- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
@@ -4892,9 +4913,9 @@ macro_revision='1.3012'
ltmain="$ac_aux_dir/ltmain.sh"
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+if test "${ac_cv_path_SED+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -4902,7 +4923,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- $as_unset ac_script || ac_script=
+ { ac_script=; unset ac_script;}
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
@@ -4911,7 +4932,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
+ for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
@@ -4931,7 +4952,7 @@ case `"$ac_path_SED" --version 2>&1` in
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
@@ -4946,19 +4967,17 @@ esac
$ac_path_SED_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
@@ -4976,9 +4995,9 @@ Xsed="$SED -e 1s/^X//"
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -4989,7 +5008,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
+ for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -5009,7 +5028,7 @@ case `"$ac_path_GREP" --version 2>&1` in
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
@@ -5024,26 +5043,24 @@ esac
$ac_path_GREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5057,7 +5074,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
+ for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -5077,7 +5094,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
@@ -5092,12 +5109,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -5105,14 +5120,14 @@ fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then
+if test "${ac_cv_path_FGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -5126,7 +5141,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in fgrep; do
+ for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
@@ -5146,7 +5161,7 @@ case `"$ac_path_FGREP" --version 2>&1` in
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
@@ -5161,12 +5176,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
-done
+ done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -5174,7 +5187,7 @@ fi
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
@@ -5200,7 +5213,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
@@ -5209,7 +5222,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
@@ -5239,13 +5252,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
;;
esac
elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -5276,18 +5289,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -5300,7 +5311,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -5312,9 +5323,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
+if test "${lt_cv_path_NM+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -5361,7 +5372,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
@@ -5372,9 +5383,9 @@ else
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -5385,24 +5396,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
DUMPBIN=$ac_cv_prog_DUMPBIN
if test -n "$DUMPBIN"; then
- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
$as_echo "$DUMPBIN" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5416,9 +5427,9 @@ if test -z "$DUMPBIN"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
@@ -5429,24 +5440,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
if test -n "$ac_ct_DUMPBIN"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
$as_echo "$ac_ct_DUMPBIN" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5459,7 +5470,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -5479,44 +5490,44 @@ test -z "$NM" && NM=nm
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then
+if test "${lt_cv_nm_interface+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5489: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5500: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5492: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5503: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5495: output\"" >&5)
+ (eval echo "\"\$as_me:5506: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
fi
rm -f conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
$as_echo "$lt_cv_nm_interface" >&6; }
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
$as_echo "no, using $LN_S" >&6; }
fi
# find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
$as_echo_n "(cached) " >&6
else
i=0
@@ -5634,10 +5645,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: none" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
@@ -5651,7 +5662,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
@@ -5661,17 +5672,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
$as_echo "$xsi_shell" >&6; }
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
lt_shell_append=no
( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
>/dev/null 2>&1 \
&& lt_shell_append=yes
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
$as_echo "$lt_shell_append" >&6; }
@@ -5706,14 +5717,14 @@ esac
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
@@ -5742,9 +5753,9 @@ esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -5755,24 +5766,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OBJDUMP=$ac_cv_prog_OBJDUMP
if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
$as_echo "$OBJDUMP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5782,9 +5793,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -5795,24 +5806,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
if test -n "$ac_ct_OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
$as_echo "$ac_ct_OBJDUMP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -5821,7 +5832,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -5838,9 +5849,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -6034,7 +6045,7 @@ tpf*)
esac
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
@@ -6054,9 +6065,9 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
+if test "${ac_cv_prog_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -6067,24 +6078,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- { $as_echo "$as_me:$LINENO: result: $AR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
$as_echo "$AR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6094,9 +6105,9 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -6107,24 +6118,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
$as_echo "$ac_ct_AR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6133,7 +6144,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -6159,9 +6170,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -6172,24 +6183,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
$as_echo "$STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6199,9 +6210,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -6212,24 +6223,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
$as_echo "$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6238,7 +6249,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -6258,9 +6269,9 @@ test -z "$STRIP" && STRIP=:
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -6271,24 +6282,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
$as_echo "$RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6298,9 +6309,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -6311,24 +6322,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
$as_echo "$ac_ct_RANLIB" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6337,7 +6348,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -6415,9 +6426,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -6533,18 +6544,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$nlist"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -6597,11 +6608,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
@@ -6635,10 +6646,10 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { $as_echo "$as_me:$LINENO: result: failed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
$as_echo "failed" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: ok" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
fi
@@ -6665,7 +6676,7 @@ fi
# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
+if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
@@ -6677,11 +6688,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
@@ -6695,12 +6706,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6698 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ echo '#line 6709 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
@@ -6734,11 +6745,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -6787,9 +6798,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_ext=c
@@ -6798,11 +6809,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -6813,38 +6820,13 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_cc_needs_belf=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_cc_needs_belf=no
+ lt_cv_cc_needs_belf=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6852,7 +6834,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -6862,11 +6844,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
@@ -6892,9 +6874,9 @@ need_locks="$enable_libtool_lock"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
@@ -6905,24 +6887,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
$as_echo "$DSYMUTIL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6932,9 +6914,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
@@ -6945,24 +6927,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
$as_echo "$ac_ct_DSYMUTIL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6971,7 +6953,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -6984,9 +6966,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
@@ -6997,24 +6979,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
$as_echo "$NMEDIT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7024,9 +7006,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
@@ -7037,24 +7019,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
$as_echo "$ac_ct_NMEDIT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7063,7 +7045,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7076,9 +7058,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then
+if test "${ac_cv_prog_LIPO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
@@ -7089,24 +7071,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
LIPO=$ac_cv_prog_LIPO
if test -n "$LIPO"; then
- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
$as_echo "$LIPO" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7116,9 +7098,9 @@ if test -z "$ac_cv_prog_LIPO"; then
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
@@ -7129,24 +7111,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LIPO="lipo"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
if test -n "$ac_ct_LIPO"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
$as_echo "$ac_ct_LIPO" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7155,7 +7137,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7168,9 +7150,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
@@ -7181,24 +7163,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OTOOL=$ac_cv_prog_OTOOL
if test -n "$OTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
$as_echo "$OTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7208,9 +7190,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
@@ -7221,24 +7203,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL="otool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
if test -n "$ac_ct_OTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
$as_echo "$ac_ct_OTOOL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7247,7 +7229,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7260,9 +7242,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
@@ -7273,24 +7255,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
OTOOL64=$ac_cv_prog_OTOOL64
if test -n "$OTOOL64"; then
- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
$as_echo "$OTOOL64" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7300,9 +7282,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
@@ -7313,24 +7295,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
fi
fi
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
if test -n "$ac_ct_OTOOL64"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
$as_echo "$ac_ct_OTOOL64" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7339,7 +7321,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7375,9 +7357,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
@@ -7402,22 +7384,18 @@ else
rm -f conftest.*
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
echo "_main" > conftest.sym
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -7428,42 +7406,17 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_ld_exported_symbols_list=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- lt_cv_ld_exported_symbols_list=no
+ lt_cv_ld_exported_symbols_list=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
@@ -7505,14 +7458,14 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -7527,11 +7480,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -7540,78 +7489,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
break
fi
@@ -7623,7 +7528,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -7634,11 +7539,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -7647,87 +7548,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+if $ac_preproc_ok; then :
+
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -7737,16 +7591,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -7761,48 +7611,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -7812,18 +7637,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -7833,14 +7654,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -7867,118 +7684,34 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7988,62 +7721,13 @@ fi
done
-
for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DLFCN_H 1
_ACEOF
fi
@@ -8061,7 +7745,7 @@ done
# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
+if test "${enable_shared+set}" = set; then :
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
@@ -8092,7 +7776,7 @@ fi
# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
+if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
@@ -8124,7 +7808,7 @@ fi
# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
+if test "${with_pic+set}" = set; then :
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
@@ -8140,7 +7824,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
+if test "${enable_fast_install+set}" = set; then :
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
@@ -8221,9 +7905,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then
+if test "${lt_cv_objdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
@@ -8236,7 +7920,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
@@ -8329,9 +8013,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -8382,10 +8066,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8395,9 +8079,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
- { $as_echo "$as_me:$LINENO: checking for file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -8448,10 +8132,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8532,9 +8216,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
@@ -8550,11 +8234,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8553: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8237: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8557: \$? = $ac_status" >&5
+ echo "$as_me:8241: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8567,7 +8251,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
@@ -8587,7 +8271,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
@@ -8859,7 +8543,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
$as_echo "$lt_prog_compiler_pic" >&6; }
@@ -8871,9 +8555,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
@@ -8889,11 +8573,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8892: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8576: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8896: \$? = $ac_status" >&5
+ echo "$as_me:8580: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8906,7 +8590,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
@@ -8930,9 +8614,9 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
@@ -8958,7 +8642,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
@@ -8973,9 +8657,9 @@ fi
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -8994,11 +8678,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8997: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8681: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9001: \$? = $ac_status" >&5
+ echo "$as_me:8685: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9020,7 +8704,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
@@ -9028,9 +8712,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -9049,11 +8733,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9052: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8736: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9056: \$? = $ac_status" >&5
+ echo "$as_me:8740: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9075,7 +8759,7 @@ else
$RM conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
@@ -9084,7 +8768,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
@@ -9092,10 +8776,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
if test "$hard_links" = no; then
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
@@ -9108,7 +8792,7 @@ fi
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
@@ -9550,11 +9234,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -9565,27 +9245,7 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -9599,16 +9259,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -9621,11 +9274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -9636,27 +9285,7 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -9670,16 +9299,9 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -9891,42 +9513,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
int foo(void) {}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -10182,7 +9778,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
@@ -10219,16 +9815,16 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
$RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
@@ -10242,11 +9838,11 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
then
archive_cmds_need_lc=no
else
@@ -10257,7 +9853,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
cat conftest.err 1>&5
fi
$RM conftest*
- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
@@ -10421,7 +10017,7 @@ esac
- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
@@ -10843,11 +10439,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -10858,41 +10450,13 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+if ac_fn_c_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
shlibpath_overrides_runpath=yes
fi
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
@@ -11104,7 +10668,7 @@ uts4*)
dynamic_linker=no
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -11206,7 +10770,7 @@ fi
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
@@ -11231,7 +10795,7 @@ else
# directories.
hardcode_action=unsupported
fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
@@ -11276,18 +10840,14 @@ else
darwin*)
# if libdl is installed we need to link against it
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -11305,43 +10865,18 @@ return dlopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -11354,106 +10889,18 @@ fi
;;
*)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_shl_load=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
lt_cv_dlopen="shl_load"
else
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -11471,145 +10918,32 @@ return shl_load ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dld_shl_load=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -11627,57 +10961,28 @@ return dlopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -11695,57 +11000,28 @@ return dlopen ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_svld_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_svld_dlopen=no
+ ac_cv_lib_svld_dlopen=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -11763,43 +11039,18 @@ return dld_link ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dld_dld_link=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_dld_link=no
+ ac_cv_lib_dld_dld_link=no
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -11838,9 +11089,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
+if test "${lt_cv_dlopen_self+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -11849,7 +11100,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11852 "configure"
+#line 11103 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11908,11 +11159,11 @@ int main ()
return status;
}
_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11929,14 +11180,14 @@ rm -fr conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
$as_echo "$lt_cv_dlopen_self" >&6; }
if test "x$lt_cv_dlopen_self" = xyes; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -11945,7 +11196,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11948 "configure"
+#line 11199 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12004,11 +11255,11 @@ int main ()
return status;
}
_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -12025,7 +11276,7 @@ rm -fr conftest*
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
@@ -12064,12 +11315,12 @@ fi
striplib=
old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
@@ -12078,15 +11329,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
;;
*)
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
;;
esac
@@ -12104,12 +11355,12 @@ fi
# Report which library types will actually be built
- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
$as_echo "$can_build_shared" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
@@ -12130,14 +11381,14 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
fi
;;
esac
- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
$as_echo "$enable_shared" >&6; }
- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
test "$enable_shared" = yes || enable_static=yes
- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
$as_echo "$enable_static" >&6; }
@@ -12173,7 +11424,7 @@ CC="$lt_save_CC"
test ".$PACKAGE_VERSION" = "." && PACKAGE_VERSION="$VERSION"
-{ $as_echo "$as_me:$LINENO: checking out linker version info $PACKAGE_VERSION " >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking out linker version info $PACKAGE_VERSION " >&5
$as_echo_n "checking out linker version info $PACKAGE_VERSION ... " >&6; }
MINOR_VERSION=`echo $PACKAGE_VERSION`
MAJOR_VERSION=`echo "$MINOR_VERSION" | sed -e 's/[.].*//'`
@@ -12189,14 +11440,14 @@ $as_echo_n "checking out linker version info $PACKAGE_VERSION ... " >&6; }
MINOR_VERSION=`echo "$MINOR_VERSION" | sed -e 's/[^0-9].*//'`
RELEASE_INFO="-release $MAJOR_VERSION"
VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION"
-{ $as_echo "$as_me:$LINENO: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
$as_echo "/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6; }
# -----------------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: result: creating zzip/_msvc.in via zzip/_msvc.sed of config.h.in" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: creating zzip/_msvc.in via zzip/_msvc.sed of config.h.in" >&5
$as_echo "creating zzip/_msvc.in via zzip/_msvc.sed of config.h.in" >&6; }
test -d zzip || mkdir zzip
sed -f $srcdir/zzip/_msvc.sed $srcdir/config.h.in >zzip/_msvc.in
@@ -12207,16 +11458,16 @@ ac_config_headers="$ac_config_headers config.h"
ac_config_commands="$ac_config_commands zzip/_msvc.h"
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
else
USE_MAINTAINER_MODE=no
fi
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
@@ -12235,7 +11486,7 @@ fi
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-{ $as_echo "$as_me:$LINENO: checking our pkgconfig libname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our pkgconfig libname" >&5
$as_echo_n "checking our pkgconfig libname... " >&6; }
test ".$ax_create_pkgconfig_libname" != "." || \
ax_create_pkgconfig_libname="`basename zzip/zziplib.pc .pc`"
@@ -12243,10 +11494,10 @@ test ".$ax_create_pkgconfig_libname" != "." || \
ax_create_pkgconfig_libname="$PACKAGE"
ax_create_pkgconfig_libname=`eval echo "$ax_create_pkgconfig_libname"`
ax_create_pkgconfig_libname=`eval echo "$ax_create_pkgconfig_libname"`
-{ $as_echo "$as_me:$LINENO: result: $ax_create_pkgconfig_libname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_create_pkgconfig_libname" >&5
$as_echo "$ax_create_pkgconfig_libname" >&6; }
-{ $as_echo "$as_me:$LINENO: checking our pkgconfig version" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our pkgconfig version" >&5
$as_echo_n "checking our pkgconfig version... " >&6; }
test ".$ax_create_pkgconfig_version" != "." || \
ax_create_pkgconfig_version="${PACKAGE_VERSION}"
@@ -12254,85 +11505,85 @@ test ".$ax_create_pkgconfig_version" != "." || \
ax_create_pkgconfig_version="$VERSION"
ax_create_pkgconfig_version=`eval echo "$ax_create_pkgconfig_version"`
ax_create_pkgconfig_version=`eval echo "$ax_create_pkgconfig_version"`
-{ $as_echo "$as_me:$LINENO: result: $ax_create_pkgconfig_version" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_create_pkgconfig_version" >&5
$as_echo "$ax_create_pkgconfig_version" >&6; }
-{ $as_echo "$as_me:$LINENO: checking our pkgconfig_libdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our pkgconfig_libdir" >&5
$as_echo_n "checking our pkgconfig_libdir... " >&6; }
test ".$pkgconfig_libdir" = "." && \
pkgconfig_libdir='${libdir}/pkgconfig'
ax_create_pkgconfig_libdir=`eval echo "$pkgconfig_libdir"`
ax_create_pkgconfig_libdir=`eval echo "$ax_create_pkgconfig_libdir"`
ax_create_pkgconfig_libdir=`eval echo "$ax_create_pkgconfig_libdir"`
-{ $as_echo "$as_me:$LINENO: result: $pkgconfig_libdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pkgconfig_libdir" >&5
$as_echo "$pkgconfig_libdir" >&6; }
test "$pkgconfig_libdir" != "$ax_create_pkgconfig_libdir" && (
-{ $as_echo "$as_me:$LINENO: result: expanded our pkgconfig_libdir... $ax_create_pkgconfig_libdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: expanded our pkgconfig_libdir... $ax_create_pkgconfig_libdir" >&5
$as_echo "expanded our pkgconfig_libdir... $ax_create_pkgconfig_libdir" >&6; })
-{ $as_echo "$as_me:$LINENO: checking our pkgconfig_libfile" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our pkgconfig_libfile" >&5
$as_echo_n "checking our pkgconfig_libfile... " >&6; }
test ".$pkgconfig_libfile" != "." || \
pkgconfig_libfile="`basename zzip/zziplib.pc`"
ax_create_pkgconfig_libfile=`eval echo "$pkgconfig_libfile"`
ax_create_pkgconfig_libfile=`eval echo "$ax_create_pkgconfig_libfile"`
-{ $as_echo "$as_me:$LINENO: result: $pkgconfig_libfile" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pkgconfig_libfile" >&5
$as_echo "$pkgconfig_libfile" >&6; }
test "$pkgconfig_libfile" != "$ax_create_pkgconfig_libfile" && (
-{ $as_echo "$as_me:$LINENO: result: expanded our pkgconfig_libfile... $ax_create_pkgconfig_libfile" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: expanded our pkgconfig_libfile... $ax_create_pkgconfig_libfile" >&5
$as_echo "expanded our pkgconfig_libfile... $ax_create_pkgconfig_libfile" >&6; })
-{ $as_echo "$as_me:$LINENO: checking our package / suffix" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our package / suffix" >&5
$as_echo_n "checking our package / suffix... " >&6; }
ax_create_pkgconfig_suffix="$program_suffix"
test ".$ax_create_pkgconfig_suffix" != .NONE || ax_create_pkgconfig_suffix=""
-{ $as_echo "$as_me:$LINENO: result: ${PACKAGE_NAME} / ${ax_create_pkgconfig_suffix}" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PACKAGE_NAME} / ${ax_create_pkgconfig_suffix}" >&5
$as_echo "${PACKAGE_NAME} / ${ax_create_pkgconfig_suffix}" >&6; }
-{ $as_echo "$as_me:$LINENO: checking our pkgconfig description" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our pkgconfig description" >&5
$as_echo_n "checking our pkgconfig description... " >&6; }
ax_create_pkgconfig_description="$PACKAGE_SUMMARY"
test ".$ax_create_pkgconfig_description" != "." || \
ax_create_pkgconfig_description="$ax_create_pkgconfig_libname Library"
ax_create_pkgconfig_description=`eval echo "$ax_create_pkgconfig_description"`
ax_create_pkgconfig_description=`eval echo "$ax_create_pkgconfig_description"`
-{ $as_echo "$as_me:$LINENO: result: $ax_create_pkgconfig_description" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_create_pkgconfig_description" >&5
$as_echo "$ax_create_pkgconfig_description" >&6; }
-{ $as_echo "$as_me:$LINENO: checking our pkgconfig requires" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our pkgconfig requires" >&5
$as_echo_n "checking our pkgconfig requires... " >&6; }
ax_create_pkgconfig_requires="zzip-zlib-config"
ax_create_pkgconfig_requires=`eval echo "$ax_create_pkgconfig_requires"`
ax_create_pkgconfig_requires=`eval echo "$ax_create_pkgconfig_requires"`
-{ $as_echo "$as_me:$LINENO: result: $ax_create_pkgconfig_requires" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_create_pkgconfig_requires" >&5
$as_echo "$ax_create_pkgconfig_requires" >&6; }
-{ $as_echo "$as_me:$LINENO: checking our pkgconfig ext libs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our pkgconfig ext libs" >&5
$as_echo_n "checking our pkgconfig ext libs... " >&6; }
ax_create_pkgconfig_pkglibs="$PACKAGE_LIBS"
test ".$ax_create_pkgconfig_pkglibs" != "." || ax_create_pkgconfig_pkglibs="-l$ax_create_pkgconfig_libname"
ax_create_pkgconfig_libs="-lzzip"
ax_create_pkgconfig_libs=`eval echo "$ax_create_pkgconfig_libs"`
ax_create_pkgconfig_libs=`eval echo "$ax_create_pkgconfig_libs"`
-{ $as_echo "$as_me:$LINENO: result: $ax_create_pkgconfig_libs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_create_pkgconfig_libs" >&5
$as_echo "$ax_create_pkgconfig_libs" >&6; }
-{ $as_echo "$as_me:$LINENO: checking our pkgconfig cppflags" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our pkgconfig cppflags" >&5
$as_echo_n "checking our pkgconfig cppflags... " >&6; }
ax_create_pkgconfig_cppflags="$CPPFLAGS $PACKAGE_CFLAGS"
ax_create_pkgconfig_cppflags=`eval echo "$ax_create_pkgconfig_cppflags"`
ax_create_pkgconfig_cppflags=`eval echo "$ax_create_pkgconfig_cppflags"`
-{ $as_echo "$as_me:$LINENO: result: $ax_create_pkgconfig_cppflags" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_create_pkgconfig_cppflags" >&5
$as_echo "$ax_create_pkgconfig_cppflags" >&6; }
-{ $as_echo "$as_me:$LINENO: checking our pkgconfig ldflags" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking our pkgconfig ldflags" >&5
$as_echo_n "checking our pkgconfig ldflags... " >&6; }
ax_create_pkgconfig_ldflags="$LDFLAGS $PACKAGE_LDFLAGS"
ax_create_pkgconfig_ldflags=`eval echo "$ax_create_pkgconfig_ldflags"`
ax_create_pkgconfig_ldflags=`eval echo "$ax_create_pkgconfig_ldflags"`
-{ $as_echo "$as_me:$LINENO: result: $ax_create_pkgconfig_ldflags" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_create_pkgconfig_ldflags" >&5
$as_echo "$ax_create_pkgconfig_ldflags" >&6; }
test ".$ax_create_pkgconfig_generate" != "." || \
@@ -12340,7 +11591,7 @@ ax_create_pkgconfig_generate="zzip/zziplib.pc"
ax_create_pkgconfig_generate=`eval echo "$ax_create_pkgconfig_generate"`
ax_create_pkgconfig_generate=`eval echo "$ax_create_pkgconfig_generate"`
test "$pkgconfig_libfile" != "$ax_create_pkgconfig_generate" && (
-{ $as_echo "$as_me:$LINENO: result: generate the pkgconfig later... $ax_create_pkgconfig_generate" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: generate the pkgconfig later... $ax_create_pkgconfig_generate" >&5
$as_echo "generate the pkgconfig later... $ax_create_pkgconfig_generate" >&6; })
if test ".$ax_create_pkgconfig_src_libdir" = "." ; then
@@ -12372,7 +11623,7 @@ test ! -d $ax_create_pkgconfig_src_libdir/src || \
ax_create_pkgconfig_src_libdir="$ax_create_pkgconfig_src_libdir/src"
case ".$objdir" in
*libs) ax_create_pkgconfig_src_libdir="$ax_create_pkgconfig_src_libdir/$objdir" ;; esac
-{ $as_echo "$as_me:$LINENO: result: noninstalled pkgconfig -L $ax_create_pkgconfig_src_libdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: noninstalled pkgconfig -L $ax_create_pkgconfig_src_libdir" >&5
$as_echo "noninstalled pkgconfig -L $ax_create_pkgconfig_src_libdir" >&6; }
fi
@@ -12407,7 +11658,7 @@ $as_echo X"$ax_create_pkgconfig_src_headers/$v/x" |
s/.*/./; q'`
test ! -d $ax_create_pkgconfig_src_headers/include || \
ax_create_pkgconfig_src_headers="$ax_create_pkgconfig_src_headers/include"
-{ $as_echo "$as_me:$LINENO: result: noninstalled pkgconfig -I $ax_create_pkgconfig_src_headers" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: noninstalled pkgconfig -I $ax_create_pkgconfig_src_headers" >&5
$as_echo "noninstalled pkgconfig -I $ax_create_pkgconfig_src_headers" >&6; }
fi
@@ -12420,9 +11671,9 @@ ac_config_commands="$ac_config_commands $ax_create_pkgconfig_generate"
if test -z "$ac_cv_pax_tar_tool"; then
# Extract the first word of "pax", so it can be a program name with args.
set dummy pax; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PAX+set}" = set; then
+if test "${ac_cv_path_PAX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PAX in
@@ -12435,14 +11686,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PAX="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_PAX" && ac_cv_path_PAX=":"
@@ -12451,10 +11702,10 @@ esac
fi
PAX=$ac_cv_path_PAX
if test -n "$PAX"; then
- { $as_echo "$as_me:$LINENO: result: $PAX" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PAX" >&5
$as_echo "$PAX" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12464,9 +11715,9 @@ fi
else #3
# Extract the first word of "gnutar", so it can be a program name with args.
set dummy gnutar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GNUTAR+set}" = set; then
+if test "${ac_cv_path_GNUTAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GNUTAR in
@@ -12479,14 +11730,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_GNUTAR" && ac_cv_path_GNUTAR=":"
@@ -12495,10 +11746,10 @@ esac
fi
GNUTAR=$ac_cv_path_GNUTAR
if test -n "$GNUTAR"; then
- { $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5
$as_echo "$GNUTAR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12508,9 +11759,9 @@ fi
else #1
# Extract the first word of "gtar", so it can be a program name with args.
set dummy gtar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTAR+set}" = set; then
+if test "${ac_cv_path_GTAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GTAR in
@@ -12523,14 +11774,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GTAR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_GTAR" && ac_cv_path_GTAR=":"
@@ -12539,10 +11790,10 @@ esac
fi
GTAR=$ac_cv_path_GTAR
if test -n "$GTAR"; then
- { $as_echo "$as_me:$LINENO: result: $GTAR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTAR" >&5
$as_echo "$GTAR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12552,9 +11803,9 @@ fi
else #2
# Extract the first word of "tar", so it can be a program name with args.
set dummy tar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_TAR+set}" = set; then
+if test "${ac_cv_path_TAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TAR in
@@ -12567,14 +11818,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_TAR" && ac_cv_path_TAR=":"
@@ -12583,10 +11834,10 @@ esac
fi
TAR=$ac_cv_path_TAR
if test -n "$TAR"; then
- { $as_echo "$as_me:$LINENO: result: $TAR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
$as_echo "$TAR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12595,32 +11846,32 @@ fi
ac_cv_pax_tar_tool="tar"
fi
fi fi fi #3 #2 #1
- { $as_echo "$as_me:$LINENO: checking for portable tar tool" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for portable tar tool" >&5
$as_echo_n "checking for portable tar tool... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $ac_cv_pax_tar_tool" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pax_tar_tool" >&5
$as_echo "$ac_cv_pax_tar_tool" >&6; }
fi
if test "$ac_cv_pax_tar_tool$ax_pax_single_archive" = "pax"; then
- { $as_echo "$as_me:$LINENO: checking for pax single archive option" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pax single archive option" >&5
$as_echo_n "checking for pax single archive option... " >&6; }
echo foo > conftest.txt ; rm -f conftest.tar
- { ($as_echo "$as_me:$LINENO: \"\$ac_cv_path_PAX\" -w -O -f conftest.tar conftest.txt") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \"\$ac_cv_path_PAX\" -w -O -f conftest.tar conftest.txt"; } >&5
("$ac_cv_path_PAX" -w -O -f conftest.tar conftest.txt) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
if test -s conftest.tar; then
ax_pax_single_archive="-O" ; ac_hint="(probably a BSD pax)"
else
ax_pax_single_archive=" " ; ac_hint="(the -O option did not work)"
fi
- { $as_echo "$as_me:$LINENO: result: $ax_pax_single_archive $ac_hint" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pax_single_archive $ac_hint" >&5
$as_echo "$ax_pax_single_archive $ac_hint" >&6; }
fi
- { $as_echo "$as_me:$LINENO: checking for command to create portable tar archives" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for command to create portable tar archives" >&5
$as_echo_n "checking for command to create portable tar archives... " >&6; }
if test "$ac_cv_pax_tar_tool" = "gnutar"; then
ax_pax_tar_create="'$ac_cv_path_GNUTAR' cf"
@@ -12633,7 +11884,7 @@ $as_echo_n "checking for command to create portable tar archives... " >&6; }
else
ax_pax_tar_create=": 'unknown pax tar tool $ac_cv_pax_tar_tool'"
fi
- { $as_echo "$as_me:$LINENO: result: $ax_pax_tar_create" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pax_tar_create" >&5
$as_echo "$ax_pax_tar_create" >&6; }
PAX_TAR_CREATE="$ax_pax_tar_create"
@@ -12645,9 +11896,9 @@ PAX_TAR_CREATE="$ax_pax_tar_create"
if test -z "$ac_cv_pax_tar_tool"; then
# Extract the first word of "pax", so it can be a program name with args.
set dummy pax; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PAX+set}" = set; then
+if test "${ac_cv_path_PAX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PAX in
@@ -12660,14 +11911,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PAX="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_PAX" && ac_cv_path_PAX=":"
@@ -12676,10 +11927,10 @@ esac
fi
PAX=$ac_cv_path_PAX
if test -n "$PAX"; then
- { $as_echo "$as_me:$LINENO: result: $PAX" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PAX" >&5
$as_echo "$PAX" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12689,9 +11940,9 @@ fi
else #3
# Extract the first word of "gnutar", so it can be a program name with args.
set dummy gnutar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GNUTAR+set}" = set; then
+if test "${ac_cv_path_GNUTAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GNUTAR in
@@ -12704,14 +11955,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_GNUTAR" && ac_cv_path_GNUTAR=":"
@@ -12720,10 +11971,10 @@ esac
fi
GNUTAR=$ac_cv_path_GNUTAR
if test -n "$GNUTAR"; then
- { $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5
$as_echo "$GNUTAR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12733,9 +11984,9 @@ fi
else #1
# Extract the first word of "gtar", so it can be a program name with args.
set dummy gtar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTAR+set}" = set; then
+if test "${ac_cv_path_GTAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GTAR in
@@ -12748,14 +11999,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GTAR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_GTAR" && ac_cv_path_GTAR=":"
@@ -12764,10 +12015,10 @@ esac
fi
GTAR=$ac_cv_path_GTAR
if test -n "$GTAR"; then
- { $as_echo "$as_me:$LINENO: result: $GTAR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTAR" >&5
$as_echo "$GTAR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12777,9 +12028,9 @@ fi
else #2
# Extract the first word of "tar", so it can be a program name with args.
set dummy tar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_TAR+set}" = set; then
+if test "${ac_cv_path_TAR+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $TAR in
@@ -12792,14 +12043,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_TAR" && ac_cv_path_TAR=":"
@@ -12808,10 +12059,10 @@ esac
fi
TAR=$ac_cv_path_TAR
if test -n "$TAR"; then
- { $as_echo "$as_me:$LINENO: result: $TAR" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
$as_echo "$TAR" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12820,32 +12071,32 @@ fi
ac_cv_pax_tar_tool="tar"
fi
fi fi fi #3 #2 #1
- { $as_echo "$as_me:$LINENO: checking for portable tar tool" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for portable tar tool" >&5
$as_echo_n "checking for portable tar tool... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $ac_cv_pax_tar_tool" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pax_tar_tool" >&5
$as_echo "$ac_cv_pax_tar_tool" >&6; }
fi
if test "$ac_cv_pax_tar_tool$ax_pax_single_archive" = "pax"; then
- { $as_echo "$as_me:$LINENO: checking for pax single archive option" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pax single archive option" >&5
$as_echo_n "checking for pax single archive option... " >&6; }
echo foo > conftest.txt ; rm -f conftest.tar
- { ($as_echo "$as_me:$LINENO: \"\$ac_cv_path_PAX\" -w -O -f conftest.tar conftest.txt") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \"\$ac_cv_path_PAX\" -w -O -f conftest.tar conftest.txt"; } >&5
("$ac_cv_path_PAX" -w -O -f conftest.tar conftest.txt) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
if test -s conftest.tar; then
ax_pax_single_archive="-O" ; ac_hint="(probably a BSD pax)"
else
ax_pax_single_archive=" " ; ac_hint="(the -O option did not work)"
fi
- { $as_echo "$as_me:$LINENO: result: $ax_pax_single_archive $ac_hint" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pax_single_archive $ac_hint" >&5
$as_echo "$ax_pax_single_archive $ac_hint" >&6; }
fi
- { $as_echo "$as_me:$LINENO: checking for command to extract portable tar archives" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for command to extract portable tar archives" >&5
$as_echo_n "checking for command to extract portable tar archives... " >&6; }
if test "$ac_cv_pax_tar_tool" = "gnutar"; then
ax_pax_tar_extract="'$ac_cv_path_GNUTAR' xf"
@@ -12858,7 +12109,7 @@ $as_echo_n "checking for command to extract portable tar archives... " >&6; }
else
ax_pax_tar_extract=": 'unknown pax tar tool $ac_cv_pax_tar_tool'"
fi
- { $as_echo "$as_me:$LINENO: result: $ax_pax_tar_extract" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pax_tar_extract" >&5
$as_echo "$ax_pax_tar_extract" >&6; }
PAX_TAR_EXTRACT="$ax_pax_tar_extract"
@@ -12869,9 +12120,9 @@ for ac_prog in perl5 perl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then
+if test "${ac_cv_path_PERL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PERL in
@@ -12884,14 +12135,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -12899,10 +12150,10 @@ esac
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
- { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
$as_echo "$PERL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12915,9 +12166,9 @@ for ac_prog in python
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then
+if test "${ac_cv_path_PYTHON+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PYTHON in
@@ -12930,14 +12181,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -12945,10 +12196,10 @@ esac
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
$as_echo "$PYTHON" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -12961,9 +12212,9 @@ for ac_prog in zip pkzip
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MKZIP+set}" = set; then
+if test "${ac_cv_path_MKZIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $MKZIP in
@@ -12976,14 +12227,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MKZIP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -12991,10 +12242,10 @@ esac
fi
MKZIP=$ac_cv_path_MKZIP
if test -n "$MKZIP"; then
- { $as_echo "$as_me:$LINENO: result: $MKZIP" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKZIP" >&5
$as_echo "$MKZIP" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -13007,9 +12258,9 @@ for ac_prog in xmlto
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XMLTO+set}" = set; then
+if test "${ac_cv_path_XMLTO+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $XMLTO in
@@ -13022,14 +12273,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -13037,10 +12288,10 @@ esac
fi
XMLTO=$ac_cv_path_XMLTO
if test -n "$XMLTO"; then
- { $as_echo "$as_me:$LINENO: result: $XMLTO" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5
$as_echo "$XMLTO" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -13050,18 +12301,14 @@ done
test -n "$XMLTO" || XMLTO=":"
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
+if test "${ac_cv_c_inline+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
@@ -13070,41 +12317,17 @@ $ac_kw foo_t foo () {return 0; }
#endif
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_inline=$ac_kw
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
test "$ac_cv_c_inline" != no && break
done
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
$as_echo "$ac_cv_c_inline" >&6; }
-
case $ac_cv_c_inline in
inline | yes) ;;
*)
@@ -13120,16 +12343,12 @@ _ACEOF
;;
esac
-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then
+if test "${ac_cv_c_const+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -13189,47 +12408,24 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_const=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_const=no
+ ac_cv_c_const=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
-#define const /**/
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: checking for C restrict keyword" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restrict keyword" >&5
$as_echo_n "checking for C restrict keyword... " >&6; }
-if test "${acx_cv_c_restrict+set}" = set; then
+if test "${acx_cv_c_restrict+set}" = set; then :
$as_echo_n "(cached) " >&6
else
acx_cv_c_restrict=unsupported
@@ -13246,11 +12442,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# overlap even with non __restrict pointers), but I think it should be
# okay under the circumstances where restrict is normally used.
for acx_kw in restrict __restrict__ __restrict; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -13261,32 +12453,9 @@ float * $acx_kw x;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
acx_cv_c_restrict=$acx_kw; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
ac_ext=c
@@ -13297,7 +12466,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $acx_cv_c_restrict" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_c_restrict" >&5
$as_echo "$acx_cv_c_restrict" >&6; }
if test "$acx_cv_c_restrict" != "restrict"; then
acx_kw="$acx_cv_c_restrict"
@@ -13309,16 +12478,12 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -13333,48 +12498,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -13384,18 +12524,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -13405,14 +12541,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -13439,72 +12571,34 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
-
-
-
-
-
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <$ac_hdr>
@@ -13518,41 +12612,18 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
eval "$as_ac_Header=yes"
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
+ eval "$as_ac_Header=no"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+eval ac_res=\$$as_ac_Header
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
@@ -13563,17 +12634,13 @@ fi
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+if test "${ac_cv_search_opendir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13598,70 +12665,39 @@ for ac_lib in '' dir; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_opendir=$ac_res
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then :
break
fi
done
-if test "${ac_cv_search_opendir+set}" = set; then
- :
+if test "${ac_cv_search_opendir+set}" = set; then :
+
else
ac_cv_search_opendir=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
$as_echo "$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
else
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+if test "${ac_cv_search_opendir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13686,203 +12722,39 @@ for ac_lib in '' x; do
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
+ if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_opendir=$ac_res
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_opendir+set}" = set; then :
break
fi
done
-if test "${ac_cv_search_opendir+set}" = set; then
- :
+if test "${ac_cv_search_opendir+set}" = set; then :
+
else
ac_cv_search_opendir=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
$as_echo "$ac_cv_search_opendir" >&6; }
ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
fi
-
-
-
-
-
-
for ac_header in stdint.h unistd.h windows.h winnt.h winbase.h sys/int_types.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -13891,147 +12763,12 @@ fi
done
-
-
-
-
for ac_header in sys/types.h sys/mman.h sys/stat.h sys/param.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14039,147 +12776,12 @@ _ACEOF
fi
done
-
-
-
-
-for ac_header in io.h direct.h zlib.h byteswap.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+ for ac_header in io.h direct.h zlib.h byteswap.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14188,247 +12790,24 @@ fi
done
-
for ac_header in fnmatch.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "fnmatch.h" "ac_cv_header_fnmatch_h" "$ac_includes_default"
+if test "x$ac_cv_header_fnmatch_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_FNMATCH_H 1
_ACEOF
fi
done
-
-
for ac_func in strcasecmp strndup
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -14437,102 +12816,9 @@ fi
done
-{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
-$as_echo_n "checking for off_t... " >&6; }
-if test "${ac_cv_type_off_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_off_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (off_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((off_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_off_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+if test "x$ac_cv_type_off_t" = x""yes; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-$as_echo "$ac_cv_type_off_t" >&6; }
-if test "x$ac_cv_type_off_t" = x""yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -14541,102 +12827,9 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (size_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((size_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_size_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -14645,102 +12838,9 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
-$as_echo_n "checking for ssize_t... " >&6; }
-if test "${ac_cv_type_ssize_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_ssize_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (ssize_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((ssize_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_ssize_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+if test "x$ac_cv_type_ssize_t" = x""yes; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-$as_echo "$ac_cv_type_ssize_t" >&6; }
-if test "x$ac_cv_type_ssize_t" = x""yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -14749,102 +12849,9 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for off64_t" >&5
-$as_echo_n "checking for off64_t... " >&6; }
-if test "${ac_cv_type_off64_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_off64_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (off64_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((off64_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_off64_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
+ac_fn_c_check_type "$LINENO" "off64_t" "ac_cv_type_off64_t" "$ac_includes_default"
+if test "x$ac_cv_type_off64_t" = x""yes; then :
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off64_t" >&5
-$as_echo "$ac_cv_type_off64_t" >&6; }
-if test "x$ac_cv_type_off64_t" = x""yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -14853,102 +12860,9 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for __int64" >&5
-$as_echo_n "checking for __int64... " >&6; }
-if test "${ac_cv_type___int64+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type___int64=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (__int64))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((__int64)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "__int64" "ac_cv_type___int64" "$ac_includes_default"
+if test "x$ac_cv_type___int64" = x""yes; then :
- ac_cv_type___int64=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type___int64" >&5
-$as_echo "$ac_cv_type___int64" >&6; }
-if test "x$ac_cv_type___int64" = x""yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -14957,17 +12871,13 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking size of short" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
$as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then
+if test "${ac_cv_sizeof_short+set}" = set; then :
$as_echo_n "(cached) " >&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "confdefs.h"
#include <sys/types.h>
@@ -14981,32 +12891,9 @@ switch (0) case 0: case (sizeof (short) == $ac_size):;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_sizeof_short=$ac_size
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test x$ac_cv_sizeof_short != x ; then break; fi
done
@@ -15014,11 +12901,9 @@ done
fi
if test x$ac_cv_sizeof_short = x ; then
- { { $as_echo "$as_me:$LINENO: error: cannot determine a size for short" >&5
-$as_echo "$as_me: error: cannot determine a size for short" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot determine a size for short" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
$as_echo "$ac_cv_sizeof_short" >&6; }
cat >>confdefs.h <<_ACEOF
@@ -15026,17 +12911,13 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-{ $as_echo "$as_me:$LINENO: checking size of int" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
$as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
+if test "${ac_cv_sizeof_int+set}" = set; then :
$as_echo_n "(cached) " >&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "confdefs.h"
#include <sys/types.h>
@@ -15050,32 +12931,9 @@ switch (0) case 0: case (sizeof (int) == $ac_size):;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_sizeof_int=$ac_size
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test x$ac_cv_sizeof_int != x ; then break; fi
done
@@ -15083,11 +12941,9 @@ done
fi
if test x$ac_cv_sizeof_int = x ; then
- { { $as_echo "$as_me:$LINENO: error: cannot determine a size for int" >&5
-$as_echo "$as_me: error: cannot determine a size for int" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot determine a size for int" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
$as_echo "$ac_cv_sizeof_int" >&6; }
cat >>confdefs.h <<_ACEOF
@@ -15095,17 +12951,13 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
+if test "${ac_cv_sizeof_long+set}" = set; then :
$as_echo_n "(cached) " >&6
else
for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "confdefs.h"
#include <sys/types.h>
@@ -15119,32 +12971,9 @@ switch (0) case 0: case (sizeof (long) == $ac_size):;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_sizeof_long=$ac_size
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test x$ac_cv_sizeof_long != x ; then break; fi
done
@@ -15152,11 +12981,9 @@ done
fi
if test x$ac_cv_sizeof_long = x ; then
- { { $as_echo "$as_me:$LINENO: error: cannot determine a size for long" >&5
-$as_echo "$as_me: error: cannot determine a size for long" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot determine a size for long" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
$as_echo "$ac_cv_sizeof_long" >&6; }
cat >>confdefs.h <<_ACEOF
@@ -15164,19 +12991,14 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
+if test "${ac_cv_c_bigendian+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
# See if we're dealing with a universal compiler.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
@@ -15184,46 +13006,34 @@ cat >>conftest.$ac_ext <<_ACEOF
typedef int dummy;
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
# Check for potential -arch flags. It is not universal unless
- # there are some -arch flags. Note that *ppc* also matches
- # ppc64. This check is also rather less than ideal.
- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
- esac
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+ # there are at least two -arch flags with different values.
+ ac_arch=
+ ac_prev=
+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+ if test -n "$ac_prev"; then
+ case $ac_word in
+ i?86 | x86_64 | ppc | ppc64)
+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+ ac_arch=$ac_word
+ else
+ ac_cv_c_bigendian=universal
+ break
+ fi
+ ;;
+ esac
+ ac_prev=
+ elif test "x$ac_word" = "x-arch"; then
+ ac_prev=arch
+ fi
+ done
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_c_bigendian = unknown; then
# See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
@@ -15241,30 +13051,9 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
# It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
@@ -15280,49 +13069,18 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_bigendian=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_c_bigendian = unknown; then
# See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <limits.h>
@@ -15337,30 +13095,9 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
# It does; now see whether it defined to _BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <limits.h>
@@ -15375,51 +13112,20 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_bigendian=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_bigendian=no
+ ac_cv_c_bigendian=no
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_c_bigendian = unknown; then
# Compile a test program.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
# Try to guess by grepping values from an object file.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@ -15445,24 +13151,7 @@ return use_ascii (foo) == use_ebcdic (foo);
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
@@ -15474,20 +13163,10 @@ $as_echo "$ac_try_echo") >&5
ac_cv_c_bigendian=unknown
fi
fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
@@ -15507,72 +13186,38 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_c_bigendian=no
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
+ ac_cv_c_bigendian=yes
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
$as_echo "$ac_cv_c_bigendian" >&6; }
case $ac_cv_c_bigendian in #(
yes)
- cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
;; #(
no)
;; #(
universal)
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
;; #(
*)
- { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
+ as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
-{ $as_echo "$as_me:$LINENO: checking if pointers to integers require aligned access" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pointers to integers require aligned access" >&5
$as_echo_n "checking if pointers to integers require aligned access... " >&6; }
-if test "${ax_cv_have_aligned_access_required+set}" = set; then
+if test "${ax_cv_have_aligned_access_required+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = "yes"; then
@@ -15580,14 +13225,10 @@ else
ax_cv_have_aligned_access_required="yes"
;; esac
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ax_cv_have_aligned_access_required=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
@@ -15609,66 +13250,37 @@ int main()
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ax_cv_have_aligned_access_required=yes
else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ax_cv_have_aligned_access_required=no
+ ax_cv_have_aligned_access_required=no
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
fi
-{ $as_echo "$as_me:$LINENO: result: $ax_cv_have_aligned_access_required" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_aligned_access_required" >&5
$as_echo "$ax_cv_have_aligned_access_required" >&6; }
fi
if test "$ax_cv_have_aligned_access_required" = yes ; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALIGNED_ACCESS_REQUIRED 1
-_ACEOF
+$as_echo "#define HAVE_ALIGNED_ACCESS_REQUIRED 1" >>confdefs.h
fi
# the default is _disabled_!! anyway, result is prefixed in zzip/_config.h!!
# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then
+if test "${enable_largefile+set}" = set; then :
enableval=$enable_largefile;
fi
if test "$enable_largefile" != no; then
- { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
@@ -15677,11 +13289,7 @@ else
while :; do
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15700,60 +13308,14 @@ main ()
return 0;
}
_ACEOF
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ if ac_fn_c_try_compile "$LINENO"; then :
break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext
CC="$CC -n32"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_sys_largefile_CC=' -n32'; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext
break
done
@@ -15761,23 +13323,19 @@ rm -f core conftest.err conftest.$ac_objext
rm -f conftest.$ac_ext
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
$as_echo "$ac_cv_sys_largefile_CC" >&6; }
if test "$ac_cv_sys_largefile_CC" != no; then
CC=$CC$ac_cv_sys_largefile_CC
fi
- { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
$as_echo_n "(cached) " >&6
else
while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15796,38 +13354,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_sys_file_offset_bits=no; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -15847,38 +13378,15 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_sys_file_offset_bits=64; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_sys_file_offset_bits=unknown
break
done
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
@@ -15890,17 +13398,13 @@ _ACEOF
esac
rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
- { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then
+if test "${ac_cv_sys_large_files+set}" = set; then :
$as_echo_n "(cached) " >&6
else
while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15919,38 +13423,11 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_sys_large_files=no; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -15970,38 +13447,15 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_sys_large_files=1; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_sys_large_files=unknown
break
done
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
$as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
@@ -16016,74 +13470,70 @@ rm -rf conftest*
fi
# we know about some internals of ac_sys_largefile here...
-{ $as_echo "$as_me:$LINENO: checking whether system differentiates 64bit off_t by defines" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system differentiates 64bit off_t by defines" >&5
$as_echo_n "checking whether system differentiates 64bit off_t by defines... " >&6; }
ac_cv_sys_largefile_sensitive="no"
if test ".${ac_cv_sys_file_offset_bits-no}${ac_cv_sys_large_files-no}" != ".nono"
then ac_cv_sys_largefile_sensitive="yes"
-cat >>confdefs.h <<\_ACEOF
-#define LARGEFILE_SENSITIVE 1
-_ACEOF
+$as_echo "#define LARGEFILE_SENSITIVE 1" >>confdefs.h
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_sensitive" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_sensitive" >&5
$as_echo "$ac_cv_sys_largefile_sensitive" >&6; }
test ".$LARGEFILE_CFLAGS" = "." && LARGEFILE_CFLAGS=""
# Check whether --with-largefile was given.
-if test "${with_largefile+set}" = set; then
+if test "${with_largefile+set}" = set; then :
withval=$with_largefile;
else
with_largefile="no"
fi
if test ".$ac_cv_sys_largefile_sensitive" = ".no" ; then
- { $as_echo "$as_me:$LINENO: result: compiles library with the only off_t seen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: compiles library with the only off_t seen" >&5
$as_echo "compiles library with the only off_t seen" >&6; }
elif test ".$with_largefile" != ".no" ; then
- { $as_echo "$as_me:$LINENO: result: compiles library as 64bit off_t variant - and renaming some function names" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: compiles library as 64bit off_t variant - and renaming some function names" >&5
$as_echo "compiles library as 64bit off_t variant - and renaming some function names" >&6; }
LARGEFILE_CFLAGS="$LARGEFILE_CFLAGS -D_LARGEFILE_SOURCE"
- { $as_echo "$as_me:$LINENO: result: ..adding CFLAGS $LARGEFILE_CFLAGS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ..adding CFLAGS $LARGEFILE_CFLAGS" >&5
$as_echo "..adding CFLAGS $LARGEFILE_CFLAGS" >&6; }
CFLAGS="$CFLAGS $LARGEFILE_CFLAGS"
- { $as_echo "$as_me:$LINENO: result: ..adding 64 into RELEASE_INFO for the libraries" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ..adding 64 into RELEASE_INFO for the libraries" >&5
$as_echo "..adding 64 into RELEASE_INFO for the libraries" >&6; }
RELEASE_INFO="$RELEASE_INFO-64"
else
- { $as_echo "$as_me:$LINENO: result: compiles library as 32bit off_t variant - largefile is not the default here" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: compiles library as 32bit off_t variant - largefile is not the default here" >&5
$as_echo "compiles library as 32bit off_t variant - largefile is not the default here" >&6; }
fi
-{ $as_echo "$as_me:$LINENO: checking for zlib being found" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib being found" >&5
$as_echo_n "checking for zlib being found... " >&6; }
if test "_$ac_cv_header_zlib_h" != "_yes" ; then
- { $as_echo "$as_me:$LINENO: result: ...oops: zlib.h not found - try adding some CPPFLAGS to configure call" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...oops: zlib.h not found - try adding some CPPFLAGS to configure call" >&5
$as_echo "...oops: zlib.h not found - try adding some CPPFLAGS to configure call" >&6; }
- { $as_echo "$as_me:$LINENO: result: ...note: and when linkage fails you might also need to set some LDFLAGS" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...note: and when linkage fails you might also need to set some LDFLAGS" >&5
$as_echo "...note: and when linkage fails you might also need to set some LDFLAGS" >&6; }
case "$prefix" in
NONE|/usr)
- { $as_echo "$as_me:$LINENO: result: ...note: both can be set by specifying the install prefix of the zlib library" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...note: both can be set by specifying the install prefix of the zlib library" >&5
$as_echo "...note: both can be set by specifying the install prefix of the zlib library" >&6; }
- { $as_echo "$as_me:$LINENO: result: ...note: via --with-zlib=path ... it will test for -Ipath/include -Lpath/lib" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...note: via --with-zlib=path ... it will test for -Ipath/include -Lpath/lib" >&5
$as_echo "...note: via --with-zlib=path ... it will test for -Ipath/include -Lpath/lib" >&6; }
;;
*) if test -d $prefix/include ; then
- { $as_echo "$as_me:$LINENO: result: ...note: -I$prefix/include is not added to CPPFLAGS automatically and" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...note: -I$prefix/include is not added to CPPFLAGS automatically and" >&5
$as_echo "...note: -I$prefix/include is not added to CPPFLAGS automatically and" >&6; }
- { $as_echo "$as_me:$LINENO: result: ...note: neither is -L$prefix/lib for LDFLAGS .. both will be if you specify" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...note: neither is -L$prefix/lib for LDFLAGS .. both will be if you specify" >&5
$as_echo "...note: neither is -L$prefix/lib for LDFLAGS .. both will be if you specify" >&6; }
- { $as_echo "$as_me:$LINENO: result: ...note: --with-zlib to configure call" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...note: --with-zlib to configure call" >&5
$as_echo "...note: --with-zlib to configure call" >&6; }
fi
;;
esac
- { { $as_echo "$as_me:$LINENO: error: zlib.h not found: \"zlib\" is required to build \"$PACKAGE\"" >&5
-$as_echo "$as_me: error: zlib.h not found: \"zlib\" is required to build \"$PACKAGE\"" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "zlib.h not found: \"zlib\" is required to build \"$PACKAGE\"" "$LINENO" 5
exit 1
fi
cat >conftest.c <<EOF
@@ -16094,14 +13544,14 @@ ZLIB_VERSION=`(eval "$ac_cpp conftest.c") 2>/dev/null \
| grep zlib_VeRsIoN | sed -e 's,.*= *.,,' -e 's,. *.dEtEcT.*,,'`
rm conftest.c
-{ $as_echo "$as_me:$LINENO: result: yes - $ZLIB_VERSION" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - $ZLIB_VERSION" >&5
$as_echo "yes - $ZLIB_VERSION" >&6; }
# ----------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: checking docdir default" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking docdir default" >&5
$as_echo_n "checking docdir default... " >&6; }
# Check whether --with-docdir was given.
-if test "${with_docdir+set}" = set; then
+if test "${with_docdir+set}" = set; then :
withval=$with_docdir;
else
with_docdir="no"
@@ -16113,29 +13563,25 @@ case "${with_docdir}" in
yes) docdir='${prefix}/doc' ;;
no) docdir='${datadir}/doc' ;;
/*|\\*|a-zA-Z:*) docdir="$with_docdir" ;;
- *) { $as_echo "$as_me:$LINENO: result: oops" >&5
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: oops" >&5
$as_echo "oops" >&6; }
- { { $as_echo "$as_me:$LINENO: error: bad value ${withval} for --with-docdir" >&5
-$as_echo "$as_me: error: bad value ${withval} for --with-docdir" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "bad value ${withval} for --with-docdir" "$LINENO" 5
;;
esac
-{ $as_echo "$as_me:$LINENO: result: $docdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $docdir" >&5
$as_echo "$docdir" >&6; }
# ----------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: checking whether using debugging messages in libraries" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using debugging messages in libraries" >&5
$as_echo_n "checking whether using debugging messages in libraries... " >&6; }
# Check whether --with-debug was given.
-if test "${with_debug+set}" = set; then
+if test "${with_debug+set}" = set; then :
withval=$with_debug; case "${withval}" in
yes|no) with_debug="$withval" ;;
- *) { $as_echo "$as_me:$LINENO: result: oops" >&5
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: oops" >&5
$as_echo "oops" >&6; }
- { { $as_echo "$as_me:$LINENO: error: bad value ${withval} for --with-debug" >&5
-$as_echo "$as_me: error: bad value ${withval} for --with-debug" >&2;}
- { (exit 1); exit 1; }; } ;;
+ as_fn_error "bad value ${withval} for --with-debug" "$LINENO" 5 ;;
esac
else
with_debug="no"
@@ -16144,27 +13590,25 @@ fi
test "$with_debug" != "yes" && with_debug="no" # yes or no
test "$with_debug" = "yes" && export CFLAGS="$CFLAGS -DDEBUG"
result="$with_debug" ; test "$result" = "yes" && result="yes, added -DDEBUG"
-{ $as_echo "$as_me:$LINENO: result: $result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
$as_echo "$result" >&6; }
if test "$with_debug" = "yes" ; then if test -n "$RELEASE_INFO" ; then
RELEASE_INFO="$RELEASE_INFO-dbg"
- { $as_echo "$as_me:$LINENO: result: modified release" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: modified release" >&5
$as_echo "modified release" >&6; }
fi fi
# ----------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: checking whether thread stack is too small for bufsiz buffers" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether thread stack is too small for bufsiz buffers" >&5
$as_echo_n "checking whether thread stack is too small for bufsiz buffers... " >&6; }
# many embedded platforms, superthreaded systems and kernel usage
# will severely limit the stackspace for its threads. Use _LOWSTK
# compile-define on those platforms.
# Check whether --with-lowstk was given.
-if test "${with_lowstk+set}" = set; then
+if test "${with_lowstk+set}" = set; then :
withval=$with_lowstk; case "${withval}" in
yes|no|auto) with_lowstk="$withval" ;;
- *) { { $as_echo "$as_me:$LINENO: error: bad value ${withval} for --with-lowstk" >&5
-$as_echo "$as_me: error: bad value ${withval} for --with-lowstk" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *) as_fn_error "bad value ${withval} for --with-lowstk" "$LINENO" 5 ;;
esac
else
with_lowstk="auto"
@@ -16178,22 +13622,20 @@ fi
test "$with_lowstk" != "yes" && with_lowstk="no" # yes or no
test "$with_lowstk" = "yes" && CFLAGS="$CFLAGS -D_LOWSTK"
result="$with_lowstk" ; test "$result" = "yes" && result="yes, added -D_LOWSTK"
-{ $as_echo "$as_me:$LINENO: result: $with_lowstk" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_lowstk" >&5
$as_echo "$with_lowstk" >&6; }
# ---------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: checking whether can use mmap for file scanning" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether can use mmap for file scanning" >&5
$as_echo_n "checking whether can use mmap for file scanning... " >&6; }
# system with mmap are probably better performing an searching
# and parsing - atleast memory consumption is far better
# Check whether --enable-mmap was given.
-if test "${enable_mmap+set}" = set; then
+if test "${enable_mmap+set}" = set; then :
enableval=$enable_mmap; case "${enableval}" in
yes|no|auto) enable_mmap="${enableval}" ;;
- *) { $as_echo "$as_me:$LINENO: result: oops" >&5
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: oops" >&5
$as_echo "oops" >&6; }
- { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-mmap" >&5
-$as_echo "$as_me: error: bad value ${enableval} for --disable-mmap" >&2;}
- { (exit 1); exit 1; }; } ;;
+ as_fn_error "bad value ${enableval} for --disable-mmap" "$LINENO" 5 ;;
esac
else
enable_mmap="auto"
@@ -16206,55 +13648,69 @@ then
fi
case "$enable_mmap" in
yes|yes,*) CFLAGS="$CFLAGS -D_USE_MMAP"
- { $as_echo "$as_me:$LINENO: result: $enable_mmap" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mmap" >&5
$as_echo "$enable_mmap" >&6; } ;;
*) enable_mmap="no"
- { $as_echo "$as_me:$LINENO: result: no (just a bit slower)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (just a bit slower)" >&5
$as_echo "no (just a bit slower)" >&6; } ;;
esac
# ---------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: checking whether making SDL parts" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether making SDL parts" >&5
$as_echo_n "checking whether making SDL parts... " >&6; }
SDL=""
+SDL_GENERATE=""
# Check whether --enable-sdl was given.
-if test "${enable_sdl+set}" = set; then
+if test "${enable_sdl+set}" = set; then :
enableval=$enable_sdl;
else
enable_sdl="no"
fi
if test "$enable_sdl" = "no" ; then
- { $as_echo "$as_me:$LINENO: result: no, disabled" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabled" >&5
$as_echo "no, disabled" >&6; }
else
- enable_sdl=`sdl-config --version 2>/dev/null`
+ enable_sdl=`pkg-config --modversion sdl 2>/dev/null`
+ if test -z "$enable_sdl"; then
+ enable_sdl=`sdl-config --version 2>/dev/null`
+ SDL_GENERATE="sdl-uninstalled.pc"
+ enable_sdl="$enable_sdl (sdl-config)"
+ else
+ enable_sdl="$enable_sdl (pkgconfig)"
+ fi
+ enable_sdl="$enable_sdl."
case ".$enable_sdl" in
- .1.*) { $as_echo "$as_me:$LINENO: result: yes, for SDL $enable_sdl" >&5
-$as_echo "yes, for SDL $enable_sdl" >&6; }
+ .1.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using SDL $enable_sdl" >&5
+$as_echo "yes, using SDL $enable_sdl" >&6; }
SDL="SDL" ;;
- .2.*) { $as_echo "$as_me:$LINENO: result: yes, untested $enable_sdl" >&5
+ .2.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, untested $enable_sdl" >&5
$as_echo "yes, untested $enable_sdl" >&6; }
SDL="SDL" ;;
- *) { $as_echo "$as_me:$LINENO: result: no, $enable_sdl" >&5
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, $enable_sdl" >&5
$as_echo "no, $enable_sdl" >&6; } ;;
esac
+ if test -n "$SDL_GENERATE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled SDL generation of... $SDL_GENERATE" >&5
+$as_echo "enabled SDL generation of... $SDL_GENERATE" >&6; }
+ fi
fi
+
# ---------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: checking running extra tests on make check" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking running extra tests on make check" >&5
$as_echo_n "checking running extra tests on make check... " >&6; }
if test "MKZIP" != ":" ; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
ZIPTESTS=""
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
ZIPTESTS="#"
fi
# ---------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: checking link options" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking link options" >&5
$as_echo_n "checking link options... " >&6; }
ZZIPLIB_LDFLAGS=""
test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
@@ -16263,13 +13719,13 @@ case "$host_os" in mingw*)
ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
RESOLVES=' '
;; esac
-{ $as_echo "$as_me:$LINENO: result: $ZZIPLIB_LDFLAGS $RESOLVES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZZIPLIB_LDFLAGS $RESOLVES" >&5
$as_echo "$ZZIPLIB_LDFLAGS $RESOLVES" >&6; }
# Check whether --with-defines was given.
-if test "${with_defines+set}" = set; then
+if test "${with_defines+set}" = set; then :
withval=$with_defines;
else
with_defines="normal"
@@ -16278,23 +13734,23 @@ fi
#
case ",$with_defines," in *,easy,*)
- { $as_echo "$as_me:$LINENO: result: ..adding CFLAGS -DZZIP_EASY" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ..adding CFLAGS -DZZIP_EASY" >&5
$as_echo "..adding CFLAGS -DZZIP_EASY" >&6; }
CFLAGS="$CFLAGS -DZZIP_EASY"
;; esac
case ",$with_defines," in *,harden,*)
- { $as_echo "$as_me:$LINENO: result: ..adding CFLAGS -DZZIP_HARDEN" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ..adding CFLAGS -DZZIP_HARDEN" >&5
$as_echo "..adding CFLAGS -DZZIP_HARDEN" >&6; }
CFLAGS="$CFLAGS -DZZIP_HARDEN"
;; esac
case ",$with_defines," in *,allow_modulo_entries,*)
- { $as_echo "$as_me:$LINENO: result: ..adding CFLAGS -DZZIP_ALLOW_MODULO_ENTRIES" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ..adding CFLAGS -DZZIP_ALLOW_MODULO_ENTRIES" >&5
$as_echo "..adding CFLAGS -DZZIP_ALLOW_MODULO_ENTRIES" >&6; }
CFLAGS="$CFLAGS -DZZIP_ALLOW_MODULO_ENTRIES"
;; esac
# ---------------------------------------------------------------
-{ $as_echo "$as_me:$LINENO: checking auto silent in maintainer mode" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking auto silent in maintainer mode" >&5
$as_echo_n "checking auto silent in maintainer mode... " >&6; }
if test "$USE_MAINTAINER_MODE" = "no" ; then
test ".$TIMEOUT" = "." && TIMEOUT="9"
@@ -16303,21 +13759,21 @@ if test "$USE_MAINTAINER_MODE" = "no" ; then
AUTOCONF="sleep $TIMEOUT ; true || autoconf || skipped"
if test ".$LIBTOOL" != "." ; then
LIBTOOL="$LIBTOOL --silent"
- { $as_echo "$as_me:$LINENO: result: libtool-silent, auto-sleep-9" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libtool-silent, auto-sleep-9" >&5
$as_echo "libtool-silent, auto-sleep-9" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: auto-sleep-9" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto-sleep-9" >&5
$as_echo "auto-sleep-9" >&6; }
fi
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-{ $as_echo "$as_me:$LINENO: checking CFLAGS frame-pointer" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS frame-pointer" >&5
$as_echo_n "checking CFLAGS frame-pointer... " >&6; }
# Check whether --enable-frame-pointer was given.
-if test "${enable_frame_pointer+set}" = set; then
+if test "${enable_frame_pointer+set}" = set; then :
enableval=$enable_frame_pointer;
fi
@@ -16326,19 +13782,19 @@ case ".$enable_frame_pointer" in
CFLAGS=`echo " $CFLAGS " | sed -e 's/ -g / /'`
if test ".$GCC" = ".yes" ; then
CFLAGS="$CFLAGS -fomit-frame-pointer"
- { $as_echo "$as_me:$LINENO: result: $enable_frame_pointer, -fomit-frame-pointer added" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_frame_pointer, -fomit-frame-pointer added" >&5
$as_echo "$enable_frame_pointer, -fomit-frame-pointer added" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: $enable_frame_pointer, -g removed" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_frame_pointer, -g removed" >&5
$as_echo "$enable_frame_pointer, -g removed" >&6; }
fi ;;
- *) { $as_echo "$as_me:$LINENO: result: $enable_frame_pointer, kept" >&5
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_frame_pointer, kept" >&5
$as_echo "$enable_frame_pointer, kept" >&6; } ;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS for maximum warnings" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for maximum warnings" >&5
$as_echo_n "checking CFLAGS for maximum warnings... " >&6; }
-if test "${ac_cv_cflags_warn_all+set}" = set; then
+if test "${ac_cv_cflags_warn_all+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_warn_all="no, unknown"
@@ -16352,11 +13808,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16367,32 +13819,9 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
@@ -16404,7 +13833,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_warn_all" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_warn_all" >&5
$as_echo "$ac_cv_cflags_warn_all" >&6; }
case ".$ac_cv_cflags_warn_all" in
.ok|.ok,*) ;;
@@ -16412,24 +13841,24 @@ case ".$ac_cv_cflags_warn_all" in
;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_warn_all") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_warn_all"; } >&5
(: CFLAGS does contain $ac_cv_cflags_warn_all) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_warn_all\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_warn_all\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_warn_all") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_warn_all"
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS for gcc -Wpointer-arith" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -Wpointer-arith" >&5
$as_echo_n "checking CFLAGS for gcc -Wpointer-arith... " >&6; }
-if test "${ac_cv_cflags_gcc_option__Wpointer_arith+set}" = set; then
+if test "${ac_cv_cflags_gcc_option__Wpointer_arith+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_gcc_option__Wpointer_arith="no, unknown"
@@ -16443,11 +13872,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic -Werror % -Wpointer-arith" "-pedantic % -Wpointer-arith %% no, obsolete" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16458,32 +13883,9 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_gcc_option__Wpointer_arith=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
@@ -16495,31 +13897,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__Wpointer_arith" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__Wpointer_arith" >&5
$as_echo "$ac_cv_cflags_gcc_option__Wpointer_arith" >&6; }
case ".$ac_cv_cflags_gcc_option__Wpointer_arith" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__Wpointer_arith " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wpointer_arith") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wpointer_arith"; } >&5
(: CFLAGS does contain $ac_cv_cflags_gcc_option__Wpointer_arith) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wpointer_arith\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wpointer_arith\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wpointer_arith") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wpointer_arith"
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS for gcc -Wsign-compare" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -Wsign-compare" >&5
$as_echo_n "checking CFLAGS for gcc -Wsign-compare... " >&6; }
-if test "${ac_cv_cflags_gcc_option__Wsign_compare+set}" = set; then
+if test "${ac_cv_cflags_gcc_option__Wsign_compare+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_gcc_option__Wsign_compare="no, unknown"
@@ -16533,11 +13935,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic -Werror % -Wsign-compare" "-pedantic % -Wsign-compare %% no, obsolete" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16548,32 +13946,9 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_gcc_option__Wsign_compare=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
@@ -16585,31 +13960,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__Wsign_compare" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__Wsign_compare" >&5
$as_echo "$ac_cv_cflags_gcc_option__Wsign_compare" >&6; }
case ".$ac_cv_cflags_gcc_option__Wsign_compare" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__Wsign_compare " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wsign_compare") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wsign_compare"; } >&5
(: CFLAGS does contain $ac_cv_cflags_gcc_option__Wsign_compare) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wsign_compare\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wsign_compare\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wsign_compare") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wsign_compare"
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS for gcc -Wmissing-declarations" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -Wmissing-declarations" >&5
$as_echo_n "checking CFLAGS for gcc -Wmissing-declarations... " >&6; }
-if test "${ac_cv_cflags_gcc_option__Wmissing_declarations+set}" = set; then
+if test "${ac_cv_cflags_gcc_option__Wmissing_declarations+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_gcc_option__Wmissing_declarations="no, unknown"
@@ -16623,11 +13998,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic -Werror % -Wmissing-declarations" "-pedantic % -Wmissing-declarations %% no, obsolete" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16638,32 +14009,9 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_gcc_option__Wmissing_declarations=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
@@ -16675,31 +14023,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__Wmissing_declarations" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__Wmissing_declarations" >&5
$as_echo "$ac_cv_cflags_gcc_option__Wmissing_declarations" >&6; }
case ".$ac_cv_cflags_gcc_option__Wmissing_declarations" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__Wmissing_declarations " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wmissing_declarations") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wmissing_declarations"; } >&5
(: CFLAGS does contain $ac_cv_cflags_gcc_option__Wmissing_declarations) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wmissing_declarations\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wmissing_declarations\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wmissing_declarations") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wmissing_declarations"
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS for gcc -Wdeclaration-after-statement" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -Wdeclaration-after-statement" >&5
$as_echo_n "checking CFLAGS for gcc -Wdeclaration-after-statement... " >&6; }
-if test "${ac_cv_cflags_gcc_option__Wdeclaration_after_statement+set}" = set; then
+if test "${ac_cv_cflags_gcc_option__Wdeclaration_after_statement+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_gcc_option__Wdeclaration_after_statement="no, unknown"
@@ -16713,11 +14061,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic -Werror % -Wdeclaration-after-statement" "-pedantic % -Wdeclaration-after-statement %% no, obsolete" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16728,32 +14072,9 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_gcc_option__Wdeclaration_after_statement=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
@@ -16765,31 +14086,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__Wdeclaration_after_statement" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__Wdeclaration_after_statement" >&5
$as_echo "$ac_cv_cflags_gcc_option__Wdeclaration_after_statement" >&6; }
case ".$ac_cv_cflags_gcc_option__Wdeclaration_after_statement" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__Wdeclaration_after_statement " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wdeclaration_after_statement") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wdeclaration_after_statement"; } >&5
(: CFLAGS does contain $ac_cv_cflags_gcc_option__Wdeclaration_after_statement) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wdeclaration_after_statement\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wdeclaration_after_statement\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wdeclaration_after_statement") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wdeclaration_after_statement"
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS for gcc -Werror-implicit-function-declaration" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -Werror-implicit-function-declaration" >&5
$as_echo_n "checking CFLAGS for gcc -Werror-implicit-function-declaration... " >&6; }
-if test "${ac_cv_cflags_gcc_option__Werror_implicit_function_declaration+set}" = set; then
+if test "${ac_cv_cflags_gcc_option__Werror_implicit_function_declaration+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_gcc_option__Werror_implicit_function_declaration="no, unknown"
@@ -16803,11 +14124,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic -Werror % -Werror-implicit-function-declaration" "-pedantic % -Werror-implicit-function-declaration %% no, obsolete" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16818,32 +14135,9 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_gcc_option__Werror_implicit_function_declaration=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
@@ -16855,31 +14149,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__Werror_implicit_function_declaration" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__Werror_implicit_function_declaration" >&5
$as_echo "$ac_cv_cflags_gcc_option__Werror_implicit_function_declaration" >&6; }
case ".$ac_cv_cflags_gcc_option__Werror_implicit_function_declaration" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__Werror_implicit_function_declaration " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Werror_implicit_function_declaration") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Werror_implicit_function_declaration"; } >&5
(: CFLAGS does contain $ac_cv_cflags_gcc_option__Werror_implicit_function_declaration) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Werror_implicit_function_declaration\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Werror_implicit_function_declaration\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Werror_implicit_function_declaration") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Werror_implicit_function_declaration"
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS for gcc -Wstrict-aliasing" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -Wstrict-aliasing" >&5
$as_echo_n "checking CFLAGS for gcc -Wstrict-aliasing... " >&6; }
-if test "${ac_cv_cflags_gcc_option__Wstrict_aliasing+set}" = set; then
+if test "${ac_cv_cflags_gcc_option__Wstrict_aliasing+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_gcc_option__Wstrict_aliasing="no, unknown"
@@ -16893,11 +14187,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic -Werror % -Wstrict-aliasing" "-pedantic % -Wstrict-aliasing %% no, obsolete" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16908,32 +14198,9 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_gcc_option__Wstrict_aliasing=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
@@ -16945,31 +14212,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__Wstrict_aliasing" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__Wstrict_aliasing" >&5
$as_echo "$ac_cv_cflags_gcc_option__Wstrict_aliasing" >&6; }
case ".$ac_cv_cflags_gcc_option__Wstrict_aliasing" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__Wstrict_aliasing " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wstrict_aliasing") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Wstrict_aliasing"; } >&5
(: CFLAGS does contain $ac_cv_cflags_gcc_option__Wstrict_aliasing) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wstrict_aliasing\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Wstrict_aliasing\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wstrict_aliasing") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Wstrict_aliasing"
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS for gcc -Warray-bounds" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -Warray-bounds" >&5
$as_echo_n "checking CFLAGS for gcc -Warray-bounds... " >&6; }
-if test "${ac_cv_cflags_gcc_option__Warray_bounds+set}" = set; then
+if test "${ac_cv_cflags_gcc_option__Warray_bounds+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_gcc_option__Warray_bounds="no, unknown"
@@ -16983,11 +14250,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic -Werror % -Warray-bounds" "-pedantic % -Warray-bounds %% no, obsolete" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -16998,32 +14261,9 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_gcc_option__Warray_bounds=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
CFLAGS="$ac_save_CFLAGS"
@@ -17035,31 +14275,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_gcc_option__Warray_bounds" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__Warray_bounds" >&5
$as_echo "$ac_cv_cflags_gcc_option__Warray_bounds" >&6; }
case ".$ac_cv_cflags_gcc_option__Warray_bounds" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_gcc_option__Warray_bounds " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Warray_bounds") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_gcc_option__Warray_bounds"; } >&5
(: CFLAGS does contain $ac_cv_cflags_gcc_option__Warray_bounds) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Warray_bounds\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_gcc_option__Warray_bounds\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Warray_bounds") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_gcc_option__Warray_bounds"
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS making strings readonly" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS making strings readonly" >&5
$as_echo_n "checking CFLAGS making strings readonly... " >&6; }
-if test "${ac_cv_cflags_no_writable_strings+set}" = set; then
+if test "${ac_cv_cflags_no_writable_strings+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_no_writable_strings="no, unknown"
@@ -17078,11 +14318,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# I am not sure what effect that has really. - guidod
for ac_arg in "-pedantic % -fno-writable-strings -Wwrite-strings" "-pedantic % -fconst-strings -Wwrite-strings" "-v -Xc % -xstrconst" "+w1 -Aa % +ESlit" "-w0 -std1 % -readonly_strings" "-fullwarn -use_readonly_const %% ok, its the default" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -17093,43 +14329,16 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_no_writable_strings=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case ".$ac_cv_cflags_no_writable_strings" in
.|.no|.no,*) ;;
*) # sanity check - testing strcpy() from string.h
cp config.log config.tmp
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
int
@@ -17142,33 +14351,12 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
if test `diff config.log config.tmp | grep -i warning | wc -l` != 0
then ac_cv_cflags_no_writable_strings="no, suppressed, string.h," ; fi
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_cflags_no_writable_strings="no, suppressed, string.h"
+ ac_cv_cflags_no_writable_strings="no, suppressed, string.h"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
rm config.tmp
;;
@@ -17182,7 +14370,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_no_writable_strings" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_no_writable_strings" >&5
$as_echo "$ac_cv_cflags_no_writable_strings" >&6; }
case ".$ac_cv_cflags_no_writable_strings" in
.ok|.ok,*) ;;
@@ -17190,24 +14378,24 @@ case ".$ac_cv_cflags_no_writable_strings" in
;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_no_writable_strings " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_no_writable_strings") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_no_writable_strings"; } >&5
(: CFLAGS does contain $ac_cv_cflags_no_writable_strings) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_no_writable_strings\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_no_writable_strings\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_no_writable_strings") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_no_writable_strings"
fi
;;
esac
-{ $as_echo "$as_me:$LINENO: checking CFLAGS for strict prototypes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for strict prototypes" >&5
$as_echo_n "checking CFLAGS for strict prototypes... " >&6; }
-if test "${ac_cv_cflags_strict_prototypes+set}" = set; then
+if test "${ac_cv_cflags_strict_prototypes+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_cflags_strict_prototypes="no, unknown"
@@ -17221,11 +14409,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_save_CFLAGS="$CFLAGS"
for ac_arg in "-pedantic % -fstrict-prototypes -Wstrict-prototypes" "-pedantic % -Wstrict-prototypes" "-pedantic % -Wmissing-prototypes" "-pedantic % -Werror-implicit-function-declaration" "-pedantic % -Wimplicit-function-declaration" #
do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -17236,43 +14420,16 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_cflags_strict_prototypes=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
case ".$ac_cv_cflags_strict_prototypes" in
.|.no|.no,*) ;;
*) # sanity check with signal() from sys/signal.h
cp config.log config.tmp
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <signal.h>
int
@@ -17285,34 +14442,13 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
if test `diff config.log config.tmp | grep -i warning | wc -l` != 0
then if test `diff config.log config.tmp | grep -i warning | wc -l` != 1
then ac_cv_cflags_strict_prototypes="no, suppressed, signal.h," ; fi ; fi
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_cflags_strict_prototypes="no, suppressed, signal.h"
+ ac_cv_cflags_strict_prototypes="no, suppressed, signal.h"
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
rm config.tmp
;;
@@ -17326,7 +14462,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cflags_strict_prototypes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_strict_prototypes" >&5
$as_echo "$ac_cv_cflags_strict_prototypes" >&6; }
case ".$ac_cv_cflags_strict_prototypes" in
.ok|.ok,*) ;;
@@ -17334,16 +14470,16 @@ case ".$ac_cv_cflags_strict_prototypes" in
;;
*)
if echo " $CFLAGS " | grep " $ac_cv_cflags_strict_prototypes " 2>&1 >/dev/null
- then { ($as_echo "$as_me:$LINENO: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes") >&5
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_strict_prototypes"; } >&5
(: CFLAGS does contain $ac_cv_cflags_strict_prototypes) 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- else { ($as_echo "$as_me:$LINENO: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\"") >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_strict_prototypes\""; } >&5
(: CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
CFLAGS="$CFLAGS $ac_cv_cflags_strict_prototypes"
fi
;;
@@ -17356,7 +14492,7 @@ esac
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# Check whether --enable-enable-default-pkgconfigdir was given.
-if test "${enable_enable_default_pkgconfigdir+set}" = set; then
+if test "${enable_enable_default_pkgconfigdir+set}" = set; then :
enableval=$enable_enable_default_pkgconfigdir;
fi
@@ -17367,9 +14503,9 @@ case ".$enable_default_pkgconfigdir" in
if test ".$PKG_CONFIG" = "." ; then # we use the same default as in pkg.m4
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -17382,14 +14518,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -17398,10 +14534,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
$as_echo "$PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -17473,9 +14609,9 @@ ax_warning_default_pkgconfig_loc='$ax_warning_default_pkgconfig_def'
if test ".$PKG_CONFIG" = "." ; then # we use the same default as in pkg.m4
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -17488,14 +14624,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -17504,10 +14640,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
$as_echo "$PKG_CONFIG" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -17572,11 +14708,11 @@ $as_echo X"$ax_warning_default_pkgconfig_dir" |
ax_warning_default_pkgconfig_dir="/"
fi fi fi
fi
-{ ($as_echo "$as_me:$LINENO: : last pkgconfig dir is assumed as \"\$ax_warning_default_pkgconfig_dir\"") >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: : last pkgconfig dir is assumed as \"\$ax_warning_default_pkgconfig_dir\""; } >&5
(: last pkgconfig dir is assumed as "$ax_warning_default_pkgconfig_dir") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
ax_warning_default_pkgconfig_dir=`eval "echo $ax_warning_default_pkgconfig_dir"`
ax_warning_default_pkgconfig_dir=`eval "echo $ax_warning_default_pkgconfig_dir"`
ax_warning_default_pkgconfig_loc=`eval "echo $ax_warning_default_pkgconfig_loc"`
@@ -17584,17 +14720,17 @@ ax_warning_default_pkgconfig_loc=`eval "echo $ax_warning_default_pkgconfig_loc"`
ax_warning_default_pkgconfig_loc=`eval "echo $ax_warning_default_pkgconfig_loc"`
ax_warning_default_pkgconfig_loc=`eval "echo $ax_warning_default_pkgconfig_loc"`
for ax_warning_default_pkgconfig_dir in `echo "$PKG_CONFIG_PATH:$ax_warning_default_pkgconfig_dir" | sed -e 's,:, ,g'` ; do
- { ($as_echo "$as_me:$LINENO: : test \".\$ax_warning_default_pkgconfig_loc\" = \".\$ax_warning_default_pkgconfig_dir\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : test \".\$ax_warning_default_pkgconfig_loc\" = \".\$ax_warning_default_pkgconfig_dir\""; } >&5
(: test ".$ax_warning_default_pkgconfig_loc" = ".$ax_warning_default_pkgconfig_dir") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
test ".$ax_warning_default_pkgconfig_loc" = ".$ax_warning_default_pkgconfig_dir" && break
done
if test "$ax_warning_default_pkgconfig_loc" != "$ax_warning_default_pkgconfig_dir" ; then
- { $as_echo "$as_me:$LINENO: warning: pkgconfigdir=$ax_warning_default_pkgconfig_loc (see config.log)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: pkgconfigdir=$ax_warning_default_pkgconfig_loc (see config.log)" >&5
$as_echo "$as_me: warning: pkgconfigdir=$ax_warning_default_pkgconfig_loc (see config.log)" >&6;}
- { $as_echo "$as_me:$LINENO: perhaps: make install pkgconfigdir=$ax_warning_default_pkgconfig_dir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: perhaps: make install pkgconfigdir=$ax_warning_default_pkgconfig_dir" >&5
$as_echo "$as_me: perhaps: make install pkgconfigdir=$ax_warning_default_pkgconfig_dir" >&6;}
cat >&5 <<EOF
pkgconfigdir: the default pkgconfigdir of $ax_warning_default_pkgconfig_loc
@@ -17610,7 +14746,7 @@ pkgconfigdir="$ax_warning_default_pkgconfig_dir"
# Check whether --enable-enable-default-aclocaldir was given.
-if test "${enable_enable_default_aclocaldir+set}" = set; then
+if test "${enable_enable_default_aclocaldir+set}" = set; then :
enableval=$enable_enable_default_aclocaldir;
fi
@@ -17621,9 +14757,9 @@ case ".$enable_default_aclocaldir" in
if test ".$ACLOCAL" = "." ; then
# Extract the first word of "aclocal", so it can be a program name with args.
set dummy aclocal; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ACLOCAL+set}" = set; then
+if test "${ac_cv_path_ACLOCAL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ACLOCAL in
@@ -17636,14 +14772,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ACLOCAL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_ACLOCAL" && ac_cv_path_ACLOCAL=":"
@@ -17652,10 +14788,10 @@ esac
fi
ACLOCAL=$ac_cv_path_ACLOCAL
if test -n "$ACLOCAL"; then
- { $as_echo "$as_me:$LINENO: result: $ACLOCAL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ACLOCAL" >&5
$as_echo "$ACLOCAL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -17673,9 +14809,9 @@ ax_warning_default_aclocal_loc='$ax_warning_default_aclocal_def'
if test ".$ACLOCAL" = "." ; then
# Extract the first word of "aclocal", so it can be a program name with args.
set dummy aclocal; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ACLOCAL+set}" = set; then
+if test "${ac_cv_path_ACLOCAL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ACLOCAL in
@@ -17688,14 +14824,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ACLOCAL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
test -z "$ac_cv_path_ACLOCAL" && ac_cv_path_ACLOCAL=":"
@@ -17704,10 +14840,10 @@ esac
fi
ACLOCAL=$ac_cv_path_ACLOCAL
if test -n "$ACLOCAL"; then
- { $as_echo "$as_me:$LINENO: result: $ACLOCAL" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ACLOCAL" >&5
$as_echo "$ACLOCAL" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -17724,26 +14860,26 @@ ax_warning_default_aclocal_loc=`eval "echo $ax_warning_default_aclocal_loc"`
ax_warning_default_aclocal_loc=`eval "echo $ax_warning_default_aclocal_loc"`
ax_warning_default_aclocal_loc=`eval "echo $ax_warning_default_aclocal_loc"`
ax_warning_default_aclocal_loc=`eval "echo $ax_warning_default_aclocal_loc"`
-{ ($as_echo "$as_me:$LINENO: : test \"\$ax_warning_default_aclocal_loc\" = \"\$ax_warning_default_aclocal_dir\"") >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: : test \"\$ax_warning_default_aclocal_loc\" = \"\$ax_warning_default_aclocal_dir\""; } >&5
(: test "$ax_warning_default_aclocal_loc" = "$ax_warning_default_aclocal_dir") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
if test "$ax_warning_default_aclocal_loc" != "$ax_warning_default_aclocal_dir" ; then
if test -f "$ax_warning_default_aclocal_dir/dirlist" ; then
for ax_warning_default_aclocal_dir in `cat $ax_warning_default_aclocal_dir/dirlist` $ax_warning_default_aclocal_dir ; do
- { ($as_echo "$as_me:$LINENO: : test \"\$ax_warning_default_aclocal_loc\" = \"\$ax_warning_default_aclocal_dir\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : test \"\$ax_warning_default_aclocal_loc\" = \"\$ax_warning_default_aclocal_dir\""; } >&5
(: test "$ax_warning_default_aclocal_loc" = "$ax_warning_default_aclocal_dir") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
test "$ax_warning_default_aclocal_loc" = "$ax_warning_default_aclocal_dir" && break
done
fi
if test "$ax_warning_default_aclocal_loc" != "$ax_warning_default_aclocal_dir" ; then
- { $as_echo "$as_me:$LINENO: warning: aclocaldir=$ax_warning_default_aclocal_loc (see config.log)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: aclocaldir=$ax_warning_default_aclocal_loc (see config.log)" >&5
$as_echo "$as_me: warning: aclocaldir=$ax_warning_default_aclocal_loc (see config.log)" >&6;}
- { $as_echo "$as_me:$LINENO: perhaps: make install aclocaldir=$ax_warning_default_aclocal_dir" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: perhaps: make install aclocaldir=$ax_warning_default_aclocal_dir" >&5
$as_echo "$as_me: perhaps: make install aclocaldir=$ax_warning_default_aclocal_dir" >&6;}
cat >&5 <<EOF
aclocaldir: the default aclocaldir of $ax_warning_default_aclocal_loc
@@ -17790,13 +14926,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -17804,8 +14940,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -17828,11 +14964,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
@@ -17852,8 +14988,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -17869,25 +15005,16 @@ else
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -17895,9 +15022,10 @@ fi
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -17907,17 +15035,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -17925,23 +15054,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -17949,7 +15070,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -17960,7 +15087,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -17983,13 +15110,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -17999,15 +15119,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -18019,12 +15139,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -18036,7 +15160,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -18050,8 +15256,12 @@ else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
@@ -18071,76 +15281,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -18169,8 +15328,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -18189,10 +15396,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in
+ case $1 in #(
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -18207,13 +15414,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -18245,13 +15458,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -18270,16 +15485,17 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to the package provider."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -18315,6 +15531,8 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
@@ -18322,20 +15540,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
+ as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -18343,11 +15560,10 @@ Try \`$0 --help' for more information." >&2
ac_cs_silent=: ;;
# This is an error.
- -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1"
+ *) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
esac
@@ -18700,9 +15916,7 @@ do
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"bins/Makefile") CONFIG_FILES="$CONFIG_FILES bins/Makefile" ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -18729,7 +15943,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ trap 'as_fn_exit 1' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
@@ -18740,11 +15954,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} ||
-{
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -18752,10 +15962,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
-ac_cr=' '
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -18769,24 +15985,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -18808,7 +16018,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -18822,7 +16032,7 @@ s/.\{148\}//
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -18875,9 +16085,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -18918,9 +16126,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -19005,9 +16211,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -19020,9 +16224,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
- { (exit 1); exit 1; }; };;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -19050,12 +16252,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- ac_file_inputs="$ac_file_inputs '$ac_f'"
+ as_fn_append ac_file_inputs " '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -19066,7 +16266,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
@@ -19079,9 +16279,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; } ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -19109,47 +16307,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
case "$ac_dir" in
@@ -19206,7 +16364,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-
ac_sed_dataroot='
/datarootdir/ {
p
@@ -19216,12 +16373,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -19231,7 +16387,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
@@ -19260,14 +16416,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
@@ -19277,9 +16431,7 @@ which seems to be undefined. Please make sure it is defined." >&2;}
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -19290,25 +16442,19 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
- { (exit 1); exit 1; }; }
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -19346,7 +16492,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -19356,14 +16502,14 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
"buildir":C) ac_top_srcdir="$ax_enable_builddir_srcdir"
if test ".$ax_enable_builddir" = "." ; then
if test -f "$top_srcdir/Makefile" ; then
- { $as_echo "$as_me:$LINENO: skipping top_srcdir/Makefile - left untouched" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: skipping top_srcdir/Makefile - left untouched" >&5
$as_echo "$as_me: skipping top_srcdir/Makefile - left untouched" >&6;}
else
- { $as_echo "$as_me:$LINENO: skipping top_srcdir/Makefile - not created" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: skipping top_srcdir/Makefile - not created" >&5
$as_echo "$as_me: skipping top_srcdir/Makefile - not created" >&6;}
fi
else
- { $as_echo "$as_me:$LINENO: create top_srcdir/Makefile guessed from local Makefile" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: create top_srcdir/Makefile guessed from local Makefile" >&5
$as_echo "$as_me: create top_srcdir/Makefile guessed from local Makefile" >&6;}
x='`' ; cat >$tmp/conftemp.sed <<_EOF
/^\$/n
@@ -19398,11 +16544,11 @@ _EOF
$ax_enable_builddir_sed -f $tmp/conftemp.sed Makefile >>$ac_top_srcdir/Makefile
echo 'done: ;@ if grep "$(RULE)-done .*:" Makefile > /dev/null; then echo $(MAKE) $(RULE)-done ; $(MAKE) $(RULE)-done ; else true ; fi' >> $ac_top_srcdir/Makefile
if test -f "$ac_top_srcdir/Makefile.mk" ; then
- { $as_echo "$as_me:$LINENO: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&5
$as_echo "$as_me: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&6;}
cat $ac_top_srcdir/Makefile.mk >>$ac_top_srcdir/Makefile
fi
- { $as_echo "$as_me:$LINENO: make uses BUILD=$ax_enable_builddir (on $ax_enable_builddir_host:)" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: make uses BUILD=$ax_enable_builddir (on $ax_enable_builddir_host:)" >&5
$as_echo "$as_me: make uses BUILD=$ax_enable_builddir (on $ax_enable_builddir_host:)" >&6;}
fi
;;
@@ -19494,47 +16640,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
@@ -20208,14 +17314,12 @@ if test ".$ac_prefix_conf_INP" = "."; then
esac
fi
if test -z "$ac_prefix_conf_PKG" ; then
- { { $as_echo "$as_me:$LINENO: error: no prefix for _PREFIX_PKG_CONFIG_H" >&5
-$as_echo "$as_me: error: no prefix for _PREFIX_PKG_CONFIG_H" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no prefix for _PREFIX_PKG_CONFIG_H" "$LINENO" 5
else
if test ! -f "$ac_prefix_conf_INP" ; then if test -f "$srcdir/$ac_prefix_conf_INP" ; then
ac_prefix_conf_INP="$srcdir/$ac_prefix_conf_INP"
fi fi
- { $as_echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
$as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
if test -f $ac_prefix_conf_INP ; then
echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
@@ -20237,7 +17341,7 @@ $as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for
echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
echo "#endif" >>$tmp/pconfig.h
if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
- { $as_echo "$as_me:$LINENO: $ac_prefix_conf_OUT is unchanged" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_prefix_conf_OUT is unchanged" >&5
$as_echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}
else
ac_dir=`$as_dirname -- "$ac_prefix_conf_OUT" ||
@@ -20263,55 +17367,13 @@ $as_echo X"$ac_prefix_conf_OUT" |
q
}
s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
rm -f "$ac_prefix_conf_OUT"
mv $tmp/pconfig.h "$ac_prefix_conf_OUT"
fi
cp conftest.prefix _configs.sed
else
- { { $as_echo "$as_me:$LINENO: error: input file $ac_prefix_conf_INP does not exist - skip generating $ac_prefix_conf_OUT" >&5
-$as_echo "$as_me: error: input file $ac_prefix_conf_INP does not exist - skip generating $ac_prefix_conf_OUT" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "input file $ac_prefix_conf_INP does not exist - skip generating $ac_prefix_conf_OUT" "$LINENO" 5
fi
rm -f conftest.*
fi
@@ -20342,14 +17404,12 @@ if test ".$ac_prefix_conf_INP" = "."; then
esac
fi
if test -z "$ac_prefix_conf_PKG" ; then
- { { $as_echo "$as_me:$LINENO: error: no prefix for _PREFIX_PKG_CONFIG_H" >&5
-$as_echo "$as_me: error: no prefix for _PREFIX_PKG_CONFIG_H" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "no prefix for _PREFIX_PKG_CONFIG_H" "$LINENO" 5
else
if test ! -f "$ac_prefix_conf_INP" ; then if test -f "$srcdir/$ac_prefix_conf_INP" ; then
ac_prefix_conf_INP="$srcdir/$ac_prefix_conf_INP"
fi fi
- { $as_echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
$as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
if test -f $ac_prefix_conf_INP ; then
echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
@@ -20371,7 +17431,7 @@ $as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for
echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
echo "#endif" >>$tmp/pconfig.h
if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
- { $as_echo "$as_me:$LINENO: $ac_prefix_conf_OUT is unchanged" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_prefix_conf_OUT is unchanged" >&5
$as_echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}
else
ac_dir=`$as_dirname -- "$ac_prefix_conf_OUT" ||
@@ -20397,55 +17457,13 @@ $as_echo X"$ac_prefix_conf_OUT" |
q
}
s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
rm -f "$ac_prefix_conf_OUT"
mv $tmp/pconfig.h "$ac_prefix_conf_OUT"
fi
cp conftest.prefix _configs.sed
else
- { { $as_echo "$as_me:$LINENO: error: input file $ac_prefix_conf_INP does not exist - skip generating $ac_prefix_conf_OUT" >&5
-$as_echo "$as_me: error: input file $ac_prefix_conf_INP does not exist - skip generating $ac_prefix_conf_OUT" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "input file $ac_prefix_conf_INP does not exist - skip generating $ac_prefix_conf_OUT" "$LINENO" 5
fi
rm -f conftest.*
fi
@@ -20459,7 +17477,7 @@ then generate="true"
else generate="false";
fi
if $generate ; then
-{ $as_echo "$as_me:$LINENO: creating $pkgconfig_generate.in" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $pkgconfig_generate.in" >&5
$as_echo "$as_me: creating $pkgconfig_generate.in" >&6;}
cat > $pkgconfig_generate.in <<AXEOF
# generated by configure / remove this line to disable regeneration
@@ -20482,7 +17500,7 @@ Libs: -L\${libdir} @LDFLAGS@ @LIBS@
Cflags: -I\${includedir} @CPPFLAGS@
AXEOF
fi # DONE generate $pkgconfig_generate.in
-{ $as_echo "$as_me:$LINENO: creating $pkgconfig_generate" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $pkgconfig_generate" >&5
$as_echo "$as_me: creating $pkgconfig_generate" >&6;}
cat >conftest.sed <<AXEOF
s|@prefix@|${pkgconfig_prefix}|
@@ -20505,12 +17523,10 @@ s|@CPPFLAGS@|${pkgconfig_cppflags}|
AXEOF
sed -f conftest.sed $pkgconfig_generate.in > $pkgconfig_generate
if test ! -s $pkgconfig_generate ; then
- { { $as_echo "$as_me:$LINENO: error: $pkgconfig_generate is empty" >&5
-$as_echo "$as_me: error: $pkgconfig_generate is empty" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$pkgconfig_generate is empty" "$LINENO" 5
fi ; rm conftest.sed # DONE generate $pkgconfig_generate
pkgconfig_uninstalled=`echo $pkgconfig_generate |sed 's/.pc$/-uninstalled.pc/'`
-{ $as_echo "$as_me:$LINENO: creating $pkgconfig_uninstalled" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $pkgconfig_uninstalled" >&5
$as_echo "$as_me: creating $pkgconfig_uninstalled" >&6;}
cat >conftest.sed <<AXEOF
s|@prefix@|${pkgconfig_prefix}|
@@ -20533,16 +17549,14 @@ s|@CPPFLAGS@|${pkgconfig_cppflags}|
AXEOF
sed -f conftest.sed $pkgconfig_generate.in > $pkgconfig_uninstalled
if test ! -s $pkgconfig_uninstalled ; then
- { { $as_echo "$as_me:$LINENO: error: $pkgconfig_uninstalled is empty" >&5
-$as_echo "$as_me: error: $pkgconfig_uninstalled is empty" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$pkgconfig_uninstalled is empty" "$LINENO" 5
fi ; rm conftest.sed # DONE generate $pkgconfig_uninstalled
pkgconfig_requires_add=`echo ${pkgconfig_requires}`
if test ".$pkgconfig_requires_add" != "." ; then
pkgconfig_requires_add="pkg-config $pkgconfig_requires_add"
else pkgconfig_requires_add=":" ; fi
pkgconfig_uninstalled=`echo $pkgconfig_generate |sed 's/.pc$/-uninstalled.sh/'`
-{ $as_echo "$as_me:$LINENO: creating $pkgconfig_uninstalled" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $pkgconfig_uninstalled" >&5
$as_echo "$as_me: creating $pkgconfig_uninstalled" >&6;}
cat >conftest.sed <<AXEOF
s|@prefix@|\"${pkgconfig_prefix}\"|
@@ -20578,9 +17592,7 @@ s>Cflags: *>\\;\\; --cflags) echo >
AXEOF
sed -f conftest.sed $pkgconfig_generate.in > $pkgconfig_uninstalled
if test ! -s $pkgconfig_uninstalled ; then
- { { $as_echo "$as_me:$LINENO: error: $pkgconfig_uninstalled is empty" >&5
-$as_echo "$as_me: error: $pkgconfig_uninstalled is empty" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "$pkgconfig_uninstalled is empty" "$LINENO" 5
fi ; rm conftest.sed # DONE generate $pkgconfig_uninstalled
;;
@@ -20588,15 +17600,12 @@ fi ; rm conftest.sed # DONE generate $pkgconfig_uninstalled
done # for ac_tag
-{ (exit 0); exit 0; }
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -20617,10 +17626,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit $?
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
@@ -20628,7 +17637,7 @@ fi
case "$host_os" in
darwin*)
if grep "1.92" libtool >/dev/null ; then
-{ $as_echo "$as_me:$LINENO: result: patching libtool on .so-sharedlib creation (zsh overquoting)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: patching libtool on .so-sharedlib creation (zsh overquoting)" >&5
$as_echo "patching libtool on .so-sharedlib creation (zsh overquoting)" >&6; }
test -f libtool.old || (mv libtool libtool.old && cp libtool.old libtool)
sed -e '/archive_cmds=/s:[\\][\\][\\]*":\\":g' libtool >libtool.new
@@ -20642,7 +17651,7 @@ esac
# patch libtool to fix sys_lib_search_path (e.g. crosscompiling a win32 dll)
if test "_$PATH_SEPARATOR" = "_:" ; then
if grep "^sys_lib_search_path_spec.*:" libtool >/dev/null ; then
-{ $as_echo "$as_me:$LINENO: result: patching libtool to fix sys_lib_search_path_spec" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: patching libtool to fix sys_lib_search_path_spec" >&5
$as_echo "patching libtool to fix sys_lib_search_path_spec" >&6; }
test -f libtool.old || (mv libtool libtool.old && cp libtool.old libtool)
sed -e "/^sys_lib_search_path_spec/s/:/ /g" libtool >libtool.new
@@ -20661,7 +17670,7 @@ if grep "HOST_CC" libtool >/dev/null; then
test -x $i/cc && HOST_CC=$i/cc
done
fi
-{ $as_echo "$as_me:$LINENO: result: patching libtool to add HOST_CC=$HOST_CC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: patching libtool to add HOST_CC=$HOST_CC" >&5
$as_echo "patching libtool to add HOST_CC=$HOST_CC" >&6; }
test -f libtool.old || (mv libtool libtool.old && cp libtool.old libtool)
sed -e "/BEGIN.*LIBTOOL.*CONFIG/a\\
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/configure.ac b/Build/source/libs/zziplib/zziplib-0.13.60/configure.ac
index 7a1e877549d..751575336a8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/configure.ac
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/configure.ac
@@ -250,22 +250,35 @@ esac
# ---------------------------------------------------------------
AC_MSG_CHECKING(whether making SDL parts)
SDL=""
+SDL_GENERATE=""
AC_ARG_ENABLE(sdl, AC_HELP_STRING(
[--enable-sdl],[enable SDL usage (if present)])
,,[enable_sdl="no"])
if test "$enable_sdl" = "no" ; then
AC_MSG_RESULT([no, disabled])
else
- enable_sdl=`sdl-config --version 2>/dev/null`
+ enable_sdl=`pkg-config --modversion sdl 2>/dev/null`
+ if test -z "$enable_sdl"; then
+ enable_sdl=`sdl-config --version 2>/dev/null`
+ SDL_GENERATE="sdl-uninstalled.pc"
+ enable_sdl="$enable_sdl (sdl-config)"
+ else
+ enable_sdl="$enable_sdl (pkgconfig)"
+ fi
+ enable_sdl="$enable_sdl."
case ".$enable_sdl" in
- .1.*) AC_MSG_RESULT([yes, for SDL $enable_sdl])
+ .1.*) AC_MSG_RESULT([yes, using SDL $enable_sdl])
SDL="SDL" ;;
.2.*) AC_MSG_RESULT([yes, untested $enable_sdl])
SDL="SDL" ;;
*) AC_MSG_RESULT([no, $enable_sdl]) ;;
esac
+ if test -n "$SDL_GENERATE"; then
+ AC_MSG_RESULT([enabled SDL generation of... $SDL_GENERATE])
+ fi
fi
-AC_SUBST(SDL)
+AC_SUBST([SDL])
+AC_SUBST([SDL_GENERATE])
# ---------------------------------------------------------------
AC_MSG_CHECKING(running extra tests on make check)
if test "MKZIP" != ":" ; then
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/64on32.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/64on32.htm
index 4da84140d5c..4da84140d5c 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/64on32.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/64on32.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/COPYING.LIB b/Build/source/libs/zziplib/zziplib-0.13.60/docs/COPYING.LIB
index eb685a5ec98..eb685a5ec98 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/COPYING.LIB
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/COPYING.LIB
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/COPYING.MPL b/Build/source/libs/zziplib/zziplib-0.13.60/docs/COPYING.MPL
index 18f8109b797..18f8109b797 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/COPYING.MPL
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/COPYING.MPL
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/COPYING.ZLIB b/Build/source/libs/zziplib/zziplib-0.13.60/docs/COPYING.ZLIB
index b21b5724b39..b21b5724b39 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/COPYING.ZLIB
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/COPYING.ZLIB
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/Makefile.am b/Build/source/libs/zziplib/zziplib-0.13.60/docs/Makefile.am
index ec0dd845747..ec0dd845747 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/Makefile.am
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/Makefile.am
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/Makefile.in b/Build/source/libs/zziplib/zziplib-0.13.60/docs/Makefile.in
index ef4882e3959..03ab81a5738 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/Makefile.in
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -133,6 +133,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PAX = @PAX@
@@ -145,6 +146,7 @@ RANLIB = @RANLIB@
RELEASE_INFO = @RELEASE_INFO@
RESOLVES = @RESOLVES@
SDL = @top_srcdir@/SDL
+SDL_GENERATE = @SDL_GENERATE@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/README.MSVC6 b/Build/source/libs/zziplib/zziplib-0.13.60/docs/README.MSVC6
index ee042c35092..ee042c35092 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/README.MSVC6
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/README.MSVC6
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/README.SDL b/Build/source/libs/zziplib/zziplib-0.13.60/docs/README.SDL
index f0fc66fee24..f0fc66fee24 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/README.SDL
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/README.SDL
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/body.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/body.htm
index a2b2dba91f4..a2b2dba91f4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/body.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/body.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/configs.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/configs.htm
index 49631e673de..49631e673de 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/configs.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/configs.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/copying.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/copying.htm
index 2f0c8c96d79..2f0c8c96d79 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/copying.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/copying.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/developer.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/developer.htm
index 9c964f09933..9c964f09933 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/developer.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/developer.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/download.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/download.htm
index d52111155fc..d52111155fc 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/download.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/download.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/faq.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/faq.htm
index 56d79366655..56d79366655 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/faq.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/faq.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/fseeko.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/fseeko.htm
index 89c3195e36d..89c3195e36d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/fseeko.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/fseeko.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/functions.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/functions.htm
index 1ded1f47d66..1ded1f47d66 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/functions.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/functions.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/future.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/future.htm
index e116429abb1..e116429abb1 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/future.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/future.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/history.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/history.htm
index 7250729e877..7250729e877 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/history.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/history.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/make-dbk.pl b/Build/source/libs/zziplib/zziplib-0.13.60/docs/make-dbk.pl
index e1fe56683df..e1fe56683df 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/make-dbk.pl
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/make-dbk.pl
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/make-doc.pl b/Build/source/libs/zziplib/zziplib-0.13.60/docs/make-doc.pl
index 89da2f6a95c..89da2f6a95c 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/make-doc.pl
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/make-doc.pl
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/make-doc.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/make-doc.py
index c58427c4a5c..c58427c4a5c 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/make-doc.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/make-doc.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/makedocs.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/makedocs.py
index 1bc8f885e79..1bc8f885e79 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/makedocs.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/makedocs.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/memdisk.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/memdisk.htm
index d5d25c9952d..d5d25c9952d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/memdisk.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/memdisk.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/mksite.pl b/Build/source/libs/zziplib/zziplib-0.13.60/docs/mksite.pl
index a463b3a9ce7..a463b3a9ce7 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/mksite.pl
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/mksite.pl
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/mksite.sh b/Build/source/libs/zziplib/zziplib-0.13.60/docs/mksite.sh
index 12af7948d00..12af7948d00 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/mksite.sh
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/mksite.sh
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/mmapped.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/mmapped.htm
index 9ac35ece988..9ac35ece988 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/mmapped.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/mmapped.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/notes.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/notes.htm
index 4b6d78177c3..4b6d78177c3 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/notes.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/notes.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/referentials.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/referentials.htm
index 8519ed3cd99..8519ed3cd99 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/referentials.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/referentials.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/sdocbook.css b/Build/source/libs/zziplib/zziplib-0.13.60/docs/sdocbook.css
index 95a65fb2d24..95a65fb2d24 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/sdocbook.css
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/sdocbook.css
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/sfx-make.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/sfx-make.htm
index 5e092e47a11..5e092e47a11 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/sfx-make.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/sfx-make.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zip-php.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zip-php.htm
index 04166673f38..04166673f38 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zip-php.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zip-php.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-api.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-api.htm
index 79bed1401d4..79bed1401d4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-api.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-api.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-basics.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-basics.htm
index 0d0504710e7..0d0504710e7 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-basics.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-basics.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-crypt.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-crypt.htm
index 9d55ba97215..9d55ba97215 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-crypt.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-crypt.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-cryptoid.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-cryptoid.htm
index ee6b120d7f9..ee6b120d7f9 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-cryptoid.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-cryptoid.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-extio.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-extio.htm
index c7c47f1a37d..c7c47f1a37d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-extio.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-extio.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-extras.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-extras.htm
index 1d771160cb9..1d771160cb9 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-extras.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-extras.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-file.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-file.htm
index 241baef85a7..241baef85a7 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-file.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-file.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-index.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-index.htm
index 8b7a9bb6637..8b7a9bb6637 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-index.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-index.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-parse.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-parse.htm
index a3c49dcba76..a3c49dcba76 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-parse.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-parse.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-sdl-rwops.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-sdl-rwops.htm
index 38923f6f0be..38923f6f0be 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-sdl-rwops.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-sdl-rwops.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-xor.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-xor.htm
index 2434c2974a9..2434c2974a9 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-xor.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-xor.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-zip.htm b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-zip.htm
index 141700044a5..141700044a5 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzip-zip.htm
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzip-zip.htm
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/__init__.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/__init__.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/__init__.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/commentmarkup.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/commentmarkup.py
index 3f605a72d6c..3f605a72d6c 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/commentmarkup.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/commentmarkup.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/dbk2htm.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/dbk2htm.py
index f8593e697b0..f8593e697b0 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/dbk2htm.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/dbk2htm.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/docbookdocument.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/docbookdocument.py
index c4602ad64d3..c4602ad64d3 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/docbookdocument.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/docbookdocument.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionheader.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionheader.py
index 81bb385c408..81bb385c408 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionheader.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionheader.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionlisthtmlpage.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionlisthtmlpage.py
index 4ec9178ca10..4ec9178ca10 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionlisthtmlpage.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionlisthtmlpage.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionlistreference.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionlistreference.py
index 944d005c6fb..944d005c6fb 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionlistreference.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionlistreference.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionprototype.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionprototype.py
index fda85bb3117..fda85bb3117 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/functionprototype.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/functionprototype.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/htm2dbk.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/htm2dbk.py
index ec9685bfd3e..ec9685bfd3e 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/htm2dbk.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/htm2dbk.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/htmldocument.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/htmldocument.py
index 47d58dc6ad2..47d58dc6ad2 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/htmldocument.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/htmldocument.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/match.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/match.py
index a089ec399c9..a089ec399c9 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/match.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/match.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/options.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/options.py
index c6758d5fabf..c6758d5fabf 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/options.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/options.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/textfile.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/textfile.py
index bfaff8dbdfa..bfaff8dbdfa 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/textfile.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/textfile.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/textfileheader.py b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/textfileheader.py
index 2ac0896e5fd..2ac0896e5fd 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipdoc/textfileheader.py
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipdoc/textfileheader.py
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipfseeko.html b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipfseeko.html
index c1d078666e8..1f103b9a7dd 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipfseeko.html
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipfseeko.html
@@ -1,6 +1,6 @@
<html><head><title>zziplib Library Functions</title>
</head><body>
-<h2>zziplib Library Functions</h2><p>Version 0.13.59</p><p><big><b><code>#include &lt;zzip/fseeko.h&gt;</code></b></big></p><table width="100%"><tr><td valign="top"><code><b><code><a href="#zzip_entry_fopen">zzip_entry_fopen</a></code></b>(ZZIP_ENTRY * entry, int takeover)
+<h2>zziplib Library Functions</h2><p>Version 0.13.60</p><p><big><b><code>#include &lt;zzip/fseeko.h&gt;</code></b></big></p><table width="100%"><tr><td valign="top"><code><b><code><a href="#zzip_entry_fopen">zzip_entry_fopen</a></code></b>(ZZIP_ENTRY * entry, int takeover)
: zzip__new__ ZZIP_ENTRY_FILE *
</code></td></tr><tr><td valign="top"><code><b><code><a href="#zzip_entry_ffile">zzip_entry_ffile</a></code></b>(FILE * disk, char *filename)
: zzip__new__ ZZIP_ENTRY_FILE *
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib-manpages.dbk b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib-manpages.dbk
index d3c8998bea7..d3c8998bea7 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib-manpages.dbk
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib-manpages.dbk
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib-manpages.tar b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib-manpages.tar
index 1074be2069d..d200b2b80cf 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib-manpages.tar
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib-manpages.tar
Binary files differ
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib-master.dbk b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib-master.dbk
index 8384c282428..8384c282428 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib-master.dbk
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib-master.dbk
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib.html b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib.html
index 709280e8ee4..89336cc12d6 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zziplib.html
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zziplib.html
@@ -1,6 +1,6 @@
<html><head><title>zziplib Library Functions</title>
</head><body>
-<h2>zziplib Library Functions</h2><p>Version 0.13.59</p><p><big><b><code>#include &lt;zzip/lib.h&gt;</code></b></big></p><table width="100%"><tr><td valign="top"><code><b><code><a href="#zzip_error">zzip_error</a></code></b>(ZZIP_DIR * dir)
+<h2>zziplib Library Functions</h2><p>Version 0.13.60</p><p><big><b><code>#include &lt;zzip/lib.h&gt;</code></b></big></p><table width="100%"><tr><td valign="top"><code><b><code><a href="#zzip_error">zzip_error</a></code></b>(ZZIP_DIR * dir)
: int
</code></td></tr><tr><td valign="top"><code><b><code><a href="#zzip_seterror">zzip_seterror</a></code></b>(ZZIP_DIR * dir, int errcode) : void
</code></td></tr><tr><td valign="top"><code><b><code><a href="#zzip_open">zzip_open</a></code></b>(zzip_char_t * filename, int o_flags)
@@ -151,6 +151,9 @@
</p><p>
The <code>zzip_open_ext_io</code> function returns a new zzip-handle (use <code><a href="#zzip_close">zzip_close</a></code> to return
it). On error the <code>zzip_open_ext_io</code> function will return null setting <a href="http://www.opengroup.org/onlinepubs/000095399/functions/errno.html"><code>errno(3)</code></a>.
+</p><p>
+ If any ext_io handlers were used then the referenced structure
+ should be static as the allocated ZZIP_FILE does not copy them.
</p>
</td></tr><tr><td valign="top"><p>
The <code>zzip_open_shared_io</code> function takes an extra stream argument - if a handle has been
@@ -246,6 +249,8 @@
</code></td></tr></table></dt><dd><table width="100%"><tr><td valign="top"><table border="0" width="100%" cellpadding="0" cellspacing="0"><td> &nbsp;<em>...</em> </td><td align="right"> <em><small>zzip/zip.c</small></em></td></table>
</td></tr><tr><td valign="top"><p> the <code>zzip_dir_open_ext_io</code> function uses explicit ext and io instead of the internal
defaults. Setting these to zero is equivalent to <code><a href="#zzip_dir_open">zzip_dir_open</a></code>
+ Note that the referenced ext_io plugin handlers structure must be
+ static as it is not copied to the returned ZZIP_DIR structure.
</p>
</td></tr><tr><td valign="top"><p> fills the dirent-argument with the values and
increments the read-pointer of the dir-argument.
@@ -258,7 +263,8 @@
: zzip_plugin_io_t
</code></td></tr></table></dt><dd><table width="100%"><tr><td valign="top"><table border="0" width="100%" cellpadding="0" cellspacing="0"><td> &nbsp;<em>...</em> </td><td align="right"> <em><small>zzip/plugin.c</small></em></td></table>
</td></tr><tr><td valign="top"><p> The <code>zzip_get_default_io</code> function returns a zzip_plugin_io_t handle to static defaults
- wrapping the posix io file functions for actual file access.
+ wrapping the posix io file functions for actual file access. The
+ returned structure is shared by all threads in the system.
</p>
</td></tr></table></dd><dt><table width="100%"></table></dt><dd><table width="100%"></table></dd><dt><table width="100%"></table></dt><dd><table width="100%"></table></dd><dt><table width="100%"><tr><td valign="top"><code><b><a name="zzip_rewinddir">zzip_rewinddir</a></b>(ZZIP_DIR * dir)
: void
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipmmapped.html b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipmmapped.html
index 39b1386e80b..d5b82aea8ad 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/docs/zzipmmapped.html
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/docs/zzipmmapped.html
@@ -1,6 +1,6 @@
<html><head><title>zziplib Library Functions</title>
</head><body>
-<h2>zziplib Library Functions</h2><p>Version 0.13.59</p><p><big><b><code>#include &lt;zzip/mmapped.h&gt;</code></b></big></p><table width="100%"><tr><td valign="top"><code><b><code><a href="#zzip_disk_entry_to_data">zzip_disk_entry_to_data</a></code></b>(ZZIP_DISK * disk, struct zzip_disk_entry * entry)
+<h2>zziplib Library Functions</h2><p>Version 0.13.60</p><p><big><b><code>#include &lt;zzip/mmapped.h&gt;</code></b></big></p><table width="100%"><tr><td valign="top"><code><b><code><a href="#zzip_disk_entry_to_data">zzip_disk_entry_to_data</a></code></b>(ZZIP_DISK * disk, struct zzip_disk_entry * entry)
: zzip_byte_t *
</code></td></tr><tr><td valign="top"><code><b><code><a href="#zzip_disk_entry_to_file_header">zzip_disk_entry_to_file_header</a></code></b>(ZZIP_DISK * disk, struct zzip_disk_entry *entry)
: struct zzip_file_header *
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ac_compile_check_sizeof.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ac_compile_check_sizeof.m4
index a1cdb402636..a1cdb402636 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ac_compile_check_sizeof.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ac_compile_check_sizeof.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ac_set_default_paths_system.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ac_set_default_paths_system.m4
index e2cc5aa9faa..e2cc5aa9faa 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ac_set_default_paths_system.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ac_set_default_paths_system.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ac_sys_largefile_sensitive.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ac_sys_largefile_sensitive.m4
index 235c7f9acaa..235c7f9acaa 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ac_sys_largefile_sensitive.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ac_sys_largefile_sensitive.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/acx_restrict.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/acx_restrict.m4
index d5a9562ea0d..d5a9562ea0d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/acx_restrict.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/acx_restrict.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_gcc_option.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_gcc_option.m4
index c8a6411f81d..c8a6411f81d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_gcc_option.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_gcc_option.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_no_writable_strings.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_no_writable_strings.m4
index db9997ea6fd..db9997ea6fd 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_no_writable_strings.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_no_writable_strings.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_strict_prototypes.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_strict_prototypes.m4
index bd19c17962b..bd19c17962b 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_strict_prototypes.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_strict_prototypes.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_warn_all.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_warn_all.m4
index 15b3f394814..15b3f394814 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_cflags_warn_all.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_cflags_warn_all.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_check_aligned_access_required.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_check_aligned_access_required.m4
index 3f0872679bc..3f0872679bc 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_check_aligned_access_required.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_check_aligned_access_required.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_configure_args.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_configure_args.m4
index 597b6b079f4..597b6b079f4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_configure_args.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_configure_args.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_create_pkgconfig_info.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_create_pkgconfig_info.m4
index 9af0bbf5d5c..9af0bbf5d5c 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_create_pkgconfig_info.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_create_pkgconfig_info.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_enable_builddir_uname.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_enable_builddir_uname.m4
index df5e2639c17..df5e2639c17 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_enable_builddir_uname.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_enable_builddir_uname.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_expand_prefix.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_expand_prefix.m4
index 2d6b39d06c9..2d6b39d06c9 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_expand_prefix.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_expand_prefix.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_maintainer_mode_auto_silent.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_maintainer_mode_auto_silent.m4
index 3f4123b5162..3f4123b5162 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_maintainer_mode_auto_silent.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_maintainer_mode_auto_silent.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_not_enable_frame_pointer.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_not_enable_frame_pointer.m4
index 7499962f07c..7499962f07c 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_not_enable_frame_pointer.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_not_enable_frame_pointer.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_pax_tar.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_pax_tar.m4
index 588f9e0093a..588f9e0093a 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_pax_tar.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_pax_tar.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_prefix_config_h.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_prefix_config_h.m4
index 70dee8fb4ec..70dee8fb4ec 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_prefix_config_h.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_prefix_config_h.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_set_version_info.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_set_version_info.m4
index 83c5fa73f21..83c5fa73f21 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_set_version_info.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_set_version_info.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_spec_file.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_spec_file.m4
index c80a75a4e04..c80a75a4e04 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_spec_file.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_spec_file.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_spec_package_version.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_spec_package_version.m4
index f13b247bacf..f13b247bacf 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_spec_package_version.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_spec_package_version.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_warning_default_aclocaldir.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_warning_default_aclocaldir.m4
index c4cb4aaa7e4..c4cb4aaa7e4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_warning_default_aclocaldir.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_warning_default_aclocaldir.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_warning_default_pkgconfig.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_warning_default_pkgconfig.m4
index f5cdfb3c255..f5cdfb3c255 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ax_warning_default_pkgconfig.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ax_warning_default_pkgconfig.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/libtool.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/libtool.m4
index 39ba996cb96..39ba996cb96 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/libtool.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/libtool.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ltoptions.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ltoptions.m4
index 34151a3ba62..34151a3ba62 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ltoptions.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ltoptions.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ltsugar.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ltsugar.m4
index 9000a057d31..9000a057d31 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ltsugar.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ltsugar.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ltversion.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ltversion.m4
index b8e154fe6e1..b8e154fe6e1 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/ltversion.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/ltversion.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/lt~obsolete.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/lt~obsolete.m4
index 637bb2066c4..637bb2066c4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/lt~obsolete.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/lt~obsolete.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/patch_libtool_on_darwin_zsh_overquoting.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/patch_libtool_on_darwin_zsh_overquoting.m4
index ecbfc5ef2ea..ecbfc5ef2ea 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/patch_libtool_on_darwin_zsh_overquoting.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/patch_libtool_on_darwin_zsh_overquoting.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/patch_libtool_sys_lib_search_path_spec.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/patch_libtool_sys_lib_search_path_spec.m4
index 1eadedf3075..1eadedf3075 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/patch_libtool_sys_lib_search_path_spec.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/patch_libtool_sys_lib_search_path_spec.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/m4/patch_libtool_to_add_host_cc.m4 b/Build/source/libs/zziplib/zziplib-0.13.60/m4/patch_libtool_to_add_host_cc.m4
index 04c06e337bf..04c06e337bf 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/m4/patch_libtool_to_add_host_cc.m4
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/m4/patch_libtool_to_add_host_cc.m4
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzcat.dsp b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzcat.dsp
index 861c81b5d44..861c81b5d44 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzcat.dsp
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzcat.dsp
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzdir.dsp b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzdir.dsp
index 37431dc6c84..37431dc6c84 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzdir.dsp
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzdir.dsp
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzip.dsp b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzip.dsp
index 09ce2566a14..09ce2566a14 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzip.dsp
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzip.dsp
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zziplib.dsp b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zziplib.dsp
index ac5b7eab754..ac5b7eab754 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zziplib.dsp
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zziplib.dsp
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zziplib.dsw b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zziplib.dsw
index 5c7e1766bca..5c7e1766bca 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zziplib.dsw
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zziplib.dsw
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zziptest.dsp b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zziptest.dsp
index 605265be925..605265be925 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zziptest.dsp
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zziptest.dsp
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzipwrap.dsp b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzipwrap.dsp
index 4f6a328aac8..4f6a328aac8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzipwrap.dsp
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzipwrap.dsp
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzobfuscated.dsp b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzobfuscated.dsp
index 566365cf4ac..566365cf4ac 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc6/zzobfuscated.dsp
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc6/zzobfuscated.dsp
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/pkzip.exe b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/pkzip.exe
index eb0d2673922..eb0d2673922 100755
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/pkzip.exe
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/pkzip.exe
Binary files differ
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/test.zip b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/test.zip
index ce4770015f4..ce4770015f4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/test.zip
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/test.zip
Binary files differ
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/test1.zip b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/test1.zip
index c46015d9431..c46015d9431 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/test1.zip
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/test1.zip
Binary files differ
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzcat.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzcat.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzcat.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzcat.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzcat.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzcat.vcproj
index a9d4809e91e..a9d4809e91e 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzcat.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzcat.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzdir.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzdir.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzdir.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzdir.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzdir.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzdir.vcproj
index a6c40e2a8fa..a6c40e2a8fa 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzdir.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzdir.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzip.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzip.sln
index 33ffa4d9e36..33ffa4d9e36 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzip.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzip.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzip.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzip.vcproj
index 77c4646d077..77c4646d077 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzip.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzip.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziplib.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziplib.sln
index 9515ef61985..9515ef61985 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziplib.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziplib.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziplib.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziplib.vcproj
index 6c5f71c06c5..6c5f71c06c5 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziplib.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziplib.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.bat b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.bat
index b0bc8688def..b0bc8688def 100755
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.bat
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.bat
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.txt b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.txt
index f423a018e29..f423a018e29 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.txt
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.txt
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.vcproj
index a2ecfa151c4..a2ecfa151c4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipself.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipself.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipsetstub.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipsetstub.sln
index bf4bbb5001d..bf4bbb5001d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipsetstub.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipsetstub.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipsetstub.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipsetstub.vcproj
index a2d58135ca2..a2d58135ca2 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzipsetstub.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzipsetstub.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziptest.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziptest.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziptest.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziptest.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziptest.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziptest.vcproj
index b34253efbda..b34253efbda 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zziptest.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zziptest.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzobfuscated.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzobfuscated.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzobfuscated.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzobfuscated.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzobfuscated.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzobfuscated.vcproj
index e2de1c1008b..e2de1c1008b 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc7/zzobfuscated.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc7/zzobfuscated.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/README.TXT b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/README.TXT
new file mode 100644
index 00000000000..4767a06787e
--- /dev/null
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/README.TXT
@@ -0,0 +1,61 @@
+These project files were tested with the
+free Microsoft Visual C++ 2005 Express Edition.
+
+Visual C++ Express does NOT include the Win32 SDK Headers.
+They must be downloaded separately as documented in the
+installation instructions at Microsoft - consequently that
+extra installation must be referenced via a system variable:
+Set MSSdk=C:\Program Files\Microsoft Platform SDK
+
+In order to compile you need a valid Zlib SDK - you can
+download it from zlib.org in the archive zlib123-dll.zip -
+I had unpacked them to $(zziplibdir)/zlib inside the
+toplevel of the zziplib source tree. That SDK does ship
+with a "zlib1.dll" runtime and "zdll.lib" import library.
+
+The new Visual Studio has depracated most of the Win32 API
+just as well as most of the Posix API. That provokes a lot
+of warning message in surplus of the many warning message
+that occur on every implicit conversion between signed and
+unsigned types. Other compilers are more clever about
+detecting real conversion issues, therefore they are not
+going to be "patched away" with an explicit conversion in
+the source files (I expect Microsoft to get it right somewhen).
+
+== Download Places ==
+http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
+= central place referenced a lot in the MSDN but the link is broken
+
+http://download.microsoft.com/download/a/5/f/a5f0d781-e201-4ab6-8c6a-9bb4efed1e1a/PSDK-x86.exe
+http://download.microsoft.com/download/a/5/f/a5f0d781-e201-4ab6-8c6a-9bb4efed1e1a/PSDK-amd64.exe
+http://download.microsoft.com/download/a/5/f/a5f0d781-e201-4ab6-8c6a-9bb4efed1e1a/PSDK-ia64.exe
+= Windows Server 2003 SP1 Platform SDK Web Install (win32/win64/.. - but SDK for all CPU types)
+
+http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe
+http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-ia64.exe
+http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-amd64.exe
+= Windows Server 2003 R2 Platform SDK Web Install (win32/win64/.. - but SDK for all CPU types)
+
+http://download.microsoft.com/download/A/9/1/A91D6B2B-A798-47DF-9C7E-A97854B7DD18/VC.iso
+= Visual C++ Express CD-image
+http://download.microsoft.com/download/C/6/F/C6F4733B-67C7-4C15-9F21-61F7A3167505/VCS.iso
+= Visual C# Express CD-image
+
+http://zlib.net/zlib123-dll.zip (broken)
+http://zlib.net/zlib125-dll.zip
+= unpack one of them into zzip-0/zlib (if using the subversion checkout)
+
+== Environment Variables ==
+On Windows-7 the environment variables can be found in the
+control panel > system information > change name settings > extras tab > click button
+
+== Debug Variables ==
+To run the zziptest for debugging the solution file has now a setting
+in Properties > Debugging > Environment > PATH=$(InputDir)\..\zlib\
+so that the zlib1.dll can be found. This needs to be adapted if the
+zlib123-dll.zip was unpackaged somewhere else.
+
+== Compiling Error ==
+'can not delete debug/*.idb' - occurs when running MSVC in a VMWare box
+pointing to a Unix drive; create a symlink `ln -s Debug debug` to fix it.
+There are Pre/Post-Build Rules to remove *.idb but sometimes its left over.
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/test.zip b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/test.zip
index ce4770015f4..ce4770015f4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/test.zip
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/test.zip
Binary files differ
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/test1.zip b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/test1.zip
index c46015d9431..c46015d9431 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/test1.zip
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/test1.zip
Binary files differ
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zip.exe b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zip.exe
index b6240d89380..b6240d89380 100755
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zip.exe
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zip.exe
Binary files differ
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzcat.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzcat.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzcat.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzcat.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzcat.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzcat.vcproj
index 28fac9daf57..e75f3281f46 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzcat.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzcat.vcproj
@@ -63,6 +63,8 @@
/>
<Tool
Name="VCLinkerTool"
+ IgnoreImportLibrary="false"
+ AdditionalOptions="/NODEFAULTLIB:library"
AdditionalDependencies="zziplib-$(ConfigurationName).lib"
OutputFile="zziptest-$(ConfigurationName).exe"
LinkIncremental="2"
@@ -150,6 +152,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/NODEFAULTLIB:library"
AdditionalDependencies="zziplib-$(ConfigurationName).lib"
OutputFile="zziptest-$(ConfigurationName).exe"
LinkIncremental="1"
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzdir.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzdir.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzdir.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzdir.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzdir.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzdir.vcproj
index 8053aae1187..8053aae1187 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzdir.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzdir.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzip.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzip.sln
index 9580f58e46b..9580f58e46b 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzip.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzip.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzip.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzip.vcproj
index 77c4646d077..77c4646d077 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzip.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzip.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipfseeko.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipfseeko.vcproj
index 34924fde00e..34924fde00e 100755
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipfseeko.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipfseeko.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziplib.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziplib.sln
index 9515ef61985..9515ef61985 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziplib.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziplib.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziplib.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziplib.vcproj
index 623120dde73..f9570848dda 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziplib.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziplib.vcproj
@@ -176,6 +176,10 @@
>
</File>
<File
+ RelativePath="..\zzip\fetch.c"
+ >
+ </File>
+ <File
RelativePath="..\zzip\file.c"
>
</File>
@@ -229,6 +233,10 @@
>
</File>
<File
+ RelativePath="..\zzip\fetch.h"
+ >
+ </File>
+ <File
RelativePath="..\zzip\file.h"
>
</File>
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipmmapped.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipmmapped.vcproj
index 3edd7835c81..3edd7835c81 100755
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipmmapped.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipmmapped.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.bat b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.bat
index b0bc8688def..b0bc8688def 100755
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.bat
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.bat
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.txt b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.txt
index f423a018e29..f423a018e29 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.txt
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.txt
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.vcproj
index ef6be9edaea..ef6be9edaea 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipself.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipself.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipsetstub.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipsetstub.sln
index bf4bbb5001d..bf4bbb5001d 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipsetstub.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipsetstub.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipsetstub.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipsetstub.vcproj
index d255f56d4d6..d255f56d4d6 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzipsetstub.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzipsetstub.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziptest.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziptest.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziptest.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziptest.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziptest.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziptest.vcproj
index 7dc3123374a..7dc3123374a 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zziptest.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zziptest.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzobfuscated.sln b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzobfuscated.sln
index b959f0c92f8..b959f0c92f8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzobfuscated.sln
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzobfuscated.sln
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzobfuscated.vcproj b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzobfuscated.vcproj
index cd08dd227d8..cd08dd227d8 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/msvc8/zzobfuscated.vcproj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/msvc8/zzobfuscated.vcproj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/test/Makefile.am b/Build/source/libs/zziplib/zziplib-0.13.60/test/Makefile.am
index 418e0178e22..418e0178e22 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/test/Makefile.am
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/test/Makefile.am
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/test/Makefile.in b/Build/source/libs/zziplib/zziplib-0.13.60/test/Makefile.in
index bc9df562be7..5bd4eb40b26 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/test/Makefile.in
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -159,6 +159,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PAX = @PAX@
@@ -171,6 +172,7 @@ RANLIB = @RANLIB@
RELEASE_INFO = @RELEASE_INFO@
RESOLVES = @RESOLVES@
SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/test/README b/Build/source/libs/zziplib/zziplib-0.13.60/test/README
index 5668eda043a..5668eda043a 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/test/README
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/test/README
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/test/test.zip b/Build/source/libs/zziplib/zziplib-0.13.60/test/test.zip
index 56aee6bf0f4..399253c13d4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/test/test.zip
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/test/test.zip
Binary files differ
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/test/test1.zip b/Build/source/libs/zziplib/zziplib-0.13.60/test/test1.zip
index c46015d9431..c46015d9431 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/test/test1.zip
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/test/test1.zip
Binary files differ
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/test/zzipself.c b/Build/source/libs/zziplib/zziplib-0.13.60/test/zzipself.c
index 2cd115e75af..2cd115e75af 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/test/zzipself.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/test/zzipself.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/test/zzipsetstub.c b/Build/source/libs/zziplib/zziplib-0.13.60/test/zzipsetstub.c
index 5d5ad0c903b..5d5ad0c903b 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/test/zzipsetstub.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/test/zzipsetstub.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/Makefile.am b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/Makefile.am
index 9b4089df98f..0319cc80fa5 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/Makefile.am
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/Makefile.am
@@ -87,7 +87,8 @@ install-data-hook : install-zzipHEADERS
install-exec-hook:
@ for i in . $(DESTDIR)$(libdir)/libzzip*.so.13 \
- ; do test -d $$i && continue ; lib=`basename "$$i" .so.13` \
+ ; do test -d $$i && continue ; test -f $$i || continue \
+ ; lib=`basename "$$i" .so.13` \
; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.10" \
; (cd $(DESTDIR)$(libdir) && ln -s $$lib.so.13 $$lib.so.10) \
; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.11" \
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/Makefile.in b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/Makefile.in
index 8bf9c810d07..2d45a2b3684 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/Makefile.in
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -195,6 +195,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PAX = @PAX@
@@ -207,6 +208,7 @@ RANLIB = @RANLIB@
RELEASE_INFO = @RELEASE_INFO@
RESOLVES = @RESOLVES@
SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -776,7 +778,8 @@ install-data-hook : install-zzipHEADERS
install-exec-hook:
@ for i in . $(DESTDIR)$(libdir)/libzzip*.so.13 \
- ; do test -d $$i && continue ; lib=`basename "$$i" .so.13` \
+ ; do test -d $$i && continue ; test -f $$i || continue \
+ ; lib=`basename "$$i" .so.13` \
; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.10" \
; (cd $(DESTDIR)$(libdir) && ln -s $$lib.so.13 $$lib.so.10) \
; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.11" \
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__debug.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__debug.h
index 13c7d895443..13c7d895443 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__debug.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__debug.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__dirent.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__dirent.h
index fc3e08f03d1..fc3e08f03d1 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__dirent.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__dirent.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__fnmatch.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__fnmatch.h
index 55d96b6d1ef..340dbaa2c8c 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__fnmatch.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__fnmatch.h
@@ -4,6 +4,7 @@
#include <zzip/conf.h>
#include <stdio.h>
+#include <string.h>
#ifdef ZZIP_HAVE_FNMATCH_H
#include <fnmatch.h>
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__hints.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__hints.h
index d071c4ebd7f..d071c4ebd7f 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__hints.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__hints.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__mmap.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__mmap.h
index d70419dcb02..d70419dcb02 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/__mmap.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/__mmap.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/_msvc.sed b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/_msvc.sed
index ec1fcbba192..ec1fcbba192 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/_msvc.sed
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/_msvc.sed
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/autoconf.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/autoconf.h
index f0d6841454a..f0d6841454a 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/autoconf.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/autoconf.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/conf.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/conf.h
index 52b33e287ce..52b33e287ce 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/conf.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/conf.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/dir.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/dir.c
index 2df1bbc0fda..2df1bbc0fda 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/dir.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/dir.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/err.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/err.c
index 1ba869bd9af..1ba869bd9af 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/err.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/err.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/fetch.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/fetch.c
index bd1958483ff..bd1958483ff 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/fetch.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/fetch.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/fetch.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/fetch.h
index ca51a8026d9..ca51a8026d9 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/fetch.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/fetch.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/file.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/file.c
index 37d72ed1427..5cda62e72ce 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/file.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/file.c
@@ -717,6 +717,9 @@ zzip_open(zzip_char_t * filename, int o_flags)
*
* This function returns a new zzip-handle (use => zzip_close to return
* it). On error this function will return null setting => errno(3).
+ *
+ * If any ext_io handlers were used then the referenced structure
+ * should be static as the allocated ZZIP_FILE does not copy them.
*/
ZZIP_FILE *
zzip_open_ext_io(zzip_char_t * filename, int o_flags, int o_modes,
@@ -768,7 +771,7 @@ zzip_open_shared_io(ZZIP_FILE * stream,
{
zzip_plugin_io_t os = (o_modes & ZZIP_ALLOWREAL)
? zzip_get_default_io() : io;
- int fd = os->fd.open(filename, o_flags); /* io->fd.open */
+ int fd = (os->fd.open)(filename, o_flags); /* io->fd.open */
if (fd != -1)
{
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/file.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/file.h
index fcff276bb23..fcff276bb23 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/file.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/file.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/format.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/format.h
index 0881479c167..0881479c167 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/format.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/format.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/fseeko.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/fseeko.c
index d99067a0b4f..d99067a0b4f 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/fseeko.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/fseeko.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/fseeko.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/fseeko.h
index 9abade7452c..9abade7452c 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/fseeko.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/fseeko.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/info.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/info.c
index 0c50600ff24..0c50600ff24 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/info.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/info.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/info.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/info.h
index 0ab6edab561..0ab6edab561 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/info.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/info.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/lib.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/lib.h
index 28b5311d655..28b5311d655 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/lib.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/lib.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/memdisk.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/memdisk.c
index dc00ea86508..dc00ea86508 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/memdisk.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/memdisk.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/memdisk.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/memdisk.h
index 2411f642c5e..2411f642c5e 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/memdisk.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/memdisk.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/mmapped.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/mmapped.c
index 6fafc1163a6..6fafc1163a6 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/mmapped.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/mmapped.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/mmapped.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/mmapped.h
index ee2ba5ad8b6..ee2ba5ad8b6 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/mmapped.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/mmapped.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/plugin.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/plugin.c
index a7d77c060cd..ee578f41f55 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/plugin.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/plugin.c
@@ -55,7 +55,8 @@ static const struct zzip_plugin_io default_io = {
/** => zzip_init_io
* This function returns a zzip_plugin_io_t handle to static defaults
- * wrapping the posix io file functions for actual file access.
+ * wrapping the posix io file functions for actual file access. The
+ * returned structure is shared by all threads in the system.
*/
zzip_plugin_io_t
zzip_get_default_io(void)
@@ -66,6 +67,9 @@ zzip_get_default_io(void)
/**
* This function initializes the users handler struct to default values
* being the posix io functions in default configured environments.
+ *
+ * Note that the target io_handlers_t structure should be static or
+ * atleast it should be kept during the lifetime of zzip operations.
*/
int
zzip_init_io(zzip_plugin_io_handlers_t io, int flags)
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/plugin.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/plugin.h
index b6ccbe8a66f..8282193440c 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/plugin.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/plugin.h
@@ -59,7 +59,8 @@ typedef union _zzip_plugin_io
} zzip_plugin_io_handlers;
#define _zzip_plugin_io_handlers zzip_plugin_io_handlers
-/* for backward compatibility, and the following to your application code:
+
+/* for backward compatibility, add the following to your application code:
* #ifndef _zzip_plugin_io_handlers
* #define _zzip_plugin_io_handlers struct zzip_plugin_io
*/
@@ -74,7 +75,9 @@ typedef zzip_plugin_io_handlers* zzip_plugin_io_handlers_t;
_zzip_export zzip_off_t
zzip_filesize(int fd);
-/* get the default file I/O functions */
+/* get the default file I/O functions.
+ * This functions returns a pointer to an internal static structure.
+ */
_zzip_export zzip_plugin_io_t zzip_get_default_io(void);
/*
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/stat.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/stat.c
index 33f4fdc223c..d77c025f82f 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/stat.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/stat.c
@@ -40,7 +40,8 @@ zzip_dir_stat(ZZIP_DIR * dir, zzip_char_t * name, ZZIP_STAT * zs, int flags)
struct zzip_dir_hdr *hdr = dir->hdr0;
int (*cmp) (zzip_char_t *, zzip_char_t *);
- cmp = (flags & ZZIP_CASEINSENSITIVE) ? strcasecmp : strcmp;
+ if (flags & ZZIP_CASEINSENSITIVE) flags |= ZZIP_CASELESS;
+ cmp = (flags & ZZIP_CASELESS) ? strcasecmp : strcmp;
if (! hdr)
{
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/stdint.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/stdint.h
index 4552c5b04e0..4552c5b04e0 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/stdint.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/stdint.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/types.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/types.h
index 6f9c6e6f983..6f9c6e6f983 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/types.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/types.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/write.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/write.c
index d862fe21d21..7521e204bee 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/write.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/write.c
@@ -176,7 +176,7 @@ zzip_dir_creat_ext_io(zzip_char_t * name, int o_mode,
memcpy(dir->realname + name_len, exx, exx_len); /* append! */
}
____;
- fd = io->fd.open(dir->realname, O_CREAT | O_TRUNC | O_WRONLY, o_mode);
+ fd = (io->fd.open)(dir->realname, O_CREAT | O_TRUNC | O_WRONLY, o_mode);
dir->realname[name_len] = '\0'; /* keep ummodified */
if (fd != -1)
{ dir->fd = fd; return dir; }
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/write.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/write.h
index 6db6b09eed2..6db6b09eed2 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/write.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/write.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zip.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zip.c
index ff6029fb524..a574b24be18 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zip.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zip.c
@@ -464,6 +464,14 @@ __zzip_parse_root_directory(int fd,
d = &dirent;
}
+ if ((zzip_off64_t) (zz_offset + sizeof(*d)) > zz_rootsize ||
+ (zzip_off64_t) (zz_offset + sizeof(*d)) < 0)
+ {
+ FAIL4("%li's entry stretches beyond root directory (O:%li R:%li)",
+ (long) entries, (long) (zz_offset), (long) zz_rootsize);
+ break;
+ }
+
if (! zzip_disk_entry_check_magic(d)) {
# ifndef ZZIP_ALLOW_MODULO_ENTRIES
FAIL4("%li's entry has no disk_entry magic indicator (O:%li R:%li)",
@@ -472,13 +480,6 @@ __zzip_parse_root_directory(int fd,
break;
}
- if ((zzip_off64_t) (zz_offset + sizeof(*d)) > zz_rootsize ||
- (zzip_off64_t) (zz_offset + sizeof(*d)) < 0)
- {
- FAIL4("%li's entry stretches beyond root directory (O:%li R:%li)",
- (long) entries, (long) (zz_offset), (long) zz_rootsize);
- break;
- }
# if 0 && defined DEBUG
zzip_debug_xbuf((unsigned char *) d, sizeof(*d) + 8);
# endif
@@ -775,7 +776,7 @@ __zzip_try_open(zzip_char_t * filename, int filemode,
for (; *ext; ++ext)
{
strcpy(file + len, *ext);
- fd = io->fd.open(file, filemode);
+ fd = (io->fd.open)(file, filemode);
if (fd != -1)
return fd;
}
@@ -796,6 +797,8 @@ zzip_dir_open(zzip_char_t * filename, zzip_error_t * e)
/** => zzip_dir_open
* this function uses explicit ext and io instead of the internal
* defaults. Setting these to zero is equivalent to => zzip_dir_open
+ * Note that the referenced ext_io plugin handlers structure must be
+ * static as it is not copied to the returned ZZIP_DIR structure.
*/
ZZIP_DIR *
zzip_dir_open_ext_io(zzip_char_t * filename, zzip_error_t * e,
@@ -808,7 +811,7 @@ zzip_dir_open_ext_io(zzip_char_t * filename, zzip_error_t * e,
if (! ext)
ext = zzip_get_default_ext();
- fd = io->fd.open(filename, O_RDONLY | O_BINARY);
+ fd = (io->fd.open)(filename, O_RDONLY | O_BINARY);
if (fd != -1)
{
return zzip_dir_fdopen_ext_io(fd, e, ext, io);
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzip-zlib-config.pc b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzip-zlib-config.pc
index 62413b93bee..62413b93bee 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzip-zlib-config.pc
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzip-zlib-config.pc
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzip.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzip.h
index 6f2c5169080..6f2c5169080 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzip.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzip.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzip32.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzip32.h
index 04802507c17..04802507c17 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzip32.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzip32.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzipfseeko.pc b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzipfseeko.pc
index fb7d318b0ea..4fb7b22af67 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzipfseeko.pc
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzipfseeko.pc
@@ -11,8 +11,8 @@ package=zzipfseeko
suffix=
Name: zzipfseeko
-Description: ZZipLib - libZ-based ZIP-access Library
-Version: 0.13.59
+Description: ZZipLib - libZ-based ZIP-access Library with an Easy-to-Use API
+Version: 0.13.60
Requires: zzip-zlib-config
Libs: -L${libdir} -lzzipfseeko
Cflags: -I${includedir}
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zziplib.pc b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zziplib.pc
index 891539adeb1..c492b8f64db 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zziplib.pc
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zziplib.pc
@@ -11,8 +11,8 @@ package=zziplib
suffix=
Name: zziplib
-Description: ZZipLib - libZ-based ZIP-access Library
-Version: 0.13.59
+Description: ZZipLib - libZ-based ZIP-access Library with an Easy-to-Use API
+Version: 0.13.60
Requires: zzip-zlib-config
Libs: -L${libdir} -lzzip
Cflags: -I${includedir}
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zziplib.wpj b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zziplib.wpj
index c73aab3de56..c73aab3de56 100755
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zziplib.wpj
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zziplib.wpj
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzipmmapped.pc b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzipmmapped.pc
index 40b1073a4e7..535d7853bd3 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzip/zzipmmapped.pc
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzip/zzipmmapped.pc
@@ -11,8 +11,8 @@ package=zzipmmapped
suffix=
Name: zzipmmapped
-Description: ZZipLib - libZ-based ZIP-access Library
-Version: 0.13.59
+Description: ZZipLib - libZ-based ZIP-access Library with an Easy-to-Use API
+Version: 0.13.60
Requires: zzip-zlib-config
Libs: -L${libdir} -lzzipmmapped
Cflags: -I${includedir}
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzipback.sed b/Build/source/libs/zziplib/zziplib-0.13.60/zzipback.sed
index b3e5e768525..b3e5e768525 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzipback.sed
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzipback.sed
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zziplib.spec b/Build/source/libs/zziplib/zziplib-0.13.60/zziplib.spec
index 622ecc9fd53..c9d0ca1f2ec 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zziplib.spec
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zziplib.spec
@@ -1,11 +1,10 @@
# norootforbuild
-%define lib lib010
-Summary: ZZipLib - libZ-based ZIP-access Library
+Summary: ZZipLib - libZ-based ZIP-access Library with an Easy-to-Use API
Name: zziplib
-Version: 0.13.59
+Version: 0.13.60
Release: 1
-License: LGPL
-Group: Development/Libraries
+License: LGPLv2.1+
+Group: System/Libraries
URL: http://zziplib.sf.net
Vendor: Guido Draheim <guidod@gmx.de>
Source0: http://prdownloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
@@ -18,6 +17,10 @@ BuildRequires: zlib-devel
BuildRequires: SDL-devel
BuildRequires: zip
+Provides: libzzip0 = %version
+Provides: libzzip-0.so.10
+Provides: zziplib-lib010 = %version
+
#Begin3
# Author1: too@iki.fi (Tomi Ollila)
# Author2: guidod@gmx.de (Guido Draheim)
@@ -28,40 +31,29 @@ BuildRequires: zip
# Copying-Policy: Lesser GPL Version 2
#End
-%package %lib
-Summary: ZZipLib - Documentation Files
-Group: Development/Libraries
-Provides: zziplib = %version
-Provides: libzzip0 = %version
-Provides: libzzip-0.so.10
-
%package doc
Summary: ZZipLib - Documentation Files
-Group: Development/Libraries
+Group: Development/Languages/C and C++
BuildRequires: python
BuildRequires: xmlto
PreReq: scrollkeeper
%package devel
Summary: ZZipLib - Development Files
-Group: Development/Libraries
-Requires: zziplib-%lib = %version
+Group: Development/Languages/C and C++
+Requires: zziplib = %version
Requires: pkgconfig
%package SDL_rwops-devel
Summary: ZZipLib - Development Files for SDL_rwops
-Group: Development/Libraries
-Requires: zziplib-%lib = %version
+Group: Development/Languages/C and C++
+Requires: zziplib = %version
Requires: pkgconfig
BuildRequires: SDL-devel
%description
: zziplib provides read access to zipped files in a zip-archive,
: using compression based solely on free algorithms provided by zlib.
-
-%description %lib
- : zziplib provides read access to zipped files in a zip-archive,
- : using compression based solely on free algorithms provided by zlib.
zziplib provides an additional API to transparently access files
being either real files or zipped files with the same filepath argument.
This is handy to package many files being shared data into a single
@@ -93,10 +85,11 @@ BuildRequires: SDL-devel
CFLAGS="$RPM_OPT_FLAGS" \
sh configure --prefix=%{_prefix} \
- --with-docdir=%{_docdir} \
--mandir=%{_mandir} \
--bindir=%{_bindir} \
--libdir=%{_libdir} \
+ --with-docdir=%{_docdir} \
+ --disable-static --with-pic \
--enable-sdl TIMEOUT=9
%__make zzip64-setup
@@ -122,14 +115,12 @@ sh configure --prefix=%{_prefix} \
%clean
%__rm -rf %{buildroot}
-%files %lib
+%files
%defattr(-,root,root)
%{_libdir}/lib*.so.*
-%post %lib
-/sbin/ldconfig || true
-%postun %lib
-/sbin/ldconfig || true
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files doc
%defattr(-,root,root)
@@ -144,6 +135,7 @@ test ! -f %_bindir/scrollkeeper-update || %_bindir/scrollkeeper-update
%files devel
%defattr(-,root,root)
+%doc ChangeLog README TODO
%{_bindir}/*
%dir %{_includedir}/zzip
%{_includedir}/zzip/*
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/Makefile.am b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/Makefile.am
index 2c5b4719841..2c5b4719841 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/Makefile.am
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/Makefile.am
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/Makefile.in b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/Makefile.in
index 1caa9451be1..b8ac59c862f 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/Makefile.in
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -190,6 +190,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PAX = @PAX@
@@ -202,6 +203,7 @@ RANLIB = @RANLIB@
RELEASE_INFO = @RELEASE_INFO@
RESOLVES = @RESOLVES@
SDL = @SDL@
+SDL_GENERATE = @SDL_GENERATE@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/wrap.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/wrap.c
index 2bea0c39e5b..2bea0c39e5b 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/wrap.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/wrap.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/wrap.h b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/wrap.h
index e4f4f5b7efc..e4f4f5b7efc 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/wrap.h
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/wrap.h
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/zzipwrap.c b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/zzipwrap.c
index 447ce23f5b4..447ce23f5b4 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/zzipwrap.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/zzipwrap.c
diff --git a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/zzipwrap.pc b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/zzipwrap.pc
index f91e6345d06..db30e3e3225 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.59/zzipwrap/zzipwrap.pc
+++ b/Build/source/libs/zziplib/zziplib-0.13.60/zzipwrap/zzipwrap.pc
@@ -3,7 +3,7 @@ libdir=/usr/local/lib
includedir=/usr/local/include
Name: zzipwrap
-Version: 0.13.59
+Version: 0.13.60
Description: Callback Wrappers for ZZipLib
Requires: zziplib
Libs: -L${libdir} -lzzipwrap