From c2a9b4bceea414d43d0203ada595fe4438fa8413 Mon Sep 17 00:00:00 2001 From: "deepin-community-bot[bot]" <156989552+deepin-community-bot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:50:30 +0000 Subject: [PATCH] feat: update libde265 to 1.0.15-1 --- .gitignore | 1 - .travis.yml | 71 - CMakeLists.txt | 40 +- Makefile.am | 5 +- Makefile.in | 65 +- README.md | 30 +- acceleration-speed/Makefile.in | 51 +- aclocal.m4 | 240 +- compile | 13 +- config.h.in | 27 +- configure | 8257 ++++++++++------- configure.ac | 18 +- debian/.gitlab-ci.yml | 3 + debian/changelog | 114 +- debian/clean | 3 + debian/control | 8 +- debian/copyright | 22 +- debian/libde265-0.symbols | 2 - debian/patches/disable_tools.patch | 22 - debian/patches/fix-private-libs-pc.patch | 26 + debian/patches/recycle_sps_if_possible.patch | 340 + ...ct_reference_pics_from_different_sps.patch | 54 + debian/patches/series | 4 + debian/patches/use_sps_from_the_image.patch | 62 + debian/rules | 5 + debian/source/include-binaries | 1 + debian/tests/control | 3 + debian/tests/test-decode | 23 + debian/tests/tree.h265 | Bin 0 -> 122475 bytes dec265/CMakeLists.txt | 26 +- dec265/Makefile.am | 12 +- dec265/Makefile.in | 81 +- dec265/dec265.cc | 50 +- dec265/hdrcopy.cc | 124 - dec265/sdl.cc | 157 +- dec265/sdl.hh | 7 +- depcomp | 8 +- enc265/CMakeLists.txt | 2 +- enc265/Makefile.in | 40 +- extra/stdbool.h | 64 - extra/stdint.h | 203 - install-sh | 36 +- libde265.pc.in | 8 +- libde265/CMakeLists.txt | 57 +- libde265/Makefile.am | 4 +- libde265/Makefile.in | 241 +- libde265/alloc_pool.h | 5 - libde265/arm/Makefile.in | 91 +- libde265/bitstream.h | 3 - libde265/cabac.cc | 47 +- libde265/cabac.h | 12 +- libde265/configparam.cc | 6 +- libde265/contextmodel.cc | 2 + libde265/de265-version.h | 4 +- libde265/de265.cc | 25 +- libde265/de265.h | 13 +- libde265/deblock.cc | 139 +- libde265/decctx.cc | 70 +- libde265/decctx.h | 19 +- libde265/dpb.cc | 35 +- libde265/dpb.h | 4 +- libde265/encoder/Makefile.in | 80 +- libde265/encoder/algo/Makefile.in | 118 +- libde265/encoder/algo/coding-options.cc | 6 +- libde265/encoder/algo/tb-intrapredmode.cc | 2 +- libde265/encoder/encoder-types.cc | 2 +- libde265/encoder/encpicbuf.cc | 12 +- libde265/image.cc | 13 +- libde265/image.h | 16 +- libde265/motion.cc | 233 +- libde265/nal-parser.cc | 2 +- libde265/nal.h | 3 - libde265/refpic.cc | 4 +- libde265/sao.cc | 23 +- libde265/slice.cc | 25 +- libde265/sps.cc | 64 +- libde265/sps.h | 10 +- libde265/threads.h | 4 - libde265/transform.cc | 4 +- libde265/vps.cc | 2 +- libde265/vps.h | 4 - libde265/vui.cc | 6 + libde265/x86/Makefile.in | 63 +- ltmain.sh | 217 +- m4/libtool.m4 | 27 +- m4/visibility.m4 | 52 + missing | 16 +- sherlock265/Makefile.in | 65 +- tools/Makefile.in | 59 +- tools/rd-curves.cc | 2 +- 90 files changed, 7155 insertions(+), 5084 deletions(-) delete mode 100644 .gitignore delete mode 100644 .travis.yml create mode 100644 debian/.gitlab-ci.yml create mode 100644 debian/clean create mode 100644 debian/patches/fix-private-libs-pc.patch create mode 100644 debian/patches/recycle_sps_if_possible.patch create mode 100644 debian/patches/reject_reference_pics_from_different_sps.patch create mode 100644 debian/patches/use_sps_from_the_image.patch create mode 100644 debian/source/include-binaries create mode 100644 debian/tests/control create mode 100755 debian/tests/test-decode create mode 100644 debian/tests/tree.h265 delete mode 100644 dec265/hdrcopy.cc delete mode 100644 extra/stdbool.h delete mode 100644 extra/stdint.h create mode 100644 m4/visibility.m4 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 224e7f0..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pc/ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index cc9ef95..0000000 --- a/.travis.yml +++ /dev/null @@ -1,71 +0,0 @@ -# stats available at -# https://travis-ci.org/strukturag/libde265/ -language: cpp -compiler: - - gcc -dist: trusty -cache: ccache -addons: - apt: - update: true -env: - - HOST= WINE= DECODESTREAMS= - - HOST=i686-w64-mingw32 WINE=wine DECODESTREAMS= - - HOST=x86_64-w64-mingw32 WINE=wine64 DECODESTREAMS= - - HOST=arm-linux-gnueabihf WINE= DECODESTREAMS= - - HOST=cmake WINE= DECODESTREAMS= - - HOST= WINE= DECODESTREAMS=libde265-teststreams-fuzzing THREADING= - - HOST= WINE= DECODESTREAMS=libde265-teststreams-fuzzing THREADING=--single-threaded - - HOST= WINE= DECODESTREAMS=libde265-teststreams-nolf THREADING= - - HOST= WINE= DECODESTREAMS=libde265-teststreams-nolf THREADING=--single-threaded - - HOST= WINE= DECODESTREAMS=libde265-teststreams-sao THREADING= - - HOST= WINE= DECODESTREAMS=libde265-teststreams-sao THREADING=--single-threaded - - HOST= WINE= DECODESTREAMS=libde265-teststreams-tiles THREADING= - - HOST= WINE= DECODESTREAMS=libde265-teststreams-tiles THREADING=--single-threaded - - HOST= WINE= DECODESTREAMS=libde265-teststreams-tiles-nolf THREADING= - - HOST= WINE= DECODESTREAMS=libde265-teststreams-tiles-nolf THREADING=--single-threaded - - HOST= WINE= DECODESTREAMS=libde265-teststreams-weighted THREADING= - - HOST= WINE= DECODESTREAMS=libde265-teststreams-weighted THREADING=--single-threaded - - HOST= WINE= DECODESTREAMS=libde265-teststreams-wpp-nolf THREADING= - - HOST= WINE= DECODESTREAMS=libde265-teststreams-wpp-nolf THREADING=--single-threaded - -matrix: - include: - - compiler: clang - env: HOST= WINE= DECODESTREAMS= - - os: osx - compiler: clang - env: HOST= WINE= DECODESTREAMS= - - os: osx - compiler: gcc - env: HOST= WINE= DECODESTREAMS= - - os: osx - compiler: gcc - env: HOST=cmake WINE= DECODESTREAMS= - allow_failures: - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-fuzzing THREADING= - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-fuzzing THREADING=--single-threaded - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-nolf THREADING= - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-nolf THREADING=--single-threaded - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-sao THREADING= - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-sao THREADING=--single-threaded - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-tiles THREADING= - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-tiles THREADING=--single-threaded - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-tiles-nolf THREADING= - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-tiles-nolf THREADING=--single-threaded - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-weighted THREADING= - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-weighted THREADING=--single-threaded - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-wpp-nolf THREADING= - - env: HOST= WINE= DECODESTREAMS=libde265-teststreams-wpp-nolf THREADING=--single-threaded - -before_install: - - ./scripts/ci-before-install-$TRAVIS_OS_NAME.sh - -install: - - git clone https://github.com/strukturag/libde265-data.git - -before_script: - - ./scripts/ci-before-script.sh - -script: - - ./scripts/ci-run.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index b339f89..6066e9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.3.2) project (libde265 LANGUAGES C CXX - VERSION 1.0.8 + VERSION 1.0.15 ) set(CMAKE_CXX_STANDARD 11) @@ -11,7 +11,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_POSITION_INDEPENDENT_CODE ON) # The version number. -set (NUMERIC_VERSION 0x01000800) +set (NUMERIC_VERSION 0x01001500) set (PACKAGE_VERSION ${PROJECT_VERSION}) include (${CMAKE_ROOT}/Modules/CheckCCompilerFlag.cmake) @@ -20,23 +20,20 @@ include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) include(GNUInstallDirs) include(CheckFunctionExists) -find_package(SDL) +option(ENABLE_SDL "Enable SDL" ON) + +if (ENABLE_SDL) + find_package(SDL2) +endif() + find_package(Threads REQUIRED) CHECK_INCLUDE_FILE(malloc.h HAVE_MALLOC_H) -CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H) -CHECK_INCLUDE_FILE(stdbool.h HAVE_STDBOOL_H) CHECK_FUNCTION_EXISTS(posix_memalign HAVE_POSIX_MEMALIGN) if (HAVE_MALLOC_H) add_definitions(-DHAVE_MALLOC_H) endif() -if (HAVE_STDINT_H) - add_definitions(-DHAVE_STDINT_H) -endif() -if (HAVE_STDBOOL_H) - add_definitions(-DHAVE_STDBOOL_H) -endif() if (HAVE_POSIX_MEMALIGN) add_definitions(-DHAVE_POSIX_MEMALIGN) endif() @@ -47,7 +44,13 @@ if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES Clang) add_definitions(-Wall) endif() -option(DISABLE_SSE "Disable SSE optimizations" OFF) +include(CheckCXXSymbolExists) +check_cxx_symbol_exists(_LIBCPP_VERSION cstdlib HAVE_LIBCPP) +if(HAVE_LIBCPP) + set(LIBS_PRIVATE "-lc++") +else() + set(LIBS_PRIVATE "-lstdc++") +endif() option(BUILD_SHARED_LIBS "Build shared library" ON) if(NOT BUILD_SHARED_LIBS) @@ -59,10 +62,15 @@ include_directories ("${PROJECT_BINARY_DIR}") include_directories ("${PROJECT_SOURCE_DIR}/libde265") if(MSVC) include_directories ("${PROJECT_SOURCE_DIR}/extra") - add_definitions(-DHAVE_STDINT_H) - add_definitions(-DHAVE_STDBOOL_H) endif() +option(ENABLE_DECODER "Enable Decoder" ON) +option(ENABLE_ENCODER "Enable Encoder" OFF) + add_subdirectory (libde265) -add_subdirectory (dec265) -add_subdirectory (enc265) +if (ENABLE_DECODER) + add_subdirectory (dec265) +endif() +if (ENABLE_ENCODER) + add_subdirectory (enc265) +endif() diff --git a/Makefile.am b/Makefile.am index f20158d..b4098f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,10 +19,13 @@ if ENABLE_SHERLOCK265 SUBDIRS+=sherlock265 endif -EXTRA_DIST = .travis.yml \ +EXTRA_DIST = \ autogen.sh \ build.bat \ + m4/ax_compare_version.m4 \ + m4/ax_cxx_compile_stdcxx_11.m4 \ m4/m4_ax_check_compile_flag.m4 \ + m4/visibility.m4 \ Makefile.vc7 \ CMakeLists.txt \ README.md \ diff --git a/Makefile.in b/Makefile.in index db14d79..5e33963 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -174,9 +174,9 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in + cscope distdir distdir-am dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -193,9 +193,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope DIST_SUBDIRS = libde265 dec265 enc265 tools acceleration-speed \ sherlock265 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ @@ -240,6 +237,8 @@ am__relativize = \ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -259,8 +258,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -275,6 +275,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -394,10 +395,13 @@ top_srcdir = @top_srcdir@ SUBDIRS = libde265 $(am__append_1) $(am__append_2) tools \ acceleration-speed $(am__append_3) ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = .travis.yml \ +EXTRA_DIST = \ autogen.sh \ build.bat \ + m4/ax_compare_version.m4 \ + m4/ax_cxx_compile_stdcxx_11.m4 \ m4/m4_ax_check_compile_flag.m4 \ + m4/visibility.m4 \ Makefile.vc7 \ CMakeLists.txt \ README.md \ @@ -431,8 +435,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -596,8 +600,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -677,6 +683,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -719,6 +729,8 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -734,7 +746,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -899,18 +911,19 @@ uninstall-am: uninstall-pkgconfigDATA am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-pkgconfigDATA + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkgconfigDATA .PRECIOUS: Makefile diff --git a/README.md b/README.md index 7ebc330..c3a6a4a 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Environment: Building ======== -[![Build Status](https://travis-ci.org/strukturag/libde265.png?branch=master)](https://travis-ci.org/strukturag/libde265) [![Build Status](https://ci.appveyor.com/api/projects/status/github/strukturag/libde265?svg=true)](https://ci.appveyor.com/project/strukturag/libde265) +[![Build Status](https://github.com/strukturag/libde265/workflows/build/badge.svg)](https://github.com/strukturag/libde265/actions) [![Build Status](https://ci.appveyor.com/api/projects/status/github/strukturag/libde265?svg=true)](https://ci.appveyor.com/project/strukturag/libde265) If you got libde265 from the git repository, you will first need to run the included `autogen.sh` script to generate the `configure` script. @@ -60,7 +60,7 @@ the included `autogen.sh` script to generate the `configure` script. libde265 has no dependencies on other libraries, but both optional example programs have dependencies on: -- SDL (optional for dec265's YUV overlay output), +- SDL2 (optional for dec265's YUV overlay output), - Qt (required for sherlock265), @@ -106,6 +106,22 @@ See the [cmake documentation](http://www.cmake.org) for further information on using cmake on other platforms. +Building using vcpkg +==================== + +You can build and install libde265 using the [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager: + +``` +git clone https://github.com/Microsoft/vcpkg.git +cd vcpkg +./bootstrap-vcpkg.sh +./vcpkg integrate install +./vcpkg install libde265 +``` + +The libde265 port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository. + + Prebuilt binaries ================= @@ -130,6 +146,11 @@ Libde265 has been integrated into these applications: - libde265.js JavaScript decoder [source](https://github.com/strukturag/libde265.js), [demo](https://strukturag.github.io/libde265.js/). +## Packaging status + +[![libde265 packaging status](https://repology.org/badge/vertical-allrepos/libde265.svg?exclude_unsupported=1&columns=3&exclude_sources=modules,site&header=libde265%20packaging%20status)](https://repology.org/project/libheif/versions) + + License ======= @@ -139,5 +160,8 @@ the terms of the MIT license. See `COPYING` for more details. +The short video clip in the 'testdata' directory is from the movie 'Girl Shy', which is in the public domain. + Copyright (c) 2013-2014 Struktur AG -Contact: Dirk Farin +Copyright (c) 2013-2023 Dirk Farin +Contact: Dirk Farin diff --git a/acceleration-speed/Makefile.in b/acceleration-speed/Makefile.in index 9d02a04..fa1bbbd 100644 --- a/acceleration-speed/Makefile.in +++ b/acceleration-speed/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,12 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = \ + ./$(DEPDIR)/acceleration_speed-acceleration-speed.Po \ + ./$(DEPDIR)/acceleration_speed-dct-scalar.Po \ + ./$(DEPDIR)/acceleration_speed-dct-sse.Po \ + ./$(DEPDIR)/acceleration_speed-dct.Po am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -203,8 +208,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -222,8 +225,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -238,6 +242,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -383,8 +388,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -455,10 +460,16 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acceleration_speed-acceleration-speed.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acceleration_speed-dct-scalar.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acceleration_speed-dct-sse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acceleration_speed-dct.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acceleration_speed-acceleration-speed.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acceleration_speed-dct-scalar.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acceleration_speed-dct-sse.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acceleration_speed-dct.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -594,8 +605,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -667,7 +680,10 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/acceleration_speed-acceleration-speed.Po + -rm -f ./$(DEPDIR)/acceleration_speed-dct-scalar.Po + -rm -f ./$(DEPDIR)/acceleration_speed-dct-sse.Po + -rm -f ./$(DEPDIR)/acceleration_speed-dct.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -713,7 +729,10 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/acceleration_speed-acceleration-speed.Po + -rm -f ./$(DEPDIR)/acceleration_speed-dct-scalar.Po + -rm -f ./$(DEPDIR)/acceleration_speed-dct-sse.Po + -rm -f ./$(DEPDIR)/acceleration_speed-dct.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -734,7 +753,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/aclocal.m4 b/aclocal.m4 index f9b81e9..dfd8809 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,15 +14,15 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -63,7 +63,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,11 +174,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -195,7 +195,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -296,7 +296,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -308,10 +308,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -327,14 +327,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -354,7 +354,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -406,7 +406,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -437,7 +437,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -628,13 +628,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -642,49 +641,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -693,18 +686,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -732,6 +724,10 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -768,7 +764,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -791,8 +787,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -820,6 +816,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -859,7 +869,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -901,7 +911,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -922,7 +932,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -943,7 +953,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -951,49 +961,42 @@ AC_SUBST([am__leading_dot])]) # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1014,12 +1017,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -1032,7 +1030,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1061,7 +1059,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1108,7 +1106,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1127,7 +1125,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1208,7 +1206,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1268,7 +1266,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1296,7 +1294,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1315,7 +1313,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/compile b/compile index a85b723..99e5052 100755 --- a/compile +++ b/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/config.h.in b/config.h.in index 8dc6c76..5ea02f5 100644 --- a/config.h.in +++ b/config.h.in @@ -1,21 +1,15 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define to 1 if using `alloca.c'. */ +/* Define to 1 if using 'alloca.c'. */ #undef C_ALLOCA /* Define to 1 if you have the `alarm' function. */ #undef HAVE_ALARM -/* Define to 1 if you have `alloca', as a function or macro. */ +/* Define to 1 if you have 'alloca', as a function or macro. */ #undef HAVE_ALLOCA -/* Define to 1 if you have and it should be used (not on Ultrix). - */ +/* Define to 1 if works. */ #undef HAVE_ALLOCA_H /* Support ARM instructions */ @@ -48,9 +42,6 @@ /* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET @@ -66,7 +57,7 @@ /* Define to 1 if the system has the type `ptrdiff_t'. */ #undef HAVE_PTRDIFF_T -/* Whether libsdl was found. */ +/* Whether libsdl2 was found. */ #undef HAVE_SDL /* Define to 1 if you have the header file. */ @@ -90,6 +81,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -173,12 +167,11 @@ STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - /* Define to 1 if the std::tr1 namespace should be included in the std namespace. */ #undef USE_STD_TR1_NAMESPACE diff --git a/configure b/configure index 0142b65..5898cb3 100755 --- a/configure +++ b/configure @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libde265 1.0.8. +# Generated by GNU Autoconf 2.71 for libde265 1.0.15. # -# Report bugs to . +# Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (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 +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -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 -# 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 - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -96,8 +92,12 @@ case $0 in #(( 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 + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -109,30 +109,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# 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='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -154,20 +134,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (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 +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -187,12 +169,15 @@ 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 : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || 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 @@ -207,30 +192,38 @@ test -x / || exit 1" test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop 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_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + 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 : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 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 : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -238,14 +231,21 @@ fi 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 +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -263,22 +263,23 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - 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." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and farin@struktur.de -$0: about your system, including any error possibly output -$0: before this message. Then install a modern shell, or -$0: manually run the script under such a shell if you do -$0: have one." + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and +$0: dirk.farin@gmail.com about your system, including any +$0: error possibly output before this message. Then install +$0: a modern shell, or manually run the script under such a +$0: shell if you do have one." fi exit 1 fi @@ -302,6 +303,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -319,6 +321,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -333,7 +343,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -342,7 +352,7 @@ $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" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -381,12 +391,13 @@ as_fn_executable_p () # 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 : +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 +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -398,18 +409,27 @@ fi # as_fn_append # 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 : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -421,9 +441,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -450,7 +470,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -494,7 +514,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits 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; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -508,6 +528,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -521,6 +545,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -590,50 +621,45 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libde265' PACKAGE_TARNAME='libde265' -PACKAGE_VERSION='1.0.8' -PACKAGE_STRING='libde265 1.0.8' -PACKAGE_BUGREPORT='farin@struktur.de' +PACKAGE_VERSION='1.0.15' +PACKAGE_STRING='libde265 1.0.15' +PACKAGE_BUGREPORT='dirk.farin@gmail.com' PACKAGE_URL='' ac_unique_file="libde265/de265.cc" # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" -ac_header_list= -ac_func_list= +ac_header_c_list= +ac_func_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -681,6 +707,9 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +CSCOPE +ETAGS +CTAGS am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE @@ -718,13 +747,11 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR am__leading_dot CCASFLAGS CCAS -CPP LT_SYS_LIBRARY_PATH OTOOL64 OTOOL @@ -810,7 +837,8 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -844,7 +872,6 @@ LDFLAGS LIBS CPPFLAGS LT_SYS_LIBRARY_PATH -CPP CCAS CCASFLAGS CXX @@ -930,8 +957,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -972,9 +997,9 @@ 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_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -998,9 +1023,9 @@ 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_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1211,9 +1236,9 @@ 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_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1227,9 +1252,9 @@ 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_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1273,9 +1298,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1291,7 +1316,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1355,7 +1380,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1412,7 +1437,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 libde265 1.0.8 to adapt to many kinds of systems. +\`configure' configures libde265 1.0.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1484,7 +1509,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libde265 1.0.8:";; + short | recursive ) echo "Configuration of libde265 1.0.15:";; esac cat <<\_ACEOF @@ -1503,7 +1528,7 @@ Optional Features: speeds up one-time build --enable-silent-rules less verbose build output (undo: "make V=1") --disable-silent-rules verbose build output (undo: "make V=0") - --disable-encoder Do not build encoder. + --enable-encoder Build the encoder (experimental). --disable-sse disable SSE optimizations (default=no) --disable-arm disable ARM optimizations (default=no) --enable-thumb disable ARM THUMB instructions (default=no) @@ -1536,7 +1561,6 @@ Some influential environment variables: you have headers in a nonstandard directory LT_SYS_LIBRARY_PATH User-defined run-time library search path. - CPP C preprocessor CCAS assembler compiler command (defaults to CC) CCASFLAGS assembler compiler flags (defaults to CFLAGS) CXX C++ compiler command @@ -1563,7 +1587,7 @@ Some influential environment variables: 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 . +Report bugs to . _ACEOF ac_status=$? fi @@ -1579,9 +1603,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1609,7 +1633,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1617,7 +1642,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1626,10 +1651,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libde265 configure 1.0.8 -generated by GNU Autoconf 2.69 +libde265 configure 1.0.15 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1646,14 +1671,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam 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 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1661,14 +1686,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$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 : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1684,14 +1710,14 @@ fi 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 + rm -f conftest.$ac_objext conftest.beam 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 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1699,17 +1725,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$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 || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1731,120 +1758,44 @@ fi 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 eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} 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; } > conftest.i && { - 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; ${as_lineno_stack:+:} 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; ${as_lineno_stack:+:} 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 eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -1852,16 +1803,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $2 (); below. */ +#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1879,24 +1823,25 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ 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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -1907,14 +1852,14 @@ $as_echo "$ac_res" >&6; } ac_fn_cxx_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam 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 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1922,14 +1867,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1951,7 +1897,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1959,14 +1905,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1982,14 +1929,14 @@ fi ac_fn_cxx_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam 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 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1997,17 +1944,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2022,187 +1970,38 @@ fi } # ac_fn_cxx_try_link -# 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 eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; 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.i 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;} -( $as_echo "## -------------------------------- ## -## Report this to farin@struktur.de ## -## -------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; 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; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES +# ac_fn_cxx_check_header_compile 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_cxx_check_header_mongrel () +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_cxx_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; 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 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_cxx_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_cxx_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no +if ac_fn_cxx_try_compile "$LINENO" +then : + eval "$3=yes" +else $as_nop + eval "$3=no" fi -rm -f conftest.err conftest.i 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_cxx_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;} -( $as_echo "## -------------------------------- ## -## Report this to farin@struktur.de ## -## -------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_cxx_check_header_mongrel +} # ac_fn_cxx_check_header_compile # ac_fn_c_check_type LINENO TYPE VAR INCLUDES # ------------------------------------------- @@ -2211,17 +2010,18 @@ fi 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 eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -2229,12 +2029,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -2242,18 +2043,19 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -2265,11 +2067,12 @@ $as_echo "$ac_res" >&6; } ac_fn_c_find_intX_t () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 -$as_echo_n "checking for int$2_t... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 +printf %s "checking for int$2_t... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. @@ -2280,7 +2083,7 @@ else $ac_includes_default enum { N = $2 / 2 - 1 }; int -main () +main (void) { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; test_array [0] = 0; @@ -2290,13 +2093,14 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default enum { N = $2 / 2 - 1 }; int -main () +main (void) { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; @@ -2307,9 +2111,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop case $ac_type in #( int$2_t) : eval "$3=yes" ;; #( @@ -2317,19 +2122,20 @@ else eval "$3=\$ac_type" ;; esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no" +then : -else +else $as_nop break fi done fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_find_intX_t @@ -2341,11 +2147,12 @@ $as_echo "$ac_res" >&6; } ac_fn_c_find_uintX_t () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 -$as_echo_n "checking for uint$2_t... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 +printf %s "checking for uint$2_t... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. @@ -2355,7 +2162,7 @@ else /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; test_array [0] = 0; @@ -2365,7 +2172,8 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : case $ac_type in #( uint$2_t) : eval "$3=yes" ;; #( @@ -2373,28 +2181,92 @@ if ac_fn_c_try_compile "$LINENO"; then : eval "$3=\$ac_type" ;; esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no" +then : -else +else $as_nop break fi done fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_find_uintX_t + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to run 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\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$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\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$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; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + 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 libde265 $as_me 1.0.8, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by libde265 $as_me 1.0.15, which was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -2427,8 +2299,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2463,7 +2339,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2498,11 +2374,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2513,8 +2391,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_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;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2538,7 +2416,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2546,14 +2424,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2561,15 +2439,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2577,8 +2455,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2592,63 +2470,48 @@ 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 +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - 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;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2658,22 +2521,652 @@ if test -r "$cache_file"; then # 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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -as_fn_append ac_header_list " sys/time.h" -as_fn_append ac_header_list " unistd.h" -as_fn_append ac_func_list " alarm" +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +# Test code for whether the C++ compiler supports C++98 (global declarations) +ac_cxx_conftest_cxx98_globals=' +// Does the compiler advertise C++98 conformance? +#if !defined __cplusplus || __cplusplus < 199711L +# error "Compiler does not advertise C++98 conformance" +#endif + +// These inclusions are to reject old compilers that +// lack the unsuffixed header files. +#include +#include + +// and are *not* freestanding headers in C++98. +extern void assert (int); +namespace std { + extern int strcmp (const char *, const char *); +} + +// Namespaces, exceptions, and templates were all added after "C++ 2.0". +using std::exception; +using std::strcmp; + +namespace { + +void test_exception_syntax() +{ + try { + throw "test"; + } catch (const char *s) { + // Extra parentheses suppress a warning when building autoconf itself, + // due to lint rules shared with more typical C programs. + assert (!(strcmp) (s, "test")); + } +} + +template struct test_template +{ + T const val; + explicit test_template(T t) : val(t) {} + template T add(U u) { return static_cast(u) + val; } +}; + +} // anonymous namespace +' + +# Test code for whether the C++ compiler supports C++98 (body of main) +ac_cxx_conftest_cxx98_main=' + assert (argc); + assert (! argv[0]); +{ + test_exception_syntax (); + test_template tt (2.0); + assert (tt.add (4) == 6.0); + assert (true && !false); +} +' + +# Test code for whether the C++ compiler supports C++11 (global declarations) +ac_cxx_conftest_cxx11_globals=' +// Does the compiler advertise C++ 2011 conformance? +#if !defined __cplusplus || __cplusplus < 201103L +# error "Compiler does not advertise C++11 conformance" +#endif + +namespace cxx11test +{ + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate + { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate + { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy + { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; + + // for testing lambda expressions + template Ret eval(Fn f, Ret v) + { + return f(v); + } + + // for testing variadic templates and trailing return types + template auto sum(V first) -> V + { + return first; + } + template auto sum(V first, Args... rest) -> V + { + return first + sum(rest...); + } +} +' + +# Test code for whether the C++ compiler supports C++11 (body of main) +ac_cxx_conftest_cxx11_main=' +{ + // Test auto and decltype + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + int total = 0; + for (auto i = a3; *i; ++i) { total += *i; } + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for + int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, + 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (auto &x : array) { x += 23; } +} +{ + // Test lambda expressions + using cxx11test::eval; + assert (eval ([](int x) { return x*2; }, 21) == 42); + double d = 2.0; + assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); + assert (d == 5.0); + assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); + assert (d == 5.0); +} +{ + // Test use of variadic templates + using cxx11test::sum; + auto a = sum(1); + auto b = sum(1, 2); + auto c = sum(1.0, 2.0, 3.0); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + test_template<::test_template> v(test_template(12)); +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +' + +# Test code for whether the C compiler supports C++11 (complete). +ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} +${ac_cxx_conftest_cxx11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + ${ac_cxx_conftest_cxx11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C++98 (complete). +ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + return ok; +} +" + +as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H" +as_fn_append ac_func_c_list " alarm HAVE_ALARM" + +# Auxiliary files required by this configure script. +ac_aux_files="missing install-sh compile ltmain.sh config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2684,12 +3177,12 @@ 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:${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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2698,24 +3191,24 @@ $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:${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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$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:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2725,11 +3218,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $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:${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_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2746,7 +3240,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h" -NUMERIC_VERSION=0x01000800 # Numeric representation of the version (A.B.C[.D] = 0xAABBCCDD) +NUMERIC_VERSION=0x01001500 # Numeric representation of the version (A.B.C[.D] = 0xAABBCCDD) # From https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html: @@ -2756,60 +3250,35 @@ NUMERIC_VERSION=0x01000800 # Numeric representation of the version (A.B.C[.D] = # If any interfaces have been removed or changed since the last public release, then set age to 0. LIBDE265_CURRENT=1 -LIBDE265_REVISION=1 +LIBDE265_REVISION=8 LIBDE265_AGE=1 # --------------------------------------------------------------------------- -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; 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 -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -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_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && 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_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -2828,21 +3297,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop 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_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -2861,21 +3331,22 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if ${ac_cv_target+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +printf %s "checking target system type... " >&6; } +if test ${ac_cv_target+y} +then : + printf %s "(cached) " >&6 +else $as_nop 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_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +printf "%s\n" "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; @@ -2906,10 +3377,11 @@ test -n "$target_alias" && + case `pwd` in *\ * | *\ *) - { $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;} ;; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac @@ -2929,6 +3401,7 @@ macro_revision='2.4.6' + ltmain=$ac_aux_dir/ltmain.sh # Backslashify metacharacters that are still active within @@ -2952,8 +3425,8 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +printf %s "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -2979,12 +3452,12 @@ func_echo_all () } case $ECHO in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; + printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +printf "%s\n" "printf" >&6; } ;; + print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +printf "%s\n" "print -r" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +printf "%s\n" "cat" >&6; } ;; esac @@ -3000,10 +3473,19 @@ esac -# Expand $ac_aux_dir to an absolute path. -am_aux_dir=`cd "$ac_aux_dir" && pwd` -ac_ext=c + + + + + + + + +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` + +ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -3011,11 +3493,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3023,11 +3506,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3038,11 +3525,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3051,11 +3538,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -3063,11 +3551,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3078,11 +3570,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -3090,8 +3582,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3104,11 +3596,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3116,11 +3609,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3131,11 +3628,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3144,11 +3641,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3157,15 +3655,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3181,18 +3683,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3203,11 +3705,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3215,11 +3718,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3230,11 +3737,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3247,11 +3754,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -3259,11 +3767,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3274,11 +3786,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3290,34 +3802,138 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} 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:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; 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:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3327,7 +3943,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -3335,7 +3951,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3347,9 +3963,9 @@ 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:${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[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3370,11 +3986,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$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, @@ -3391,7 +4008,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3407,44 +4024,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -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 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "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; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } 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 +printf "%s\n" "$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; }; then : + printf "%s\n" "$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 @@ -3458,15 +4077,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi 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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3475,7 +4094,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3487,8 +4106,8 @@ _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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3496,10 +4115,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3507,39 +4126,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$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. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$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 ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3553,11 +4173,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$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 @@ -3566,31 +4187,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} 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:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $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 ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -3600,29 +4222,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -3631,57 +4257,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3696,94 +4325,144 @@ else CFLAGS= fi fi -{ $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 ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $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:${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 : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -3792,21 +4471,23 @@ 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 -ac_ext=c + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3834,8 +4515,8 @@ _ACEOF rm -f core conftest* unset am_i fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -3851,11 +4532,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:${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 ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -3869,10 +4551,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + 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" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -3881,13 +4568,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "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 as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3915,8 +4602,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -3933,11 +4620,12 @@ Xsed="$SED -e 1s/^X//" -{ $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 ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -3945,10 +4633,15 @@ else 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 + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + 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" + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP @@ -3957,13 +4650,13 @@ case `"$ac_path_GREP" --version 2>&1` in ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" + printf "%s\n" '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 as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3991,16 +4684,17 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else @@ -4011,10 +4705,15 @@ else 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 + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + 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" + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP @@ -4023,13 +4722,13 @@ case `"$ac_path_EGREP" --version 2>&1` in ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" + printf "%s\n" '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 as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4058,16 +4757,17 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -4078,10 +4778,15 @@ else 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 + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + 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" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -4090,13 +4795,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" '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 as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4125,8 +4830,8 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -4151,17 +4856,18 @@ 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+y} +then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes -else +else $as_nop with_gnu_ld=no fi ac_prog=ld if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return, which upsets mingw @@ -4190,15 +4896,16 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test yes = "$with_gnu_ld"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${lt_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$LD"; then lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -4227,18 +4934,19 @@ fi LD=$lt_cv_path_LD if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi 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 ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${lt_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -4261,11 +4969,12 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ $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 ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test ${lt_cv_path_NM+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM=$NM @@ -4315,8 +5024,8 @@ else : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +printf "%s\n" "$lt_cv_path_NM" >&6; } if test no != "$lt_cv_path_NM"; then NM=$lt_cv_path_NM else @@ -4329,11 +5038,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else @@ -4341,11 +5051,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4356,11 +5070,11 @@ fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +printf "%s\n" "$DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4373,11 +5087,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else @@ -4385,11 +5100,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4400,11 +5119,11 @@ fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +printf "%s\n" "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4416,8 +5135,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN @@ -4445,11 +5164,12 @@ test -z "$NM" && NM=nm -{ $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 ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +printf %s "checking the name lister ($NM) interface... " >&6; } +if test ${lt_cv_nm_interface+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) @@ -4465,26 +5185,27 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +printf "%s\n" "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $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 ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +printf %s "checking the maximum length of command line arguments... " >&6; } +if test ${lt_cv_sys_max_cmd_len+y} +then : + printf %s "(cached) " >&6 +else $as_nop i=0 teststring=ABCD @@ -4611,11 +5332,11 @@ else fi if test -n "$lt_cv_sys_max_cmd_len"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -4659,11 +5380,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +printf %s "checking how to convert $build file names to $host format... " >&6; } +if test ${lt_cv_to_host_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $host in *-*-mingw* ) case $build in @@ -4699,18 +5421,19 @@ esac fi to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +printf %s "checking how to convert $build file names to toolchain format... " >&6; } +if test ${lt_cv_to_tool_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in @@ -4726,22 +5449,23 @@ esac fi to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; } -{ $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 ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +printf %s "checking for $LD option to reload object files... " >&6; } +if test ${lt_cv_ld_reload_flag+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -4774,11 +5498,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -4786,11 +5511,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4801,11 +5530,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +printf "%s\n" "$OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4814,11 +5543,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -4826,11 +5556,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4841,11 +5575,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +printf "%s\n" "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -4853,8 +5587,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -4873,11 +5607,12 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $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 ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +printf %s "checking how to recognize dependent libraries... " >&6; } +if test ${lt_cv_deplibs_check_method+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' @@ -5073,8 +5808,8 @@ os2*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } file_magic_glob= want_nocaseglob=no @@ -5118,11 +5853,12 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else @@ -5130,11 +5866,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5145,11 +5885,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +printf "%s\n" "$DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5158,11 +5898,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else @@ -5170,11 +5911,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5185,11 +5930,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +printf "%s\n" "$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -5197,8 +5942,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -5218,11 +5963,12 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +printf %s "checking how to associate runtime and link libraries... " >&6; } +if test ${lt_cv_sharedlib_from_linklib_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in @@ -5245,8 +5991,8 @@ cygwin* | mingw* | pw32* | cegcc*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -5262,11 +6008,12 @@ if test -n "$ac_tool_prefix"; 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -5274,11 +6021,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5289,11 +6040,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5306,11 +6057,12 @@ if test -z "$AR"; 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -5318,11 +6070,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5333,11 +6089,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5349,8 +6105,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -5358,7 +6114,7 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} @@ -5370,30 +6126,32 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +printf %s "checking for archiver @FILE support... " >&6; } +if test ${lt_cv_ar_at_file+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ar_at_file=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. @@ -5401,7 +6159,7 @@ if ac_fn_c_try_compile "$LINENO"; then : { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ @@ -5410,11 +6168,11 @@ if ac_fn_c_try_compile "$LINENO"; then : rm -f conftest.* libconftest.a fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +printf "%s\n" "$lt_cv_ar_at_file" >&6; } if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= @@ -5431,11 +6189,12 @@ fi 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -5443,11 +6202,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5458,11 +6221,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5471,11 +6234,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -5483,11 +6247,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5498,11 +6266,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -5510,8 +6278,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -5530,11 +6298,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -5542,11 +6311,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5557,11 +6330,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5570,11 +6343,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -5582,11 +6356,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5597,11 +6375,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -5609,8 +6387,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -5674,11 +6452,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -5686,11 +6465,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5701,11 +6484,11 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5741,11 +6524,12 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $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 ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +printf %s "checking command to parse $NM output from $compiler object... " >&6; } +if test ${lt_cv_sys_global_symbol_pipe+y} +then : + printf %s "(cached) " >&6 +else $as_nop # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -5897,15 +6681,12 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$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\":${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:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -5973,7 +6754,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi @@ -6008,11 +6789,11 @@ 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:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } fi # Response file support. @@ -6058,13 +6839,14 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +printf %s "checking for sysroot... " >&6; } # Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : +if test ${with_sysroot+y} +then : withval=$with_sysroot; -else +else $as_nop with_sysroot=no fi @@ -6082,24 +6864,25 @@ case $with_sysroot in #( no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 -$as_echo "$with_sysroot" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +printf "%s\n" "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +printf "%s\n" "${lt_sysroot:-no}" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 -$as_echo_n "checking for a working dd... " >&6; } -if ${ac_cv_path_lt_DD+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +printf %s "checking for a working dd... " >&6; } +if test ${ac_cv_path_lt_DD+y} +then : + printf %s "(cached) " >&6 +else $as_nop printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i : ${lt_DD:=$DD} @@ -6110,10 +6893,15 @@ if test -z "$lt_DD"; then for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in dd; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in dd + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_lt_DD" || continue if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then cmp -s conftest.i conftest.out \ @@ -6133,15 +6921,16 @@ fi rm -f conftest.i conftest2.i conftest.out fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 -$as_echo "$ac_cv_path_lt_DD" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +printf "%s\n" "$ac_cv_path_lt_DD" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 -$as_echo_n "checking how to truncate binary pipes... " >&6; } -if ${lt_cv_truncate_bin+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +printf %s "checking how to truncate binary pipes... " >&6; } +if test ${lt_cv_truncate_bin+y} +then : + printf %s "(cached) " >&6 +else $as_nop printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i lt_cv_truncate_bin= @@ -6152,8 +6941,8 @@ fi rm -f conftest.i conftest2.i conftest.out test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 -$as_echo "$lt_cv_truncate_bin" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +printf "%s\n" "$lt_cv_truncate_bin" >&6; } @@ -6176,7 +6965,8 @@ func_cc_basename () } # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : +if test ${enable_libtool_lock+y} +then : enableval=$enable_libtool_lock; fi @@ -6192,7 +6982,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) @@ -6212,7 +7002,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in @@ -6250,7 +7040,7 @@ mips64*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf case `/usr/bin/file conftest.$ac_objext` in @@ -6291,7 +7081,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) @@ -6354,11 +7144,12 @@ 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:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +printf %s "checking whether the C compiler needs -belf... " >&6; } +if test ${lt_cv_cc_needs_belf+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6369,19 +7160,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_cc_needs_belf=yes -else +else $as_nop lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6390,8 +7182,8 @@ 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:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS=$SAVE_CFLAGS @@ -6404,7 +7196,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) @@ -6441,11 +7233,12 @@ need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$MANIFEST_TOOL"; then ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else @@ -6453,11 +7246,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6468,11 +7265,11 @@ fi fi MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +printf "%s\n" "$MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6481,11 +7278,12 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL # Extract the first word of "mt", so it can be a program name with args. set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_MANIFEST_TOOL"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else @@ -6493,11 +7291,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6508,11 +7310,11 @@ fi fi ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_MANIFEST_TOOL" = x; then @@ -6520,8 +7322,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL @@ -6531,11 +7333,12 @@ else fi test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if test ${lt_cv_path_mainfest_tool+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_path_mainfest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out @@ -6545,8 +7348,8 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; } if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -6561,11 +7364,12 @@ fi 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else @@ -6573,11 +7377,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6588,11 +7396,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +printf "%s\n" "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6601,11 +7409,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else @@ -6613,11 +7422,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6628,11 +7441,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -6640,8 +7453,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -6653,11 +7466,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else @@ -6665,11 +7479,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6680,11 +7498,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +printf "%s\n" "$NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6693,11 +7511,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else @@ -6705,11 +7524,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6720,11 +7543,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +printf "%s\n" "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -6732,8 +7555,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -6745,11 +7568,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else @@ -6757,11 +7581,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6772,11 +7600,11 @@ fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +printf "%s\n" "$LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6785,11 +7613,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else @@ -6797,11 +7626,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6812,11 +7645,11 @@ fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +printf "%s\n" "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -6824,8 +7657,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -6837,11 +7670,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else @@ -6849,11 +7683,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6864,11 +7702,11 @@ fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +printf "%s\n" "$OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6877,11 +7715,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else @@ -6889,11 +7728,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6904,11 +7747,11 @@ fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +printf "%s\n" "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -6916,8 +7759,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -6929,11 +7772,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else @@ -6941,11 +7785,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6956,11 +7804,11 @@ fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +printf "%s\n" "$OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6969,11 +7817,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else @@ -6981,11 +7830,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6996,11 +7849,11 @@ fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +printf "%s\n" "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -7008,8 +7861,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -7044,11 +7897,12 @@ fi - { $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 ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +printf %s "checking for -single_module linker flag... " >&6; } +if test ${lt_cv_apple_cc_single_mod+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_apple_cc_single_mod=no if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override @@ -7077,425 +7931,185 @@ else rm -f conftest.* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } - { $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 ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +printf %s "checking for -exported_symbols_list linker flag... " >&6; } +if test ${lt_cv_ld_exported_symbols_list+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes -else - lt_cv_ld_exported_symbols_list=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test yes = "$lt_cv_apple_cc_single_mod"; then - _lt_dar_single_mod='$single_module' - fi - if test yes = "$lt_cv_ld_exported_symbols_list"; then - _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' - fi - if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac - -# func_munge_path_list VARIABLE PATH -# ----------------------------------- -# VARIABLE is name of variable containing _space_ separated list of -# directories to be munged by the contents of PATH, which is string -# having a format: -# "DIR[:DIR]:" -# string "DIR[ DIR]" will be prepended to VARIABLE -# ":DIR[:DIR]" -# string "DIR[ DIR]" will be appended to VARIABLE -# "DIRP[:DIRP]::[DIRA:]DIRA" -# string "DIRP[ DIRP]" will be prepended to VARIABLE and string -# "DIRA[ DIRA]" will be appended to VARIABLE -# "DIR[:DIR]" -# VARIABLE will be replaced by "DIR[ DIR]" -func_munge_path_list () -{ - case x$2 in - x) - ;; - *:) - eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" - ;; - x:*) - eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" - ;; - *::*) - eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" - eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" - ;; - *) - eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" - ;; - esac -} - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $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 ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $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 -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -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 $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $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 ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - 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 confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -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 : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int -main () +main (void) { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; + + ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +if ac_fn_c_try_link "$LINENO" +then : + lt_cv_ld_exported_symbols_list=yes +else $as_nop + lt_cv_ld_exported_symbols_list=no fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS fi -fi -{ $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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } -$as_echo "#define STDC_HEADERS 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +printf %s "checking for -force_load linker flag... " >&6; } +if test ${lt_cv_ld_force_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cr libconftest.a conftest.o" >&5 + $AR cr libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +printf "%s\n" "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + fi + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac -# 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` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi done -for ac_header in dlfcn.h -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" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi +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" = xyes +then : + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h -done +fi @@ -7512,7 +8126,8 @@ done # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : +if test ${enable_shared+y} +then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -7530,7 +8145,7 @@ if test "${enable_shared+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop enable_shared=yes fi @@ -7543,7 +8158,8 @@ fi # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : +if test ${enable_static+y} +then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -7561,7 +8177,7 @@ if test "${enable_static+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop enable_static=yes fi @@ -7575,7 +8191,8 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : +if test ${with_pic+y} +then : withval=$with_pic; lt_p=${PACKAGE-default} case $withval in yes|no) pic_mode=$withval ;; @@ -7592,7 +8209,7 @@ if test "${with_pic+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop pic_mode=default fi @@ -7604,7 +8221,8 @@ fi # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : +if test ${enable_fast_install+y} +then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -7622,7 +8240,7 @@ if test "${enable_fast_install+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop enable_fast_install=yes fi @@ -7636,11 +8254,12 @@ fi shared_archive_member_spec= case $host,$enable_shared in power*-*-aix[5-9]*,yes) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 -$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +printf %s "checking which variant of shared library versioning to provide... " >&6; } # Check whether --with-aix-soname was given. -if test "${with_aix_soname+set}" = set; then : +if test ${with_aix_soname+y} +then : withval=$with_aix_soname; case $withval in aix|svr4|both) ;; @@ -7649,18 +8268,19 @@ if test "${with_aix_soname+set}" = set; then : ;; esac lt_cv_with_aix_soname=$with_aix_soname -else - if ${lt_cv_with_aix_soname+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + if test ${lt_cv_with_aix_soname+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_with_aix_soname=aix fi with_aix_soname=$lt_cv_with_aix_soname fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 -$as_echo "$with_aix_soname" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +printf "%s\n" "$with_aix_soname" >&6; } if test aix != "$with_aix_soname"; then # For the AIX way of multilib, we name the shared archive member # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', @@ -7742,11 +8362,12 @@ if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +printf %s "checking for objdir... " >&6; } +if test ${lt_cv_objdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -7757,17 +8378,15 @@ else fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +printf "%s\n" "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF +printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h @@ -7813,11 +8432,12 @@ 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:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +printf %s "checking for ${ac_tool_prefix}file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. @@ -7866,11 +8486,11 @@ fi MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7879,11 +8499,12 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +printf %s "checking for file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. @@ -7932,11 +8553,11 @@ fi MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8021,11 +8642,12 @@ if test yes = "$GCC"; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; esac - { $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 ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test ${lt_cv_prog_compiler_rtti_exceptions+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -8056,8 +8678,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -8254,6 +8876,12 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -8414,26 +9042,28 @@ case $host_os in ;; esac -{ $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 ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +printf %s "checking for $compiler option to produce PIC... " >&6; } +if test ${lt_cv_prog_compiler_pic+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $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 ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test ${lt_cv_prog_compiler_pic_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -8464,8 +9094,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in @@ -8493,11 +9123,12 @@ 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:${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 ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test ${lt_cv_prog_compiler_static_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_static_works=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -8521,8 +9152,8 @@ else LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } if test yes = "$lt_cv_prog_compiler_static_works"; then : @@ -8536,11 +9167,12 @@ fi - { $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 ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -8583,19 +9215,20 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } - { $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 ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -8638,8 +9271,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } @@ -8647,19 +9280,19 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links=nottested if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user - { $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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no 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:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test no = "$hard_links"; then - { $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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -8671,8 +9304,8 @@ fi - { $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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -9230,21 +9863,23 @@ _LT_EOF if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -9259,7 +9894,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib @@ -9283,21 +9918,23 @@ fi if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -9312,7 +9949,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib @@ -9563,11 +10200,12 @@ fi # Older versions of the 11.00 compiler do not understand -b yet # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +printf %s "checking if $CC understands -b... " >&6; } +if test ${lt_cv_prog_compiler__b+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler__b=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" @@ -9591,8 +10229,8 @@ else LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } if test yes = "$lt_cv_prog_compiler__b"; then archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -9632,28 +10270,30 @@ fi # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if test ${lt_cv_irix_exported_symbol+y} +then : + printf %s "(cached) " >&6 +else $as_nop save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_irix_exported_symbol=yes -else +else $as_nop lt_cv_irix_exported_symbol=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi @@ -9934,8 +10574,8 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +printf "%s\n" "$ld_shlibs" >&6; } test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -9971,18 +10611,19 @@ 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:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +printf %s "checking whether -lc should be explicitly linked in... " >&6; } +if test ${lt_cv_archive_cmds_need_lc+y} +then : + printf %s "(cached) " >&6 +else $as_nop $RM conftest* echo "$lt_simple_compile_test_code" > 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:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -10000,7 +10641,7 @@ else 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:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc=no @@ -10014,8 +10655,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac @@ -10174,8 +10815,8 @@ esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +printf %s "checking dynamic linker characteristics... " >&6; } if test yes = "$GCC"; then case $host_os in @@ -10736,9 +11377,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_shlibpath_overrides_runpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -10748,19 +11390,21 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; 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 : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -11004,8 +11648,8 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -11126,8 +11770,8 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - { $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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -11151,8 +11795,8 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +printf "%s\n" "$hardcode_action" >&6; } if test relink = "$hardcode_action" || test yes = "$inherit_rpath"; then @@ -11196,11 +11840,12 @@ else darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11209,32 +11854,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $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" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else +else $as_nop lt_cv_dlopen=dyld lt_cv_dlopen_libs= @@ -11254,14 +11898,16 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = xyes +then : lt_cv_dlopen=shl_load -else - { $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 ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +printf %s "checking for shl_load in -ldld... " >&6; } +if test ${ac_cv_lib_dld_shl_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11270,41 +11916,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char shl_load (); int -main () +main (void) { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_shl_load=yes -else +else $as_nop ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $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" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes +then : lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld -else +else $as_nop ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +if test "x$ac_cv_func_dlopen" = xyes +then : lt_cv_dlopen=dlopen -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11313,37 +11960,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $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" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +printf %s "checking for dlopen in -lsvld... " >&6; } +if test ${ac_cv_lib_svld_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11352,37 +11999,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_svld_dlopen=yes -else +else $as_nop ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $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" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld -else - { $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 ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +printf %s "checking for dld_link in -ldld... " >&6; } +if test ${ac_cv_lib_dld_dld_link+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11391,30 +12038,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dld_link (); int -main () +main (void) { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_dld_link=yes -else +else $as_nop ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $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" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes +then : lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11453,11 +12099,12 @@ fi save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" - { $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 ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +printf %s "checking whether a program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else @@ -11536,7 +12183,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$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=$? @@ -11554,16 +12201,17 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +printf "%s\n" "$lt_cv_dlopen_self" >&6; } if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $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 ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +printf %s "checking whether a statically linked program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self_static+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else @@ -11642,7 +12290,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$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=$? @@ -11660,8 +12308,8 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS=$save_CPPFLAGS @@ -11699,13 +12347,13 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +printf %s "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:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -11713,16 +12361,16 @@ else if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi @@ -11739,13 +12387,13 @@ fi # Report what library types will actually be built - { $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:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +printf %s "checking if libtool supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +printf "%s\n" "$can_build_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +printf %s "checking whether to build shared libraries... " >&6; } test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -11769,15 +12417,15 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +printf "%s\n" "$enable_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +printf %s "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test yes = "$enable_shared" || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +printf "%s\n" "$enable_static" >&6; } @@ -11829,48 +12477,49 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $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= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +printf "%s\n" "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test ${enable_dependency_tracking+y} +then : enableval=$enable_dependency_tracking; fi @@ -11897,11 +12546,12 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS depcc="$CCAS" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CCAS_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CCAS_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -12006,8 +12656,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type if @@ -12021,6 +12671,12 @@ else fi + + + + + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -12031,15 +12687,16 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else @@ -12047,11 +12704,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12062,11 +12723,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12075,15 +12736,16 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else @@ -12091,11 +12753,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12106,11 +12772,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12122,8 +12788,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -12133,7 +12799,7 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -12143,7 +12809,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -12153,20 +12819,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $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 ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +printf %s "checking whether the compiler supports GNU C++... " >&6; } +if test ${ac_cv_cxx_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -12176,29 +12843,33 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi -ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_test_CXXFLAGS=${CXXFLAGS+y} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +printf %s "checking whether $CXX accepts -g... " >&6; } +if test ${ac_cv_prog_cxx_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -12207,71 +12878,168 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes -else +else $as_nop CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -else +else $as_nop ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } +if test $ac_test_CXXFLAGS; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_98+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -12296,36 +13064,32 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +printf %s "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" + if test ${ac_cv_prog_CXXCPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # Double quotes because $CXX needs to be expanded + for CXXCPP in "$CXX -E" cpp /lib/cpp do ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO" +then : -else +else $as_nop # Broken: fails on valid input. continue fi @@ -12337,10 +13101,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else +else $as_nop # Passes both tests. ac_preproc_ok=: break @@ -12350,7 +13115,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : break fi @@ -12362,29 +13128,24 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +printf "%s\n" "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO" +then : -else +else $as_nop # Broken: fails on valid input. continue fi @@ -12396,10 +13157,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else +else $as_nop # Passes both tests. ac_preproc_ok=: break @@ -12409,11 +13171,12 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -12549,17 +13312,18 @@ cc_basename=$func_cc_basename_result # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test ${with_gnu_ld+y} +then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes -else +else $as_nop with_gnu_ld=no fi ac_prog=ld if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return, which upsets mingw @@ -12588,15 +13352,16 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test yes = "$with_gnu_ld"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${lt_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$LD"; then lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -12625,18 +13390,19 @@ fi LD=$lt_cv_path_LD if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi 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 ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${lt_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -12693,7 +13459,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -12702,8 +13468,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld fi # PORTME: fill in a description of your system's C++ link characteristics - { $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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -12841,21 +13607,23 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath__CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -12870,7 +13638,7 @@ if ac_fn_cxx_try_link "$LINENO"; then : lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then lt_cv_aix_libpath__CXX=/usr/lib:/lib @@ -12895,21 +13663,23 @@ fi if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath__CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -12924,7 +13694,7 @@ if ac_fn_cxx_try_link "$LINENO"; then : lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then lt_cv_aix_libpath__CXX=/usr/lib:/lib @@ -13185,7 +13955,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -13250,7 +14020,7 @@ fi # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -13589,7 +14359,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -13673,7 +14443,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -13684,7 +14454,7 @@ fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' @@ -13775,8 +14545,8 @@ fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +printf "%s\n" "$ld_shlibs_CXX" >&6; } test no = "$ld_shlibs_CXX" && can_build_shared=no GCC_CXX=$GXX @@ -13814,7 +14584,7 @@ esac if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -14295,26 +15065,28 @@ case $host_os in ;; esac -{ $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 ${lt_cv_prog_compiler_pic_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +printf %s "checking for $compiler option to produce PIC... " >&6; } +if test ${lt_cv_prog_compiler_pic_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_CXX" >&6; } lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +if test ${lt_cv_prog_compiler_pic_works_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -14345,8 +15117,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then case $lt_prog_compiler_pic_CXX in @@ -14368,11 +15140,12 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $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 ${lt_cv_prog_compiler_static_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test ${lt_cv_prog_compiler_static_works_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -14396,8 +15169,8 @@ else LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then : @@ -14408,11 +15181,12 @@ fi - { $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 ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o_CXX=no $RM -r conftest 2>/dev/null mkdir conftest @@ -14455,16 +15229,17 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; } - { $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 ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o_CXX=no $RM -r conftest 2>/dev/null mkdir conftest @@ -14507,8 +15282,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; } @@ -14516,19 +15291,19 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links=nottested if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user - { $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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no 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:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test no = "$hard_links"; then - { $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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -14537,8 +15312,8 @@ fi - { $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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' @@ -14580,8 +15355,8 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +printf "%s\n" "$ld_shlibs_CXX" >&6; } test no = "$ld_shlibs_CXX" && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -14608,18 +15383,19 @@ 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:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +printf %s "checking whether -lc should be explicitly linked in... " >&6; } +if test ${lt_cv_archive_cmds_need_lc_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop $RM conftest* echo "$lt_simple_compile_test_code" > 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:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -14637,7 +15413,7 @@ else if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc_CXX=no @@ -14651,8 +15427,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +printf "%s\n" "$lt_cv_archive_cmds_need_lc_CXX" >&6; } archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ;; esac @@ -14721,8 +15497,8 @@ esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +printf %s "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' @@ -15210,9 +15986,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_shlibpath_overrides_runpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -15222,19 +15999,21 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +if ac_fn_cxx_try_link "$LINENO" +then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -15478,8 +16257,8 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -15543,8 +16322,8 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - { $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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || test -n "$runpath_var_CXX" || @@ -15568,8 +16347,8 @@ else # directories. hardcode_action_CXX=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +printf "%s\n" "$hardcode_action_CXX" >&6; } if test relink = "$hardcode_action_CXX" || test yes = "$inherit_rpath_CXX"; then @@ -15616,11 +16395,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -15628,11 +16408,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15643,11 +16427,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15656,11 +16440,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -15668,11 +16453,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15683,11 +16472,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -15695,8 +16484,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -15709,11 +16498,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -15721,11 +16511,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15736,11 +16530,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15749,11 +16543,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -15762,15 +16557,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15786,18 +16585,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15808,11 +16607,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -15820,11 +16620,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15835,11 +16639,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15852,11 +16656,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -15864,11 +16669,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15879,11 +16688,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15895,34 +16704,138 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} 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:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; 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:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -15932,20 +16845,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $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 ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -15955,29 +16869,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -15986,57 +16904,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -16051,94 +16972,144 @@ else CFLAGS= fi fi -{ $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 ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $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:${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 : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -16147,21 +17118,23 @@ 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 -ac_ext=c + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -16189,8 +17162,8 @@ _ACEOF rm -f core conftest* unset am_i fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -16206,7 +17179,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Find a good install program. We prefer a C program (faster), + + # 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 @@ -16220,20 +17194,25 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # 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:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop 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]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -16243,13 +17222,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$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 + 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 + 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 @@ -16257,12 +17236,12 @@ case $as_dir/ in #(( 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" && + 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" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -16278,7 +17257,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -16288,8 +17267,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -16299,22 +17278,23 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi -{ $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 ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -16322,10 +17302,15 @@ else 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 + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + 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" + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP @@ -16334,13 +17319,13 @@ case `"$ac_path_GREP" --version 2>&1` in ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" + printf "%s\n" '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 as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -16368,17 +17353,17 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" # Initialize automake stuff -am__api_version='1.15' +am__api_version='1.16' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -16432,8 +17417,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -16452,23 +17437,19 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + + if test x"${MISSING+set}" != xset; then + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then am_missing_run="$MISSING " else am_missing_run= - { $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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh+set}" != xset; then @@ -16488,11 +17469,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -16500,11 +17482,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16515,11 +17501,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -16528,11 +17514,12 @@ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -16540,11 +17527,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16555,11 +17546,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -16567,8 +17558,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -16580,25 +17571,31 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $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; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + 'BusyBox '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done @@ -16609,7 +17606,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -16619,16 +17616,17 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "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 eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -16644,17 +17642,18 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -16664,12 +17663,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=1;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -16681,8 +17681,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -16714,17 +17714,13 @@ fi # Define the identity of the package. PACKAGE='libde265' - VERSION='1.0.8' + VERSION='1.0.15' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -16744,8 +17740,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -16766,11 +17762,12 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -16877,8 +17874,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -16894,11 +17891,12 @@ fi depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CXX_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -17005,8 +18003,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type if @@ -17020,6 +18018,20 @@ else fi +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi + +if test -z "$ETAGS"; then + ETAGS=etags +fi + +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi + + # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile @@ -17052,7 +18064,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -17073,11 +18085,12 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_success=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5 -$as_echo_n "checking whether $CXX supports C++11 features by default... " >&6; } -if ${ax_cv_cxx_compile_cxx11+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default" >&5 +printf %s "checking whether $CXX supports C++11 features by default... " >&6; } +if test ${ax_cv_cxx_compile_cxx11+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17107,27 +18120,29 @@ else auto l = [](){}; _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ax_cv_cxx_compile_cxx11=yes -else +else $as_nop ax_cv_cxx_compile_cxx11=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5 -$as_echo "$ax_cv_cxx_compile_cxx11" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11" >&5 +printf "%s\n" "$ax_cv_cxx_compile_cxx11" >&6; } if test x$ax_cv_cxx_compile_cxx11 = xyes; then ac_success=yes fi if test x$ac_success = xno; then for switch in -std=gnu++11 -std=gnu++0x; do - cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 -$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } -if eval \${$cachevar+:} false; then : - $as_echo_n "(cached) " >&6 -else + cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +printf %s "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval test \${$cachevar+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $switch" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17159,17 +18174,18 @@ else auto l = [](){}; _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : eval $cachevar=yes -else +else $as_nop eval $cachevar=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CXXFLAGS="$ac_save_CXXFLAGS" fi eval ac_res=\$$cachevar - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test x\$$cachevar = xyes; then CXXFLAGS="$CXXFLAGS $switch" ac_success=yes @@ -17180,12 +18196,13 @@ $as_echo "$ac_res" >&6; } if test x$ac_success = xno; then for switch in -std=c++11 -std=c++0x; do - cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 -$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; } -if eval \${$cachevar+:} false; then : - $as_echo_n "(cached) " >&6 -else + cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5 +printf %s "checking whether $CXX supports C++11 features with $switch... " >&6; } +if eval test \${$cachevar+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $switch" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17217,17 +18234,18 @@ else auto l = [](){}; _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : eval $cachevar=yes -else +else $as_nop eval $cachevar=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CXXFLAGS="$ac_save_CXXFLAGS" fi eval ac_res=\$$cachevar - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if eval test x\$$cachevar = xyes; then CXXFLAGS="$CXXFLAGS $switch" ac_success=yes @@ -17248,12 +18266,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu else if test x$ac_success = xno; then HAVE_CXX11=0 - { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 -$as_echo "$as_me: No compiler with C++11 support was found" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5 +printf "%s\n" "$as_me: No compiler with C++11 support was found" >&6;} else HAVE_CXX11=1 -$as_echo "#define HAVE_CXX11 1" >>confdefs.h +printf "%s\n" "#define HAVE_CXX11 1" >>confdefs.h fi @@ -17279,18 +18297,48 @@ fi # Checks for header files. -for ac_header in stdint.h stdlib.h string.h malloc.h signal.h setjmp.h stddef.h sys/time.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" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes +then : + printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes +then : + printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h -done +fi +ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default" +if test "x$ac_cv_header_malloc_h" = xyes +then : + printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "signal.h" "ac_cv_header_signal_h" "$ac_includes_default" +if test "x$ac_cv_header_signal_h" = xyes +then : + printf "%s\n" "#define HAVE_SIGNAL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default" +if test "x$ac_cv_header_setjmp_h" = xyes +then : + printf "%s\n" "#define HAVE_SETJMP_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default" +if test "x$ac_cv_header_stddef_h" = xyes +then : + printf "%s\n" "#define HAVE_STDDEF_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_time_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h + +fi ac_ext=cpp @@ -17301,19 +18349,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu OLD_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CXXFLAGS" - -for ac_header in cstdint -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "cstdint" "ac_cv_header_cstdint" "$ac_includes_default" -if test "x$ac_cv_header_cstdint" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_CSTDINT 1 -_ACEOF +ac_fn_cxx_check_header_compile "$LINENO" "cstdint" "ac_cv_header_cstdint" "$ac_includes_default" +if test "x$ac_cv_header_cstdint" = xyes +then : + printf "%s\n" "#define HAVE_CSTDINT 1" >>confdefs.h fi -done - CPPFLAGS="$OLD_CPPFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -17323,107 +18365,155 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Checks for typedefs, structures, and compiler characteristics. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -if ${ac_cv_header_stdbool_h+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +if test "x$ac_cv_type__Bool" = xyes +then : + +printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h + + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 +printf %s "checking for stdbool.h that conforms to C99... " >&6; } +if test ${ac_cv_header_stdbool_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include - #include - #ifndef bool - "error: bool is not defined" - #endif - #ifndef false - "error: false is not defined" - #endif - #if false - "error: false is not 0" + #ifndef __bool_true_false_are_defined + #error "__bool_true_false_are_defined is not defined" #endif - #ifndef true - "error: true is not defined" + char a[__bool_true_false_are_defined == 1 ? 1 : -1]; + + /* Regardless of whether this is C++ or "_Bool" is a + valid type name, "true" and "false" should be usable + in #if expressions and integer constant expressions, + and "bool" should be a valid type name. */ + + #if !true + #error "'true' is not true" #endif #if true != 1 - "error: true is not 1" + #error "'true' is not equal to 1" + #endif + char b[true == 1 ? 1 : -1]; + char c[true]; + + #if false + #error "'false' is not false" #endif - #ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" + #if false != 0 + #error "'false' is not equal to 0" #endif + char d[false == 0 ? 1 : -1]; + + enum { e = false, f = true, g = false * true, h = true * 256 }; + + char i[(bool) 0.5 == true ? 1 : -1]; + char j[(bool) 0.0 == false ? 1 : -1]; + char k[sizeof (bool) > 0 ? 1 : -1]; + + struct sb { bool s: 1; bool t; } s; + char l[sizeof s.t > 0 ? 1 : -1]; - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; /* The following fails for HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + bool m[h]; + char n[sizeof m == h * sizeof m[0] ? 1 : -1]; + char o[-1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html */ - _Bool q = true; - _Bool *pq = &q; + bool p = true; + bool *pp = &p; + + /* C 1999 specifies that bool, true, and false are to be + macros, but C++ 2011 and later overrule this. */ + #if __cplusplus < 201103 + #ifndef bool + #error "bool is not defined" + #endif + #ifndef false + #error "false is not defined" + #endif + #ifndef true + #error "true is not defined" + #endif + #endif + + /* If _Bool is available, repeat with it all the tests + above that used bool. */ + #ifdef HAVE__BOOL + struct sB { _Bool s: 1; _Bool t; } t; + + char q[(_Bool) 0.5 == true ? 1 : -1]; + char r[(_Bool) 0.0 == false ? 1 : -1]; + char u[sizeof (_Bool) > 0 ? 1 : -1]; + char v[sizeof t.t > 0 ? 1 : -1]; + + _Bool w[h]; + char x[sizeof m == h * sizeof m[0] ? 1 : -1]; + char y[-1 - (_Bool) 0 < 0 ? 1 : -1]; + _Bool z = true; + _Bool *pz = &p; + #endif int -main () +main (void) { - bool e = &s; - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + bool ps = &s; + *pp |= p; + *pp |= ! p; + + #ifdef HAVE__BOOL + _Bool pt = &t; + *pz |= z; + *pz |= ! z; + #endif + + /* Refer to every declared value, so they cannot be + discarded as unused. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k + + !l + !m + !n + !o + !p + !pp + !ps + #ifdef HAVE__BOOL + + !q + !r + !u + !v + !w + !x + !y + !z + !pt + #endif + ); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_header_stdbool_h=yes -else +else $as_nop ac_cv_header_stdbool_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -$as_echo "$ac_cv_header_stdbool_h" >&6; } - ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -if test "x$ac_cv_type__Bool" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE__BOOL 1 -_ACEOF - - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi - +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 +printf "%s\n" "$ac_cv_header_stdbool_h" >&6; } if test $ac_cv_header_stdbool_h = yes; then -$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_STDBOOL_H 1" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : +if test "x$ac_cv_type_size_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF +printf "%s\n" "#define size_t unsigned int" >>confdefs.h fi @@ -17432,9 +18522,7 @@ case $ac_cv_c_int8_t in #( no|yes) ;; #( *) -cat >>confdefs.h <<_ACEOF -#define int8_t $ac_cv_c_int8_t -_ACEOF +printf "%s\n" "#define int8_t $ac_cv_c_int8_t" >>confdefs.h ;; esac @@ -17443,9 +18531,7 @@ case $ac_cv_c_int16_t in #( no|yes) ;; #( *) -cat >>confdefs.h <<_ACEOF -#define int16_t $ac_cv_c_int16_t -_ACEOF +printf "%s\n" "#define int16_t $ac_cv_c_int16_t" >>confdefs.h ;; esac @@ -17454,9 +18540,7 @@ case $ac_cv_c_int32_t in #( no|yes) ;; #( *) -cat >>confdefs.h <<_ACEOF -#define int32_t $ac_cv_c_int32_t -_ACEOF +printf "%s\n" "#define int32_t $ac_cv_c_int32_t" >>confdefs.h ;; esac @@ -17465,9 +18549,7 @@ case $ac_cv_c_int64_t in #( no|yes) ;; #( *) -cat >>confdefs.h <<_ACEOF -#define int64_t $ac_cv_c_int64_t -_ACEOF +printf "%s\n" "#define int64_t $ac_cv_c_int64_t" >>confdefs.h ;; esac @@ -17476,12 +18558,10 @@ case $ac_cv_c_uint8_t in #( no|yes) ;; #( *) -$as_echo "#define _UINT8_T 1" >>confdefs.h +printf "%s\n" "#define _UINT8_T 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define uint8_t $ac_cv_c_uint8_t -_ACEOF +printf "%s\n" "#define uint8_t $ac_cv_c_uint8_t" >>confdefs.h ;; esac @@ -17491,9 +18571,7 @@ case $ac_cv_c_uint16_t in #( *) -cat >>confdefs.h <<_ACEOF -#define uint16_t $ac_cv_c_uint16_t -_ACEOF +printf "%s\n" "#define uint16_t $ac_cv_c_uint16_t" >>confdefs.h ;; esac @@ -17502,12 +18580,10 @@ case $ac_cv_c_uint32_t in #( no|yes) ;; #( *) -$as_echo "#define _UINT32_T 1" >>confdefs.h +printf "%s\n" "#define _UINT32_T 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define uint32_t $ac_cv_c_uint32_t -_ACEOF +printf "%s\n" "#define uint32_t $ac_cv_c_uint32_t" >>confdefs.h ;; esac @@ -17516,51 +18592,50 @@ case $ac_cv_c_uint64_t in #( no|yes) ;; #( *) -$as_echo "#define _UINT64_T 1" >>confdefs.h +printf "%s\n" "#define _UINT64_T 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define uint64_t $ac_cv_c_uint64_t -_ACEOF +printf "%s\n" "#define uint64_t $ac_cv_c_uint64_t" >>confdefs.h ;; esac ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" -if test "x$ac_cv_type_ptrdiff_t" = xyes; then : +if test "x$ac_cv_type_ptrdiff_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_PTRDIFF_T 1 -_ACEOF +printf "%s\n" "#define HAVE_PTRDIFF_T 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +printf %s "checking for inline... " >&6; } +if test ${ac_cv_c_inline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } +static $ac_kw foo_t static_foo (void) {return 0; } +$ac_kw foo_t foo (void) {return 0; } #endif _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_inline=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +printf "%s\n" "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -17579,24 +18654,62 @@ esac # Checks for library functions. -for ac_func in malloc memmove memset __malloc_hook memalign posix_memalign __mingw_aligned_malloc __mingw_aligned_free -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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "malloc" "ac_cv_func_malloc" +if test "x$ac_cv_func_malloc" = xyes +then : + printf "%s\n" "#define HAVE_MALLOC 1" >>confdefs.h fi -done +ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove" +if test "x$ac_cv_func_memmove" = xyes +then : + printf "%s\n" "#define HAVE_MEMMOVE 1" >>confdefs.h +fi +ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset" +if test "x$ac_cv_func_memset" = xyes +then : + printf "%s\n" "#define HAVE_MEMSET 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pow" >&5 -$as_echo_n "checking for library containing pow... " >&6; } -if ${ac_cv_search_pow+:} false; then : - $as_echo_n "(cached) " >&6 -else +fi +ac_fn_c_check_func "$LINENO" "__malloc_hook" "ac_cv_func___malloc_hook" +if test "x$ac_cv_func___malloc_hook" = xyes +then : + printf "%s\n" "#define HAVE___MALLOC_HOOK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "memalign" "ac_cv_func_memalign" +if test "x$ac_cv_func_memalign" = xyes +then : + printf "%s\n" "#define HAVE_MEMALIGN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign" +if test "x$ac_cv_func_posix_memalign" = xyes +then : + printf "%s\n" "#define HAVE_POSIX_MEMALIGN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "__mingw_aligned_malloc" "ac_cv_func___mingw_aligned_malloc" +if test "x$ac_cv_func___mingw_aligned_malloc" = xyes +then : + printf "%s\n" "#define HAVE___MINGW_ALIGNED_MALLOC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "__mingw_aligned_free" "ac_cv_func___mingw_aligned_free" +if test "x$ac_cv_func___mingw_aligned_free" = xyes +then : + printf "%s\n" "#define HAVE___MINGW_ALIGNED_FREE 1" >>confdefs.h + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pow" >&5 +printf %s "checking for library containing pow... " >&6; } +if test ${ac_cv_search_pow+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17604,55 +18717,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 pow (); int -main () +main (void) { return pow (); ; return 0; } _ACEOF -for ac_lib in '' m; do +for ac_lib in '' m +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_pow=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_pow+:} false; then : + if test ${ac_cv_search_pow+y} +then : break fi done -if ${ac_cv_search_pow+:} false; then : +if test ${ac_cv_search_pow+y} +then : -else +else $as_nop ac_cv_search_pow=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pow" >&5 -$as_echo "$ac_cv_search_pow" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pow" >&5 +printf "%s\n" "$ac_cv_search_pow" >&6; } ac_res=$ac_cv_search_pow -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5 -$as_echo_n "checking for library containing sqrt... " >&6; } -if ${ac_cv_search_sqrt+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5 +printf %s "checking for library containing sqrt... " >&6; } +if test ${ac_cv_search_sqrt+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17660,55 +18776,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 sqrt (); int -main () +main (void) { return sqrt (); ; return 0; } _ACEOF -for ac_lib in '' m; do +for ac_lib in '' m +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_sqrt=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_sqrt+:} false; then : + if test ${ac_cv_search_sqrt+y} +then : break fi done -if ${ac_cv_search_sqrt+:} false; then : +if test ${ac_cv_search_sqrt+y} +then : -else +else $as_nop ac_cv_search_sqrt=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5 -$as_echo "$ac_cv_search_sqrt" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5 +printf "%s\n" "$ac_cv_search_sqrt" >&6; } ac_res=$ac_cv_search_sqrt -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5 -$as_echo_n "checking for library containing pthread_create... " >&6; } -if ${ac_cv_search_pthread_create+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5 +printf %s "checking for library containing pthread_create... " >&6; } +if test ${ac_cv_search_pthread_create+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17716,99 +18835,100 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 pthread_create (); int -main () +main (void) { return pthread_create (); ; return 0; } _ACEOF -for ac_lib in '' pthread; do +for ac_lib in '' pthread +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_pthread_create=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_pthread_create+:} false; then : + if test ${ac_cv_search_pthread_create+y} +then : break fi done -if ${ac_cv_search_pthread_create+:} false; then : +if test ${ac_cv_search_pthread_create+y} +then : -else +else $as_nop ac_cv_search_pthread_create=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5 -$as_echo "$ac_cv_search_pthread_create" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5 +printf "%s\n" "$ac_cv_search_pthread_create" >&6; } ac_res=$ac_cv_search_pthread_create -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -for ac_func in gettimeofday -do : - ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" -if test "x$ac_cv_func_gettimeofday" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETTIMEOFDAY 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = xyes +then : + printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h fi -done -for ac_func in pow sqrt -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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" +if test "x$ac_cv_func_pow" = xyes +then : + printf "%s\n" "#define HAVE_POW 1" >>confdefs.h fi -done +ac_fn_c_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt" +if test "x$ac_cv_func_sqrt" = xyes +then : + printf "%s\n" "#define HAVE_SQRT 1" >>confdefs.h -for ac_func in strchr strrchr -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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +fi + +ac_fn_c_check_func "$LINENO" "strchr" "ac_cv_func_strchr" +if test "x$ac_cv_func_strchr" = xyes +then : + printf "%s\n" "#define HAVE_STRCHR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr" +if test "x$ac_cv_func_strrchr" = xyes +then : + printf "%s\n" "#define HAVE_STRRCHR 1" >>confdefs.h fi -done # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 -$as_echo_n "checking for working alloca.h... " >&6; } -if ${ac_cv_working_alloca_h+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +printf %s "checking for working alloca.h... " >&6; } +if test ${ac_cv_working_alloca_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { char *p = (char *) alloca (2 * sizeof (int)); if (p) return 0; @@ -17816,52 +18936,52 @@ char *p = (char *) alloca (2 * sizeof (int)); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_working_alloca_h=yes -else +else $as_nop ac_cv_working_alloca_h=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 -$as_echo "$ac_cv_working_alloca_h" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 +printf "%s\n" "$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then -$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 -$as_echo_n "checking for alloca... " >&6; } -if ${ac_cv_func_alloca_works+:} false; then : - $as_echo_n "(cached) " >&6 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 +printf %s "checking for alloca... " >&6; } +if test ${ac_cv_func_alloca_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test $ac_cv_working_alloca_h = yes; then + ac_cv_func_alloca_works=yes else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER +#include +#include +#ifndef alloca +# ifdef __GNUC__ +# define alloca __builtin_alloca +# elif defined _MSC_VER # include # define alloca _alloca # else -# ifdef HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -void *alloca (size_t); -# endif -# endif +# ifdef __cplusplus +extern "C" # endif +void *alloca (size_t); # endif #endif int -main () +main (void) { char *p = (char *) alloca (1); if (p) return 0; @@ -17869,20 +18989,22 @@ char *p = (char *) alloca (1); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_func_alloca_works=yes -else +else $as_nop ac_cv_func_alloca_works=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 -$as_echo "$ac_cv_func_alloca_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 +printf "%s\n" "$ac_cv_func_alloca_works" >&6; } +fi if test $ac_cv_func_alloca_works = yes; then -$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h +printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h else # The SVR3 libPW and SVR4 libucb both contain incompatible functions @@ -17892,58 +19014,19 @@ else ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -$as_echo "#define C_ALLOCA 1" >>confdefs.h - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 -$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if ${ac_cv_os_cray+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined CRAY && ! defined CRAY2 -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then : - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -f conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 -$as_echo "$ac_cv_os_cray" >&6; } -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; 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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF - - break -fi +printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h - done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 -$as_echo_n "checking stack direction for C alloca... " >&6; } -if ${ac_cv_c_stack_direction+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 +printf %s "checking stack direction for C alloca... " >&6; } +if test ${ac_cv_c_stack_direction+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : ac_cv_c_stack_direction=0 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default @@ -17964,9 +19047,10 @@ main (int argc, char **argv) return find_stack_direction (0, argc + !argv + 20) < 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_c_stack_direction=1 -else +else $as_nop ac_cv_c_stack_direction=-1 fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -17974,41 +19058,41 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 -$as_echo "$ac_cv_c_stack_direction" >&6; } -cat >>confdefs.h <<_ACEOF -#define STACK_DIRECTION $ac_cv_c_stack_direction -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 +printf "%s\n" "$ac_cv_c_stack_direction" >&6; } +printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -$as_echo_n "checking for error_at_line... " >&6; } -if ${ac_cv_lib_error_at_line+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +printf %s "checking for error_at_line... " >&6; } +if test ${ac_cv_lib_error_at_line+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { error_at_line (0, 0, "", 0, "an error occurred"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_error_at_line=yes -else +else $as_nop ac_cv_lib_error_at_line=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -$as_echo "$ac_cv_lib_error_at_line" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } if test $ac_cv_lib_error_at_line = no; then case " $LIBOBJS " in *" error.$ac_objext "* ) ;; @@ -18022,101 +19106,38 @@ fi # here: http://nerdland.net/unstumping-the-internet/malloc-has-not-been-declared/ # AC_FUNC_MALLOC # AC_FUNC_REALLOC -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if ${ac_cv_header_time+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi - - - - - for ac_header in $ac_header_list -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 -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - - for ac_func in $ac_func_list -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" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi +ac_func= +for ac_item in $ac_func_c_list +do + if test $ac_func; then + ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func + if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then + echo "#define $ac_item 1" >> confdefs.h + fi + ac_func= + else + ac_func=$ac_item + fi done - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 -$as_echo_n "checking for working mktime... " >&6; } -if ${ac_cv_func_working_mktime+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 +printf %s "checking for working mktime... " >&6; } +if test ${ac_cv_func_working_mktime+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : ac_cv_func_working_mktime=no -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Test program from Paul Eggert and Tony Leneis. */ -#ifdef TIME_WITH_SYS_TIME +#include +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif #endif #include @@ -18255,7 +19276,7 @@ year_2050_test () } int -main () +main (void) { time_t t, delta; int i, j; @@ -18299,9 +19320,10 @@ main () return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_func_working_mktime=yes -else +else $as_nop ac_cv_func_working_mktime=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -18309,8 +19331,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5 -$as_echo "$ac_cv_func_working_mktime" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5 +printf "%s\n" "$ac_cv_func_working_mktime" >&6; } if test $ac_cv_func_working_mktime = no; then case " $LIBOBJS " in *" mktime.$ac_objext "* ) ;; @@ -18331,8 +19353,8 @@ fi # Check if "__STRICT_ANSI__" is required. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if __STRICT_ANSI__ is required" >&5 -$as_echo_n "checking if __STRICT_ANSI__ is required... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if __STRICT_ANSI__ is required" >&5 +printf %s "checking if __STRICT_ANSI__ is required... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18345,19 +19367,20 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : need_strict_ansi=no -else +else $as_nop need_strict_ansi=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext; ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18368,12 +19391,12 @@ if eval "test x$need_strict_ansi = xyes"; then CFLAGS="$CFLAGS -D__STRICT_ANSI__" CXXFLAGS="$CXXFLAGS -D__STRICT_ANSI__" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $need_strict_ansi" >&5 -$as_echo "$need_strict_ansi" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $need_strict_ansi" >&5 +printf "%s\n" "$need_strict_ansi" >&6; } # Check if "std::shared_ptr" is "std::tr1::shared_ptr" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::shared_ptr" >&5 -$as_echo_n "checking for std::shared_ptr... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for std::shared_ptr" >&5 +printf %s "checking for std::shared_ptr... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18386,7 +19409,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include int -main () +main (void) { class A {}; @@ -18396,24 +19419,25 @@ std::shared_ptr a; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : has_std_shared_ptr=yes -else +else $as_nop has_std_shared_ptr=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_std_shared_ptr" >&5 -$as_echo "$has_std_shared_ptr" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $has_std_shared_ptr" >&5 +printf "%s\n" "$has_std_shared_ptr" >&6; } if eval "test x$has_std_shared_ptr = xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::tr1::shared_ptr" >&5 -$as_echo_n "checking for std::tr1::shared_ptr... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for std::tr1::shared_ptr" >&5 +printf %s "checking for std::tr1::shared_ptr... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { class A {}; @@ -18423,17 +19447,18 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : has_std_tr1_shared_ptr=yes -else +else $as_nop has_std_tr1_shared_ptr=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_std_tr1_shared_ptr" >&5 -$as_echo "$has_std_tr1_shared_ptr" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $has_std_tr1_shared_ptr" >&5 +printf "%s\n" "$has_std_tr1_shared_ptr" >&6; } if eval "test x$has_std_tr1_shared_ptr = xyes"; then -$as_echo "#define USE_STD_TR1_NAMESPACE 1" >>confdefs.h +printf "%s\n" "#define USE_STD_TR1_NAMESPACE 1" >>confdefs.h fi fi @@ -18445,8 +19470,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Check if "std::move" is available (assume always available with clang) -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::move" >&5 -$as_echo_n "checking for std::move... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for std::move" >&5 +printf %s "checking for std::move... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18459,7 +19484,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include int -main () +main (void) { #if !defined(__clang__) @@ -18472,12 +19497,13 @@ A* b = std::move(a); return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : has_std_move=yes -else +else $as_nop has_std_move=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext; ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18486,15 +19512,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if eval "test x$has_std_move = xno"; then -$as_echo "#define NEED_STD_MOVE_FALLBACK 1" >>confdefs.h +printf "%s\n" "#define NEED_STD_MOVE_FALLBACK 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_std_move" >&5 -$as_echo "$has_std_move" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $has_std_move" >&5 +printf "%s\n" "$has_std_move" >&6; } # Check if "nullptr" is available -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nullptr" >&5 -$as_echo_n "checking for nullptr... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nullptr" >&5 +printf %s "checking for nullptr... " >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18506,7 +19532,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main () +main (void) { class A {}; @@ -18516,12 +19542,13 @@ A* a = nullptr; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : has_nullptr=yes -else +else $as_nop has_nullptr=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext; ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18530,20 +19557,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if eval "test x$has_nullptr = xno"; then -$as_echo "#define NEED_NULLPTR_FALLBACK 1" >>confdefs.h +printf "%s\n" "#define NEED_NULLPTR_FALLBACK 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_nullptr" >&5 -$as_echo "$has_nullptr" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $has_nullptr" >&5 +printf "%s\n" "$has_nullptr" >&6; } # Check whether --enable-encoder was given. -if test "${enable_encoder+set}" = set; then : +if test ${enable_encoder+y} +then : enableval=$enable_encoder; fi -if eval "test x$enable_encoder = x" ; then enable_encoder=yes ; fi +if eval "test x$enable_encoder = x" ; then enable_encoder=no ; fi if test x"$enable_encoder" = x"yes"; then ENABLE_ENCODER_TRUE= @@ -18560,9 +19588,10 @@ fi #AX_EXT # Check whether --enable-sse was given. -if test "${enable_sse+set}" = set; then : +if test ${enable_sse+y} +then : enableval=$enable_sse; disable_sse=yes -else +else $as_nop disable_sse=no fi @@ -18574,11 +19603,12 @@ if eval "test x$disable_sse != xyes"; then i[3456]86*|x86_64*|amd64*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -msse4.1" >&5 -$as_echo_n "checking whether C compiler accepts -msse4.1... " >&6; } -if ${ax_cv_check_cflags___msse4_1+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -msse4.1" >&5 +printf %s "checking whether C compiler accepts -msse4.1... " >&6; } +if test ${ax_cv_check_cflags___msse4_1+y} +then : + printf %s "(cached) " >&6 +else $as_nop ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS -msse4.1" @@ -18586,37 +19616,39 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ax_cv_check_cflags___msse4_1=yes -else +else $as_nop ax_cv_check_cflags___msse4_1=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS=$ax_check_save_flags fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse4_1" >&5 -$as_echo "$ax_cv_check_cflags___msse4_1" >&6; } -if test x"$ax_cv_check_cflags___msse4_1" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse4_1" >&5 +printf "%s\n" "$ax_cv_check_cflags___msse4_1" >&6; } +if test x"$ax_cv_check_cflags___msse4_1" = xyes +then : ax_cv_support_sse41_ext=yes -else +else $as_nop : fi if test x"$ax_cv_support_sse41_ext" = x"yes"; then # SIMD_FLAGS="$SIMD_FLAGS -msse4.1" -$as_echo "#define HAVE_SSE4_1 1" >>confdefs.h +printf "%s\n" "#define HAVE_SSE4_1 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your compiler does not support SSE4.1 instructions, can you try another compiler?" >&5 -$as_echo "$as_me: WARNING: Your compiler does not support SSE4.1 instructions, can you try another compiler?" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Your compiler does not support SSE4.1 instructions, can you try another compiler?" >&5 +printf "%s\n" "$as_me: WARNING: Your compiler does not support SSE4.1 instructions, can you try another compiler?" >&2;} fi ;; @@ -18637,23 +19669,25 @@ fi case $target_cpu in arm*) # Check whether --enable-arm was given. -if test "${enable_arm+set}" = set; then : +if test ${enable_arm+y} +then : enableval=$enable_arm; disable_arm=yes -else +else $as_nop disable_arm=no fi if test x"$disable_arm" != x"yes"; then -$as_echo "#define HAVE_ARM 1" >>confdefs.h +printf "%s\n" "#define HAVE_ARM 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mfpu=neon" >&5 -$as_echo_n "checking whether C compiler accepts -mfpu=neon... " >&6; } -if ${ax_cv_check_cflags___mfpu_neon+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mfpu=neon" >&5 +printf %s "checking whether C compiler accepts -mfpu=neon... " >&6; } +if test ${ax_cv_check_cflags___mfpu_neon+y} +then : + printf %s "(cached) " >&6 +else $as_nop ax_check_save_flags=$CFLAGS CFLAGS="$CFLAGS -mfpu=neon" @@ -18661,38 +19695,41 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ax_cv_check_cflags___mfpu_neon=yes -else +else $as_nop ax_cv_check_cflags___mfpu_neon=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS=$ax_check_save_flags fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mfpu_neon" >&5 -$as_echo "$ax_cv_check_cflags___mfpu_neon" >&6; } -if test x"$ax_cv_check_cflags___mfpu_neon" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mfpu_neon" >&5 +printf "%s\n" "$ax_cv_check_cflags___mfpu_neon" >&6; } +if test x"$ax_cv_check_cflags___mfpu_neon" = xyes +then : -$as_echo "#define HAVE_NEON 1" >>confdefs.h +printf "%s\n" "#define HAVE_NEON 1" >>confdefs.h ax_cv_support_neon_ext=yes -else +else $as_nop : fi # Check whether --enable-thumb was given. -if test "${enable_thumb+set}" = set; then : +if test ${enable_thumb+y} +then : enableval=$enable_thumb; enable_thumb=yes -else +else $as_nop enable_thumb=no fi @@ -18733,9 +19770,10 @@ fi # --- additional logging --- # Check whether --enable-log-error was given. -if test "${enable_log_error+set}" = set; then : +if test ${enable_log_error+y} +then : enableval=$enable_log_error; enable_log_error=$enableval -else +else $as_nop enable_log_error=yes fi @@ -18744,9 +19782,10 @@ if eval "test $enable_log_error = yes"; then fi # Check whether --enable-log-info was given. -if test "${enable_log_info+set}" = set; then : +if test ${enable_log_info+y} +then : enableval=$enable_log_info; enable_log_info=$enableval -else +else $as_nop enable_log_info=no fi @@ -18755,9 +19794,10 @@ if eval "test $enable_log_info = yes"; then fi # Check whether --enable-log-debug was given. -if test "${enable_log_debug+set}" = set; then : +if test ${enable_log_debug+y} +then : enableval=$enable_log_debug; enable_log_debug=$enableval -else +else $as_nop enable_log_debug=no fi @@ -18766,9 +19806,10 @@ if eval "test $enable_log_debug = yes"; then fi # Check whether --enable-log-trace was given. -if test "${enable_log_trace+set}" = set; then : +if test ${enable_log_trace+y} +then : enableval=$enable_log_trace; enable_log_trace=$enableval -else +else $as_nop enable_log_trace=no fi @@ -18780,12 +19821,14 @@ fi # --- enable example programs --- # Check whether --enable-dec265 was given. -if test "${enable_dec265+set}" = set; then : +if test ${enable_dec265+y} +then : enableval=$enable_dec265; fi # Check whether --enable-sherlock265 was given. -if test "${enable_sherlock265+set}" = set; then : +if test ${enable_sherlock265+y} +then : enableval=$enable_sherlock265; fi @@ -18805,11 +19848,12 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -18819,11 +19863,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18835,11 +19883,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -18848,11 +19896,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -18862,11 +19911,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18878,11 +19931,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -18890,8 +19943,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $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;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -18903,30 +19956,30 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VIDEOGFX" >&5 -$as_echo_n "checking for VIDEOGFX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libvideogfx" >&5 +printf %s "checking for libvideogfx... " >&6; } if test -n "$VIDEOGFX_CFLAGS"; then pkg_cv_VIDEOGFX_CFLAGS="$VIDEOGFX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvideogfx\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvideogfx\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvideogfx") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VIDEOGFX_CFLAGS=`$PKG_CONFIG --cflags "libvideogfx" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -18940,10 +19993,10 @@ if test -n "$VIDEOGFX_LIBS"; then pkg_cv_VIDEOGFX_LIBS="$VIDEOGFX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvideogfx\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvideogfx\""; } >&5 ($PKG_CONFIG --exists --print-errors "libvideogfx") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VIDEOGFX_LIBS=`$PKG_CONFIG --libs "libvideogfx" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -18957,8 +20010,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -18976,17 +20029,17 @@ fi have_videogfx="no" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_videogfx="no" else VIDEOGFX_CFLAGS=$pkg_cv_VIDEOGFX_CFLAGS VIDEOGFX_LIBS=$pkg_cv_VIDEOGFX_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -$as_echo "#define HAVE_VIDEOGFX 1" >>confdefs.h +printf "%s\n" "#define HAVE_VIDEOGFX 1" >>confdefs.h @@ -18997,19 +20050,19 @@ fi if eval "test x$enable_dec265 = xyes" ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5 -$as_echo_n "checking for SDL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sdl2" >&5 +printf %s "checking for sdl2... " >&6; } if test -n "$SDL_CFLAGS"; then pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl\""; } >&5 - ($PKG_CONFIG --exists --print-errors "sdl") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sdl2") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl" 2>/dev/null` + pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -19021,12 +20074,12 @@ if test -n "$SDL_LIBS"; then pkg_cv_SDL_LIBS="$SDL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl\""; } >&5 - ($PKG_CONFIG --exists --print-errors "sdl") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sdl2") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl" 2>/dev/null` + pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -19038,8 +20091,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19047,9 +20100,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2" 2>&1` else - SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl" 2>&1` + SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SDL_PKG_ERRORS" >&5 @@ -19057,17 +20110,17 @@ fi have_sdl="no" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_sdl="no" else SDL_CFLAGS=$pkg_cv_SDL_CFLAGS SDL_LIBS=$pkg_cv_SDL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -$as_echo "#define HAVE_SDL 1" >>confdefs.h +printf "%s\n" "#define HAVE_SDL 1" >>confdefs.h @@ -19078,17 +20131,17 @@ fi if eval "test x$enable_sherlock265 = xyes" && eval "test x$have_videogfx != xyes" ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWSCALE" >&5 -$as_echo_n "checking for SWSCALE... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libswscale" >&5 +printf %s "checking for libswscale... " >&6; } if test -n "$SWSCALE_CFLAGS"; then pkg_cv_SWSCALE_CFLAGS="$SWSCALE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5 ($PKG_CONFIG --exists --print-errors "libswscale") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SWSCALE_CFLAGS=`$PKG_CONFIG --cflags "libswscale" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -19102,10 +20155,10 @@ if test -n "$SWSCALE_LIBS"; then pkg_cv_SWSCALE_LIBS="$SWSCALE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libswscale\""; } >&5 ($PKG_CONFIG --exists --print-errors "libswscale") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SWSCALE_LIBS=`$PKG_CONFIG --libs "libswscale" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -19119,8 +20172,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19138,17 +20191,17 @@ fi have_swscale="no" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_swscale="no" else SWSCALE_CFLAGS=$pkg_cv_SWSCALE_CFLAGS SWSCALE_LIBS=$pkg_cv_SWSCALE_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -$as_echo "#define HAVE_SWSCALE 1" >>confdefs.h +printf "%s\n" "#define HAVE_SWSCALE 1" >>confdefs.h @@ -19182,30 +20235,30 @@ fi if eval "test $enable_dec265 = yes" && eval "test $have_videogfx != yes" && eval "test $have_sdl != yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Did not find libvideogfx or libsdl, video output of dec265 will be disabled." >&5 -$as_echo "$as_me: WARNING: Did not find libvideogfx or libsdl, video output of dec265 will be disabled." >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Did not find libvideogfx or libsdl2, video output of dec265 will be disabled." >&5 +printf "%s\n" "$as_me: WARNING: Did not find libvideogfx or libsdl2, video output of dec265 will be disabled." >&2;} fi if eval "test $enable_sherlock265 = yes" && eval "test $have_videogfx != yes" && eval "test $have_swscale != yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Did not find libvideogfx or libswscale, compilation of sherlock265 will be disabled." >&5 -$as_echo "$as_me: WARNING: Did not find libvideogfx or libswscale, compilation of sherlock265 will be disabled." >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Did not find libvideogfx or libswscale, compilation of sherlock265 will be disabled." >&5 +printf "%s\n" "$as_me: WARNING: Did not find libvideogfx or libswscale, compilation of sherlock265 will be disabled." >&2;} enable_sherlock265="no" fi if eval "test $enable_sherlock265 = yes" ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT" >&5 -$as_echo_n "checking for QT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt5Core Qt5Gui Qt5Widgets" >&5 +printf %s "checking for Qt5Core Qt5Gui Qt5Widgets... " >&6; } if test -n "$QT_CFLAGS"; then pkg_cv_QT_CFLAGS="$QT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets\""; } >&5 ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core Qt5Gui Qt5Widgets" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -19219,10 +20272,10 @@ if test -n "$QT_LIBS"; then pkg_cv_QT_LIBS="$QT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets\""; } >&5 ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "Qt5Core Qt5Gui Qt5Widgets" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -19236,8 +20289,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19254,30 +20307,30 @@ fi found_qt=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } found_qt=no else QT_CFLAGS=$pkg_cv_QT_CFLAGS QT_LIBS=$pkg_cv_QT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } found_qt=5 fi if eval "test $found_qt = no" ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT" >&5 -$as_echo_n "checking for QT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QtCore QtGui" >&5 +printf %s "checking for QtCore QtGui... " >&6; } if test -n "$QT_CFLAGS"; then pkg_cv_QT_CFLAGS="$QT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore QtGui\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore QtGui\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtCore QtGui") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "QtCore QtGui" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -19291,10 +20344,10 @@ if test -n "$QT_LIBS"; then pkg_cv_QT_LIBS="$QT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore QtGui\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore QtGui\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtCore QtGui") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "QtCore QtGui" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -19308,8 +20361,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -19335,10 +20388,10 @@ Alternatively, you may set the environment variables QT_CFLAGS and QT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -19352,8 +20405,8 @@ See \`config.log' for more details" "$LINENO" 5; } else QT_CFLAGS=$pkg_cv_QT_CFLAGS QT_LIBS=$pkg_cv_QT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } found_qt=4 fi fi @@ -19361,11 +20414,12 @@ fi 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_QTCHOOSER+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_QTCHOOSER+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $QTCHOOSER in [\\/]* | ?:[\\/]*) ac_cv_path_QTCHOOSER="$QTCHOOSER" # Let the user override the test with a path. @@ -19375,11 +20429,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_QTCHOOSER="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_QTCHOOSER="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19391,11 +20449,11 @@ esac fi QTCHOOSER=$ac_cv_path_QTCHOOSER if test -n "$QTCHOOSER"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QTCHOOSER" >&5 -$as_echo "$QTCHOOSER" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $QTCHOOSER" >&5 +printf "%s\n" "$QTCHOOSER" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -19407,11 +20465,12 @@ done 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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_QTMOC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_QTMOC+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $QTMOC in [\\/]* | ?:[\\/]*) ac_cv_path_QTMOC="$QTMOC" # Let the user override the test with a path. @@ -19421,11 +20480,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_QTMOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_QTMOC="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19437,11 +20500,11 @@ esac fi QTMOC=$ac_cv_path_QTMOC if test -n "$QTMOC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QTMOC" >&5 -$as_echo "$QTMOC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $QTMOC" >&5 +printf "%s\n" "$QTMOC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -19454,11 +20517,11 @@ done else QTMOC="$QTCHOOSER -run-tool=moc -qt=$found_qt" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version of $QTMOC" >&5 -$as_echo_n "checking for version of $QTMOC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for version of $QTMOC" >&5 +printf %s "checking for version of $QTMOC... " >&6; } QTMOC_VERSION=`$QTMOC -v 2>&1 | $GREP -o '[0-9]\+.[0-9]\+.[0-9]\+'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QTMOC_VERSION" >&5 -$as_echo "$QTMOC_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $QTMOC_VERSION" >&5 +printf "%s\n" "$QTMOC_VERSION" >&6; } @@ -19517,16 +20580,16 @@ fi # --- output configuration results --- -{ $as_echo "$as_me:${as_lineno-$LINENO}: ---------------------------------------" >&5 -$as_echo "$as_me: ---------------------------------------" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: Building dec265 example: $enable_dec265" >&5 -$as_echo "$as_me: Building dec265 example: $enable_dec265" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: Building sherlock265 example: $enable_sherlock265" >&5 -$as_echo "$as_me: Building sherlock265 example: $enable_sherlock265" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: Building encoder: $enable_encoder" >&5 -$as_echo "$as_me: Building encoder: $enable_encoder" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: ---------------------------------------" >&5 -$as_echo "$as_me: ---------------------------------------" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ---------------------------------------" >&5 +printf "%s\n" "$as_me: ---------------------------------------" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Building dec265 example: $enable_dec265" >&5 +printf "%s\n" "$as_me: Building dec265 example: $enable_dec265" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Building sherlock265 example: $enable_sherlock265" >&5 +printf "%s\n" "$as_me: Building sherlock265 example: $enable_sherlock265" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Building encoder: $enable_encoder" >&5 +printf "%s\n" "$as_me: Building encoder: $enable_encoder" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ---------------------------------------" >&5 +printf "%s\n" "$as_me: ---------------------------------------" >&6;} ac_config_files="$ac_config_files Makefile" @@ -19581,8 +20644,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_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;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -19612,15 +20675,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -19634,8 +20697,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -19652,7 +20715,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$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. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -19671,14 +20734,14 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -19748,8 +20811,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -19772,14 +20835,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (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 +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -19789,46 +20854,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -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 -# 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 - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -19837,13 +20902,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -19852,8 +20910,12 @@ case $0 in #(( 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 + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -19865,30 +20927,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# 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='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -19901,13 +20943,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -19934,18 +20977,20 @@ 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 : +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 +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -19957,12 +21002,13 @@ fi # as_fn_append # 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 : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -19993,7 +21039,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -20015,6 +21061,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -20028,6 +21078,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -20069,7 +21125,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -20078,7 +21134,7 @@ $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" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -20140,8 +21196,8 @@ 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 libde265 $as_me 1.0.8, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by libde265 $as_me 1.0.15, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -20200,17 +21256,19 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libde265 config.status 1.0.8 -configured by $0, generated by GNU Autoconf 2.69, +libde265 config.status 1.0.15 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -20250,15 +21308,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -20266,7 +21324,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -20275,7 +21333,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -20303,7 +21361,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -20317,7 +21375,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -20706,7 +21764,7 @@ fi -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" _ACEOF @@ -20743,9 +21801,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -21081,7 +22139,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -21089,17 +22147,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -21116,7 +22174,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -21140,9 +22198,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -21204,8 +22262,8 @@ ac_sed_dataroot=' 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:${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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -21249,9 +22307,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$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' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -21267,20 +22325,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -21300,7 +22358,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | +printf "%s\n" X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -21320,8 +22378,8 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -21868,6 +22926,7 @@ _LT_EOF esac + ltmain=$ac_aux_dir/ltmain.sh @@ -22040,29 +23099,35 @@ _LT_EOF # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -22080,53 +23145,50 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; @@ -22163,7 +23225,8 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/configure.ac b/configure.ac index a566b66..770f502 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([libde265], [1.0.8], [farin@struktur.de]) +AC_INIT([libde265], [1.0.15], [dirk.farin@gmail.com]) AC_CONFIG_SRCDIR([libde265/de265.cc]) AC_CONFIG_HEADERS([config.h]) -NUMERIC_VERSION=0x01000800 # Numeric representation of the version (A.B.C[.D] = 0xAABBCCDD) +NUMERIC_VERSION=0x01001500 # Numeric representation of the version (A.B.C[.D] = 0xAABBCCDD) AC_SUBST(NUMERIC_VERSION) # From https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html: @@ -16,7 +16,7 @@ AC_SUBST(NUMERIC_VERSION) # If any interfaces have been removed or changed since the last public release, then set age to 0. LIBDE265_CURRENT=1 -LIBDE265_REVISION=1 +LIBDE265_REVISION=8 LIBDE265_AGE=1 # --------------------------------------------------------------------------- @@ -62,7 +62,7 @@ HAVE_VISIBILITY=0 AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" != "x0"]) # Checks for header files. -AC_CHECK_HEADERS([stdint.h stdlib.h string.h malloc.h signal.h setjmp.h stddef.h sys/time.h]) +AC_CHECK_HEADERS([stdlib.h string.h malloc.h signal.h setjmp.h stddef.h sys/time.h]) AC_LANG_PUSH(C++) OLD_CPPFLAGS="$CPPFLAGS" @@ -178,8 +178,8 @@ AC_MSG_RESULT([$has_nullptr]) -AC_ARG_ENABLE([encoder], AS_HELP_STRING([--disable-encoder], [Do not build encoder.])) -if eval "test x$enable_encoder = x" ; then enable_encoder=yes ; fi +AC_ARG_ENABLE([encoder], AS_HELP_STRING([--enable-encoder], [Build the encoder (experimental).])) +if eval "test x$enable_encoder = x" ; then enable_encoder=no ; fi AM_CONDITIONAL([ENABLE_ENCODER], [test x"$enable_encoder" = x"yes"]) @@ -308,8 +308,8 @@ if eval "test x$enable_dec265 = xyes" || eval "test x$enable_sherlock265 = xyes" fi if eval "test x$enable_dec265 = xyes" ; then - PKG_CHECK_MODULES([SDL], [sdl], - [AC_DEFINE([HAVE_SDL], [1], [Whether libsdl was found.]) + PKG_CHECK_MODULES([SDL], [sdl2], + [AC_DEFINE([HAVE_SDL], [1], [Whether libsdl2 was found.]) AC_SUBST(SDL_CFLAGS) AC_SUBST(SDL_LIBS) have_sdl="yes"], @@ -332,7 +332,7 @@ AM_CONDITIONAL([HAVE_SWSCALE], [test "x$have_swscale" = "xyes"]) AM_CONDITIONAL([HAVE_SDL], [test "x$have_sdl" = "xyes"]) if eval "test $enable_dec265 = yes" && eval "test $have_videogfx != yes" && eval "test $have_sdl != yes" ; then - AC_MSG_WARN([Did not find libvideogfx or libsdl, video output of dec265 will be disabled.]) + AC_MSG_WARN([Did not find libvideogfx or libsdl2, video output of dec265 will be disabled.]) fi if eval "test $enable_sherlock265 = yes" && eval "test $have_videogfx != yes" && eval "test $have_swscale != yes" ; then diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml new file mode 100644 index 0000000..2b1e2ef --- /dev/null +++ b/debian/.gitlab-ci.yml @@ -0,0 +1,3 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml + diff --git a/debian/changelog b/debian/changelog index 67bac01..a892c0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,115 @@ -libde265 (1.0.8-1deepin0) unstable; urgency=medium +libde265 (1.0.15-1) unstable; urgency=medium - * No source change upload against GCC 12. + * New upstream version 1.0.15 + * Fixes CVE-2023-49465, CVE-2023-49467, CVE-2023-49468. + * Add patch to fix "Libs.private" in libde265.pc. - -- Tianyu Chen Thu, 19 Sep 2024 22:53:22 +0800 + -- Joachim Bauch Thu, 21 Dec 2023 09:29:24 +0100 + +libde265 (1.0.13-1) unstable; urgency=medium + + * New upstream version 1.0.13 + * Fixes CVE-2023-47471 (Closes: #1056187), CVE-2023-43887. + * Update patches for new upstream version. + * d/control: Upstream switched examples to SDL2 (Closes: #1038097). + * Update symbols for new upstream version. + + -- Joachim Bauch Tue, 21 Nov 2023 08:59:09 +0100 + +libde265 (1.0.12-2) unstable; urgency=medium + + * Team upload + * Clean Makefiles (Closes: #1047354) + + [ Vladimir Petko ] + * add libde265 decoder smoke test (Closes: #1052214) + + -- Bastian Germann Tue, 19 Sep 2023 08:20:11 +0000 + +libde265 (1.0.12-1) unstable; urgency=medium + + * New upstream version 1.0.12 + * Fixes CVE-2023-27102, CVE-2023-27103 + + -- Joachim Bauch Tue, 20 Jun 2023 09:10:00 +0200 + +libde265 (1.0.11-1) unstable; urgency=medium + + [ Tobias Frost ] + * Make my patch less noisy. + + [ Joachim Bauch ] + * New upstream version 1.0.11 + * Unpackaged upstream version 1.0.10 fixes the following CVEs, most caused + by the same underlying issue: + CVE-2020-21594, CVE-2020-21595, CVE-2020-21596, CVE-2020-21597, + CVE-2020-21598, CVE-2020-21599, CVE-2020-21600, CVE-2020-21601, + CVE-2020-21602, CVE-2020-21603, CVE-2020-21604, CVE-2020-21605, + CVE-2020-21606, CVE-2022-1253, CVE-2022-43236, CVE-2022-43237, + CVE-2022-43238, CVE-2022-43239, CVE-2022-43240, CVE-2022-43241, + CVE-2022-43242, CVE-2022-43243, CVE-2022-43244, CVE-2022-43245, + CVE-2022-43248, CVE-2022-43249, CVE-2022-43250, CVE-2022-43252, + CVE-2022-43253, CVE-2022-47655 + * Remove patch applied upstream. + * Update patches for new upstream version. + * Remove copyright entry for file no longer present in upstream. + * Update symbols for new upstream version. + * Bump "Standards-Version" to 4.6.2 + + -- Joachim Bauch Thu, 02 Feb 2023 16:06:20 +0100 + +libde265 (1.0.9-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply patches to mitigate asan failures: + reject_reference_pics_from_different_sps.patch and + use_sps_from_the_image.patch. + * Combined, this two patches fixes: + - CVE-2022-43243, CVE-2022-43248, CVE-2022-43253 (Closes: #1025816) + - CVE-2022-43235, CVE-2022-43236, CVE-2022-43237, CVE-2022-43238, + CVE-2022-43239, CVE-2022-43240, CVE-2022-43241, CVE-2022-43242, + CVE-2022-43244, CVE-2022-43250, CVE-2022-43252 (Closes: #1027179) + - CVE-2022-47655 + * Additional patch recycle_sps_if_possible.patch to avoid over-rejecting + valid video streams due to reject_reference_pics_from_different_sps.patch. + * Modifying past changelog entries to indicate when vulnerabilities were + fixed: + - In 1.0.9-1, in total 11 CVE's. see #1004963 and #1014999 + - In 1.0.3-1, 1 CVE, see #1029396 + * drop unused Build-Depends: libjpeg-dev, libpng-dev and libxv-dev + (Closes: #981260) + + -- Tobias Frost Sun, 22 Jan 2023 13:19:20 +0100 + +libde265 (1.0.9-1) unstable; urgency=medium + + * Add "Rules-Requires-Root: no". + * New upstream version 1.0.9. + Bisecting shows that this version fixed this CVES: + - CVE-2020-21598, CVE-2020-21600, CVE-2020-21602 (Closes: #1004963) + - CVE-2020-21595, CVE-2020-21597, CVE-2020-21599, CVE-2020-21601, + CVE-2020-21603, CVE-2020-21604, CVE-2020-21605, CVE-2020-21606 + (Closes: #1014999) + * Remove patches now part of upstream release. + * Bump "Standards-Version" to 4.6.1 + * Add patch to provide "gl_VISIBILITY" macro. + * Update symbols for new upstream version. + + -- Joachim Bauch Tue, 25 Oct 2022 10:15:37 +0200 + +libde265 (1.0.8-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Import upstream fixes for CVE-tracked vulnerabilities + (Closes: #1014977) + - CVE-2022-1253 + - CVE-2021-36411 + - CVE-2021-36410 + - CVE-2021-36409 + - CVE-2021-36408 + - CVE-2021-35452 + + -- Philipp Kern Sun, 16 Oct 2022 15:26:20 +0200 libde265 (1.0.8-1) unstable; urgency=medium @@ -59,6 +166,7 @@ libde265 (1.0.3-1) unstable; urgency=medium [ Joachim Bauch ] * Imported Upstream version 1.0.3 + This version fixes CVE-2020-21594. (Closes: #1029396) * Update patches for new upstream version. * Update symbols for new upstream version. * Update standards version and switch to debhelper 10. diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..ceffb41 --- /dev/null +++ b/debian/clean @@ -0,0 +1,3 @@ +acceleration-speed/Makefile +enc265/Makefile +tools/Makefile diff --git a/debian/control b/debian/control index e15efef..2c1cc29 100644 --- a/debian/control +++ b/debian/control @@ -7,16 +7,14 @@ Uploaders: Joachim Bauch Build-Depends: debhelper-compat (= 13), - libjpeg-dev, - libpng-dev, qtbase5-dev | libqt4-dev, - libsdl-dev, + libsdl2-dev, libswscale-dev, libx11-dev, libxext-dev, - libxv-dev, pkg-config -Standards-Version: 4.5.1 +Rules-Requires-Root: no +Standards-Version: 4.6.2 Homepage: https://github.com/strukturag/libde265 Vcs-Git: https://salsa.debian.org/multimedia-team/libde265.git Vcs-Browser: https://salsa.debian.org/multimedia-team/libde265 diff --git a/debian/copyright b/debian/copyright index 4c87163..091f5f7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -71,26 +71,6 @@ License: public-domain-1 optimizations are not included to reduce source code size and avoid compile-time configuration. -Files: extra/stdint.h -Copyright: No copyright holder -License: public-domain-2 - ISO C9x 7.18 Integer types - Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794) - . - THIS SOFTWARE IS NOT COPYRIGHTED - . - Contributor: Danny Smith - . - This source code is offered for use in the public domain. You may - use, modify or distribute it freely. - . - This code is distributed in the hope that it will be useful but - WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - DISCLAIMED. This includes but is not limited to warranties of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - . - Date: 2000-12-02 - Files: extra/win32cond.c extra/win32cond.h Copyright: @@ -119,7 +99,7 @@ License: other-1 Files: debian/* Copyright: - 2014 Joachim Bauch + 2014-2023 Joachim Bauch 2014 Alessio Treglia License: LGPL-3+ diff --git a/debian/libde265-0.symbols b/debian/libde265-0.symbols index 2eb2c5d..3dec241 100644 --- a/debian/libde265-0.symbols +++ b/debian/libde265-0.symbols @@ -3,7 +3,6 @@ libde265.so.0 libde265-0 #MINVER# (optional|c++|regex)"^std::_Sp_counted_base<.*@Base$" 1.0.2 (optional|c++|regex)"^std::_Sp_counted_ptr<.*@Base$" 1.0.3 (optional|c++|regex)"^std::_Sp_make_shared_tag.*@Base$" 1.0.4 - (optional|c++|regex)"^std::_Vector_base<.*@Base$" 1.0.7 (optional|c++|regex)"^std::__cxx11::basic_stringbuf<.*@Base$" 1.0.2 (optional|c++|regex)"^std::vector<.*@Base$" 1.0.2 (optional|c++|regex)"^typeinfo for std::.*@Base$" 1.0.2 @@ -75,4 +74,3 @@ libde265.so.0 libde265-0 #MINVER# (optional=only used internally by sherlock265)draw_TB_grid@Base 0.8 (optional=only used internally by sherlock265)draw_Tiles@Base 0.8 (optional=only used internally by sherlock265)draw_intra_pred_modes@Base 0.8 - (optional=only used by the non-final encoder api|regex)en265_.*@Base 1.0.2 diff --git a/debian/patches/disable_tools.patch b/debian/patches/disable_tools.patch index 506b19d..a2016bc 100644 --- a/debian/patches/disable_tools.patch +++ b/debian/patches/disable_tools.patch @@ -1,28 +1,6 @@ Description: Disable building of some internal tools that no longer link because internal symbols are no longer exported. Author: Joachim Bauch ---- a/dec265/Makefile.am -+++ b/dec265/Makefile.am -@@ -1,5 +1,5 @@ - --bin_PROGRAMS = dec265 hdrcopy -+bin_PROGRAMS = dec265 - - AM_CPPFLAGS = -I$(top_srcdir)/libde265 -I$(top_srcdir) - -@@ -9,12 +9,6 @@ - dec265_LDADD = ../libde265/libde265.la -lstdc++ - dec265_SOURCES = dec265.cc - --hdrcopy_DEPENDENCIES = ../libde265/libde265.la --hdrcopy_CXXFLAGS = --hdrcopy_LDFLAGS = --hdrcopy_LDADD = ../libde265/libde265.la -lstdc++ --hdrcopy_SOURCES = hdrcopy.cc -- - if HAVE_VIDEOGFX - dec265_CXXFLAGS += $(VIDEOGFX_CFLAGS) - dec265_LDFLAGS += $(VIDEOGFX_LIBS) --- a/Makefile.am +++ b/Makefile.am @@ -8,13 +8,6 @@ diff --git a/debian/patches/fix-private-libs-pc.patch b/debian/patches/fix-private-libs-pc.patch new file mode 100644 index 0000000..7f4c84a --- /dev/null +++ b/debian/patches/fix-private-libs-pc.patch @@ -0,0 +1,26 @@ +Description: Fix missing "LIBS_PRIVATE" variable for libde265.pc in + autoconf builds. +From 56d1cf52e43d734692721c99b72815c0fee1f184 Mon Sep 17 00:00:00 2001 +From: Joachim Bauch +Date: Thu, 21 Dec 2023 09:22:58 +0100 +Subject: [PATCH] Fix missing "LIBS_PRIVATE" for libde265.pc in autoconf + builds. +Forwarded: https://github.com/strukturag/libde265/pull/439 +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 770f5025..798e9a2c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -104,6 +104,9 @@ AC_FUNC_ERROR_AT_LINE + # AC_FUNC_REALLOC + AC_FUNC_MKTIME + ++LIBS_PRIVATE="$LIBS -lstdc++" ++AC_SUBST(LIBS_PRIVATE) ++ + AM_CONDITIONAL(MINGW, expr $host : '.*-mingw' >/dev/null 2>&1) + + # Check if "__STRICT_ANSI__" is required. diff --git a/debian/patches/recycle_sps_if_possible.patch b/debian/patches/recycle_sps_if_possible.patch new file mode 100644 index 0000000..dda9fc7 --- /dev/null +++ b/debian/patches/recycle_sps_if_possible.patch @@ -0,0 +1,340 @@ +Description: Don't update sps if they are only repeated +Origin: https://github.com/strukturag/libde265/pull/372 +From 51f07f132f29832e025a8b913b61cbd20257c5fc Mon Sep 17 00:00:00 2001 +From: Tobias Frost +Date: Fri, 13 Jan 2023 12:22:45 +0100 +Subject: [PATCH] Don't update sps if they are only repeated + +This is an attempt to improve the mitigations from #365 and #366 and picks up an idea I described at #345: + +> One way would be just to look at the pointers of the SPS (fast and easy, but +> may reject more than required), or investigate if the SPS used for the image +> generations are "compatible". + +This changes do exactly this: It (very conservativly) checks if the old and new sps have +identical information -- except the reference picture set, which I believe is supposed +to be updated by new sps'). If they are basically identical, the old sps will be +used instead of the new one, (of course, reference image set is updated from the new one) + +I'm using standalone operator== and helper functions to avoid changing ABI of the library; +if an ABI bump would be done, of course this should go to the respective classes. +--- + libde265/decctx.cc | 273 +++++++++++++++++++++++++++++++++++++++++++++ + libde265/sps.cc | 6 + + 2 files changed, 279 insertions(+) + +Index: libde265/libde265/decctx.cc +=================================================================== +--- libde265.orig/libde265/decctx.cc ++++ libde265/libde265/decctx.cc +@@ -546,6 +546,263 @@ de265_error decoder_context::read_vps_NA + return DE265_OK; + } + ++// implemented as freestanding functions to avoid changing API ++ ++bool operator==(const profile_data &lhs, const profile_data &rhs) { ++ if(&lhs == &rhs) return true; ++ if(lhs.profile_present_flag != rhs.profile_present_flag ) return false; ++ if(lhs.profile_present_flag) { ++ if(lhs.profile_space != rhs.profile_space ) return false; ++ if(lhs.tier_flag != rhs.tier_flag ) return false; ++ if(lhs.profile_idc != rhs.profile_idc ) return false; ++ ++ if(memcmp(lhs.profile_compatibility_flag, rhs.profile_compatibility_flag, sizeof(rhs.profile_compatibility_flag)) ) return false; ++ ++ if(lhs.progressive_source_flag != rhs.progressive_source_flag ) return false; ++ if(lhs.interlaced_source_flag != rhs.interlaced_source_flag ) return false; ++ if(lhs.non_packed_constraint_flag != rhs.non_packed_constraint_flag ) return false; ++ if(lhs.frame_only_constraint_flag != rhs.frame_only_constraint_flag ) return false; ++ } ++ ++ if(lhs.level_present_flag != rhs.level_present_flag) return false; ++ if(lhs.level_present_flag && lhs.level_idc != rhs.level_idc ) return false; ++ ++ return true; ++} ++ ++bool operator!=(const profile_data &lhs, const profile_data &rhs) { ++ if(&lhs == &rhs) return false; ++ return (!(lhs==rhs)); ++} ++ ++// class does not store max_sub_layers, so operator == cannot be done. ++bool isEqual(const profile_tier_level &lhs , const profile_tier_level &rhs, int sps_max_sub_layers ) { ++ if(&lhs == &rhs) return true; ++ ++ if(lhs.general != rhs.general ) return false; ++ for(int i = 0 ; i < sps_max_sub_layers; i++ ) { ++ if(lhs.sub_layer[i] != rhs.sub_layer[i]) return false; ++ } ++ return true; ++} ++ ++bool isEqual(const video_usability_information &lhs, const video_usability_information &rhs, const seq_parameter_set &sps) { ++ if(&lhs == &rhs) return true; ++ ++ // not seen yet if(lhs.nal_hrd_parameters_present_flag != rhs.nal_hrd_parameters_present_flag ) return false; ++ ++ // populated by video_usability_information::read() ++ if(lhs.aspect_ratio_info_present_flag != rhs.aspect_ratio_info_present_flag ) return false; ++ if(lhs.aspect_ratio_info_present_flag) { ++ if(lhs.sar_width != rhs.sar_width ) return false; ++ if(lhs.sar_height != rhs.sar_height ) return false; ++ } ++ ++ if(lhs.overscan_info_present_flag != rhs.overscan_info_present_flag ) return false; ++ if(lhs.overscan_info_present_flag) { ++ if(lhs.overscan_appropriate_flag != rhs.overscan_appropriate_flag ) return false; ++ } ++ ++ if(lhs.video_signal_type_present_flag != rhs.video_signal_type_present_flag ) return false; ++ if(lhs.video_signal_type_present_flag) { ++ if(lhs.video_format != rhs.video_format ) return false; ++ if(lhs.video_full_range_flag != rhs.video_full_range_flag) return false; ++ if(lhs.colour_description_present_flag != rhs.colour_description_present_flag) return false; ++ if(lhs.colour_primaries != rhs.colour_primaries ) return false; ++ if(lhs.transfer_characteristics != rhs.transfer_characteristics ) return false; ++ if(lhs.matrix_coeffs != rhs.matrix_coeffs ) return false; ++ } ++ ++ if(lhs.chroma_loc_info_present_flag != rhs.chroma_loc_info_present_flag ) return false; ++ if(lhs.chroma_loc_info_present_flag) { ++ if(lhs.chroma_sample_loc_type_top_field != rhs.chroma_sample_loc_type_top_field ) return false; ++ if(lhs.chroma_sample_loc_type_bottom_field != rhs.chroma_sample_loc_type_bottom_field ) return false; ++ } ++ if(lhs.neutral_chroma_indication_flag != rhs.neutral_chroma_indication_flag ) return false; ++ if(lhs.field_seq_flag != rhs.field_seq_flag ) return false; ++ if(lhs.frame_field_info_present_flag != rhs.frame_field_info_present_flag ) return false; ++ ++ if(lhs.default_display_window_flag != rhs.default_display_window_flag ) return false; ++ if(lhs.default_display_window_flag) { ++ if(lhs.def_disp_win_left_offset != rhs.def_disp_win_left_offset ) return false; ++ if(lhs.def_disp_win_right_offset != rhs.def_disp_win_right_offset ) return false; ++ if(lhs.def_disp_win_top_offset != rhs.def_disp_win_top_offset ) return false; ++ if(lhs.def_disp_win_bottom_offset != rhs.def_disp_win_bottom_offset ) return false; ++ } ++ ++ if(lhs.vui_timing_info_present_flag != rhs.vui_timing_info_present_flag ) return false; ++ if(lhs.vui_timing_info_present_flag) { ++ if(lhs.vui_num_units_in_tick != rhs.vui_num_units_in_tick ) return false; ++ if(lhs.vui_time_scale != rhs.vui_time_scale ) return false; ++ if(lhs.vui_timing_info_present_flag != rhs.vui_timing_info_present_flag ) return false; ++ if(lhs.vui_timing_info_present_flag) { ++ if(lhs.vui_num_ticks_poc_diff_one != rhs.vui_num_ticks_poc_diff_one ) return false; ++ } ++ } ++ ++ if(lhs.vui_hrd_parameters_present_flag != rhs.vui_hrd_parameters_present_flag ) return false; ++ ++ ++ if(lhs.vui_hrd_parameters_present_flag) { ++ // check things made by hrd_parametes ++ ++ if(lhs.vui_hrd_parameters_present_flag != rhs.vui_hrd_parameters_present_flag ) return false; ++ if(lhs.vcl_hrd_parameters_present_flag != rhs.vcl_hrd_parameters_present_flag ) return false; ++ ++ if(lhs.nal_hrd_parameters_present_flag || lhs.vcl_hrd_parameters_present_flag) { ++ if(lhs.sub_pic_hrd_params_present_flag != rhs.sub_pic_hrd_params_present_flag ) return false; ++ if(lhs.sub_pic_hrd_params_present_flag) { ++ if(lhs.tick_divisor_minus2 != rhs.tick_divisor_minus2 ) return false; ++ if(lhs.du_cpb_removal_delay_increment_length_minus1 != rhs.du_cpb_removal_delay_increment_length_minus1 ) return false; ++ if(lhs.sub_pic_cpb_params_in_pic_timing_sei_flag != rhs.sub_pic_cpb_params_in_pic_timing_sei_flag ) return false; ++ if(lhs.dpb_output_delay_du_length_minus1 != rhs.dpb_output_delay_du_length_minus1 ) return false; ++ } ++ if(lhs.bit_rate_scale != rhs.bit_rate_scale ) return false; ++ if(lhs.cpb_size_scale != rhs.cpb_size_scale ) return false; ++ if(lhs.sub_pic_hrd_params_present_flag) { ++ if(lhs.cpb_size_du_scale != rhs.cpb_size_du_scale ) return false; ++ } ++ if(lhs.initial_cpb_removal_delay_length_minus1 != rhs.initial_cpb_removal_delay_length_minus1 ) return false; ++ if(lhs.au_cpb_removal_delay_length_minus1 != rhs.au_cpb_removal_delay_length_minus1 ) return false; ++ if(lhs.dpb_output_delay_length_minus1 != rhs.dpb_output_delay_length_minus1 ) return false; ++ } ++ ++ int i; ++ unsigned int j, nalOrVcl; ++ ++ for (i = 0; i < sps.sps_max_sub_layers; i++) { ++ if(lhs.fixed_pic_rate_general_flag[i] != rhs.fixed_pic_rate_general_flag[i] ) return false; ++ if(lhs.fixed_pic_rate_general_flag[i]) { ++ if(lhs.elemental_duration_in_tc_minus1[i] != rhs.elemental_duration_in_tc_minus1[i] ) return false; ++ } ++ if(lhs.low_delay_hrd_flag[i] != rhs.low_delay_hrd_flag[i] ) return false; ++ if(lhs.cpb_cnt_minus1[i] != rhs.cpb_cnt_minus1[i] ) return false; ++ ++ for (nalOrVcl = 0; nalOrVcl < 2; nalOrVcl++) { ++ if (((nalOrVcl == 0) && lhs.nal_hrd_parameters_present_flag) || ((nalOrVcl == 1) && lhs.vcl_hrd_parameters_present_flag)) { ++ for (j = 0; j <= lhs.cpb_cnt_minus1[i]; j++) { ++ if(lhs.bit_rate_value_minus1[i][j][nalOrVcl] != rhs.bit_rate_value_minus1[i][j][nalOrVcl]) return false; ++ if(lhs.cpb_size_value_minus1[i][j][nalOrVcl] != rhs.cpb_size_value_minus1[i][j][nalOrVcl]) return false; ++ ++ if (lhs.sub_pic_hrd_params_present_flag) { ++ if(lhs.cpb_size_du_value_minus1[i][j][nalOrVcl] != rhs.cpb_size_du_value_minus1[i][j][nalOrVcl]) return false; ++ if(lhs.bit_rate_du_value_minus1[i][j][nalOrVcl] != rhs.bit_rate_du_value_minus1[i][j][nalOrVcl]) return false; ++ } ++ if( lhs.cbr_flag[i][j][nalOrVcl] != rhs.cbr_flag[i][j][nalOrVcl]) return false; ++ } ++ } ++ } ++ } ++ } ++ return true; ++} ++ ++bool operator==(const sps_range_extension &lhs, const sps_range_extension &rhs) { ++ if(&lhs == &rhs) return true; ++ if(lhs.transform_skip_rotation_enabled_flag != rhs.transform_skip_rotation_enabled_flag ) return false; ++ if(lhs.transform_skip_context_enabled_flag != rhs.transform_skip_context_enabled_flag ) return false; ++ if(lhs.implicit_rdpcm_enabled_flag != rhs.implicit_rdpcm_enabled_flag ) return false; ++ if(lhs.explicit_rdpcm_enabled_flag != rhs.explicit_rdpcm_enabled_flag ) return false; ++ if(lhs.extended_precision_processing_flag != rhs.extended_precision_processing_flag ) return false; ++ if(lhs.intra_smoothing_disabled_flag != rhs.intra_smoothing_disabled_flag ) return false; ++ if(lhs.high_precision_offsets_enabled_flag != rhs.high_precision_offsets_enabled_flag ) return false; ++ if(lhs.persistent_rice_adaptation_enabled_flag != rhs.persistent_rice_adaptation_enabled_flag ) return false; ++ if(lhs.cabac_bypass_alignment_enabled_flag != rhs.cabac_bypass_alignment_enabled_flag ) return false; ++ return true; ++} ++ ++bool operator!=(const sps_range_extension &lhs, const sps_range_extension &rhs) { ++ if(&lhs == &rhs) return false; ++ return !(lhs==rhs); ++} ++ ++ ++bool operator==(const seq_parameter_set &lhs, const seq_parameter_set &rhs) { ++ ++ if(&lhs== &rhs) return true; ++ ++ if(lhs.sps_read != rhs.sps_read) return false; ++ ++ if(lhs.video_parameter_set_id != rhs.video_parameter_set_id) return false; ++ if(lhs.sps_max_sub_layers != rhs.sps_max_sub_layers) return false; ++ if(lhs.sps_temporal_id_nesting_flag != rhs.sps_temporal_id_nesting_flag) return false; ++ ++ if(!isEqual(lhs.profile_tier_level_, rhs.profile_tier_level_, lhs.sps_max_sub_layers)) return false; ++ ++ if(lhs.seq_parameter_set_id != rhs.seq_parameter_set_id) return false; ++ if(lhs.chroma_format_idc != rhs.chroma_format_idc) return false; ++ ++ if(lhs.separate_colour_plane_flag != rhs.separate_colour_plane_flag) return false; ++ if(lhs.pic_width_in_luma_samples != rhs.pic_width_in_luma_samples) return false; ++ if(lhs.pic_height_in_luma_samples != rhs.pic_height_in_luma_samples) return false; ++ if(lhs.conformance_window_flag != rhs.conformance_window_flag) return false; ++ ++ if(lhs.conformance_window_flag) { ++ if(lhs.conf_win_left_offset != rhs.conf_win_left_offset) return false; ++ if(lhs.conf_win_right_offset != rhs.conf_win_right_offset) return false; ++ if(lhs.conf_win_top_offset != rhs.conf_win_top_offset) return false; ++ if(lhs.conf_win_bottom_offset != rhs.conf_win_bottom_offset) return false; ++ } ++ ++ if(lhs.bit_depth_luma != rhs.bit_depth_luma) return false; ++ if(lhs.bit_depth_chroma != rhs.bit_depth_chroma) return false; ++ ++ if(lhs.log2_max_pic_order_cnt_lsb != rhs.log2_max_pic_order_cnt_lsb) return false; ++ if(lhs.sps_sub_layer_ordering_info_present_flag != rhs.sps_sub_layer_ordering_info_present_flag) return false; ++ ++ if(memcmp(lhs.sps_max_dec_pic_buffering, rhs.sps_max_dec_pic_buffering, sizeof(rhs.sps_max_dec_pic_buffering))) return false; ++ if(memcmp(lhs.sps_max_num_reorder_pics, rhs.sps_max_num_reorder_pics, sizeof(rhs.sps_max_num_reorder_pics))) return false; ++ if(memcmp(lhs.sps_max_latency_increase_plus1, rhs.sps_max_latency_increase_plus1, sizeof(rhs.sps_max_latency_increase_plus1))) return false; ++ ++ if(lhs.log2_min_luma_coding_block_size != rhs.log2_min_luma_coding_block_size) return false; ++ if(lhs.log2_diff_max_min_luma_coding_block_size != rhs.log2_diff_max_min_luma_coding_block_size) return false; ++ if(lhs.log2_min_transform_block_size != rhs.log2_min_transform_block_size) return false; ++ if(lhs.log2_diff_max_min_transform_block_size != rhs.log2_diff_max_min_transform_block_size) return false; ++ if(lhs.max_transform_hierarchy_depth_inter != rhs.max_transform_hierarchy_depth_inter) return false; ++ if(lhs.max_transform_hierarchy_depth_intra != rhs.max_transform_hierarchy_depth_intra) return false; ++ ++ if(lhs.scaling_list_enable_flag != rhs.scaling_list_enable_flag) return false; ++ if(lhs.scaling_list_enable_flag) { ++ if(lhs.sps_scaling_list_data_present_flag != rhs.sps_scaling_list_data_present_flag) return false; ++ if(lhs.sps_scaling_list_data_present_flag) { ++ // compare only needed if present, otherwise it is the default scaling list. ++ if(memcmp(&lhs.scaling_list, &rhs.scaling_list, sizeof(rhs.scaling_list))) return false; ++ } ++ } ++ ++ if(lhs.amp_enabled_flag != rhs.amp_enabled_flag) return false; ++ if(lhs.sample_adaptive_offset_enabled_flag != rhs.sample_adaptive_offset_enabled_flag) return false; ++ if(lhs.pcm_enabled_flag != rhs.pcm_enabled_flag) return false; ++ ++ if(lhs.pcm_enabled_flag) { ++ if(lhs.pcm_sample_bit_depth_luma != rhs.pcm_sample_bit_depth_luma) return false; ++ if(lhs.pcm_sample_bit_depth_chroma != rhs.pcm_sample_bit_depth_chroma) return false; ++ if(lhs.log2_min_pcm_luma_coding_block_size != rhs.log2_min_pcm_luma_coding_block_size) return false; ++ if(lhs.log2_diff_max_min_pcm_luma_coding_block_size != rhs.log2_diff_max_min_pcm_luma_coding_block_size) return false; ++ if(lhs.pcm_loop_filter_disable_flag != rhs.pcm_loop_filter_disable_flag) return false; ++ } ++ ++ // (longterm) reference pics likely to change with a new sps, so ignored here. ++ ++ if(lhs.sps_temporal_mvp_enabled_flag != rhs.sps_temporal_mvp_enabled_flag) return false; ++ if(lhs.strong_intra_smoothing_enable_flag != rhs.strong_intra_smoothing_enable_flag) return false; ++ ++ if(lhs.vui_parameters_present_flag != rhs.vui_parameters_present_flag) return false; ++ if(lhs.vui_parameters_present_flag) { ++ if(!isEqual(lhs.vui, rhs.vui, lhs )) return false; ++ } ++ ++ if(lhs.sps_extension_present_flag != rhs.sps_extension_present_flag ) return false; ++ if(lhs.sps_extension_present_flag) { ++ if(lhs.sps_range_extension_flag != rhs.sps_range_extension_flag ) return false; ++ if(lhs.sps_multilayer_extension_flag != rhs.sps_multilayer_extension_flag ) return false; ++ if(lhs.sps_extension_6bits != rhs.sps_extension_6bits ) return false; ++ if(lhs.range_extension != rhs.range_extension) return false; ++ } ++ ++ return true; ++} ++ + de265_error decoder_context::read_sps_NAL(bitreader& reader) + { + logdebug(LogHeaders,"----> read SPS\n"); +@@ -561,6 +818,22 @@ de265_error decoder_context::read_sps_NA + new_sps->dump(param_sps_headers_fd); + } + ++ if ( sps[ new_sps->seq_parameter_set_id ] ) { ++ auto old_sps = sps[ new_sps->seq_parameter_set_id ].get(); ++ if ( *old_sps == *new_sps ) { ++ // printf(" **** keeping sps *****\n"); ++ // the new sps is identical to the old one, so no replacing needed. ++ // however, reference pics and long-term reference pics might need updating. ++ old_sps->ref_pic_sets = new_sps->ref_pic_sets; ++ old_sps->long_term_ref_pics_present_flag = new_sps->long_term_ref_pics_present_flag; ++ memcpy(old_sps->lt_ref_pic_poc_lsb_sps, new_sps->lt_ref_pic_poc_lsb_sps, sizeof(old_sps->lt_ref_pic_poc_lsb_sps)); ++ memcpy(old_sps->used_by_curr_pic_lt_sps_flag, new_sps->used_by_curr_pic_lt_sps_flag, sizeof(old_sps->used_by_curr_pic_lt_sps_flag)); ++ return DE265_OK; ++ } ++ //printf(" **** replacing sps *****\n"); ++ ++ } ++ + sps[ new_sps->seq_parameter_set_id ] = new_sps; + + // Remove the all PPS that referenced the old SPS because parameters may have changed and we do not want to +Index: libde265/libde265/sps.cc +=================================================================== +--- libde265.orig/libde265/sps.cc ++++ libde265/libde265/sps.cc +@@ -287,6 +287,11 @@ de265_error seq_parameter_set::read(erro + int firstLayer = (sps_sub_layer_ordering_info_present_flag ? + 0 : sps_max_sub_layers-1 ); + ++ // zero out so that comparing is easier. ++ memset(sps_max_dec_pic_buffering, 0 , sizeof(sps_max_dec_pic_buffering)); ++ memset(sps_max_num_reorder_pics, 0 , sizeof(sps_max_num_reorder_pics)); ++ memset(sps_max_latency_increase_plus1, 0 , sizeof(sps_max_latency_increase_plus1)); ++ + for (int i=firstLayer ; i <= sps_max_sub_layers-1; i++ ) { + + // sps_max_dec_pic_buffering[i] +@@ -347,6 +352,7 @@ de265_error seq_parameter_set::read(erro + if (sps_scaling_list_data_present_flag) { + + de265_error err; ++ memset(&scaling_list, 0 , sizeof(scaling_list)); // zero out, so that memcmp will do it to check for equality. + if ((err=read_scaling_list(br,this, &scaling_list, false)) != DE265_OK) { + return err; + } diff --git a/debian/patches/reject_reference_pics_from_different_sps.patch b/debian/patches/reject_reference_pics_from_different_sps.patch new file mode 100644 index 0000000..f0beac6 --- /dev/null +++ b/debian/patches/reject_reference_pics_from_different_sps.patch @@ -0,0 +1,54 @@ +Description: Try to mitigate asan failures by rejecting reference pictures not created with the same sps. + The reference images might have different parameters (size, pixel depth, etc) and so different memory allocations, + leading to out of bound memory reads and writes. +Origin: https://github.com/strukturag/libde265/pull/365 +Comment: Analysis of issue https://github.com/strukturag/libde265/issues/345#issuecomment-1346406079 +From 97dd15303085eae2695a511717bf3239e209df96 Mon Sep 17 00:00:00 2001 +From: Tobias Frost +Date: Mon, 12 Dec 2022 14:03:12 +0100 +Subject: [PATCH] Try to mitigate asan failures. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +See #345 for my analysis and details… + +(This PR is just for discussion.) + +(The CVE references are obtained from the Debian security tracker, +which links the issues.) + +This makes the following POCs stop failing: + +- poc3 (#337) +- poc7-1 (#341) CVE-2022-43239 (note: does NOT fix poc7-2) +- poc8-2, poc8-3, poc8-4 (#342) CVE-2022-43244 (note: does NOT fix poc8-1) +- poc11-1, poc11-2 (#345) CVE-2022-43249 +- poc12 (#346) +- poc13 (#347) CVE-2022-43252 +- poc16 (#350) +--- + libde265/motion.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +Index: libde265/libde265/motion.cc +=================================================================== +--- libde265.orig/libde265/motion.cc ++++ libde265/libde265/motion.cc +@@ -361,6 +361,16 @@ void generate_inter_prediction_samples(b + + logtrace(LogMotion, "refIdx: %d -> dpb[%d]\n", vi->refIdx[l], shdr->RefPicList[l][vi->refIdx[l]]); + ++ if (refPic) { ++ auto nonconst_refPic = const_cast(refPic); /* shared_ptr.get() chokes on const.*/ ++ auto refsps = nonconst_refPic->get_shared_sps().get(); ++ auto imgsps = img->get_shared_sps().get(); ++ if(refsps != imgsps) { ++ // rejecting reference image created with different sps. ++ refPic = nullptr; ++ } ++ } ++ + if (!refPic || refPic->PicState == UnusedForReference) { + img->integrity = INTEGRITY_DECODING_ERRORS; + ctx->add_warning(DE265_WARNING_NONEXISTING_REFERENCE_PICTURE_ACCESSED, false); diff --git a/debian/patches/series b/debian/patches/series index 2ee218a..4701a26 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,6 @@ only_export_decoder_api.patch disable_tools.patch +reject_reference_pics_from_different_sps.patch +use_sps_from_the_image.patch +recycle_sps_if_possible.patch +fix-private-libs-pc.patch diff --git a/debian/patches/use_sps_from_the_image.patch b/debian/patches/use_sps_from_the_image.patch new file mode 100644 index 0000000..63bd704 --- /dev/null +++ b/debian/patches/use_sps_from_the_image.patch @@ -0,0 +1,62 @@ +Description: Use sps of the image, not the sps of the pic parameter set (pps) + When decoding a slice, all decoding functions are using the sps of the target + image to determine the image properties, which are in the seqquence parameter + set) -- execpt generate_inter_prediction_samples(), which uses the sps from the + pps, which might have different properties and trick the decode to out-of-bound + memory accesses, leading to crashes. +Origin: https://github.com/strukturag/libde265/pull/366 +From 36391cda3d4e4fb3269a2ce310e6e0f634729f0b Mon Sep 17 00:00:00 2001 +From: Tobias Frost +Date: Mon, 12 Dec 2022 14:33:40 +0100 +Subject: [PATCH] Use the sps from the image + +(as e.g mc_chroma is using the sps to determine +picture properties, like pic_width_in_luma_samples +and pic_height_in_luma_samples, I *think* this is +more correct. + +This PR is for discussion. (See #345.) +It makes the failures go away, but that does not mean it's correct :) + +The following poc will be stop failing if (only) this +patch is applied: + + - poc2 #336 - CVE-2022-43238 + - poc4 #338 - CVE-2022-43241 + - poc6-1, poc6-2 #340 - CVE-2022-43242 + - poc7-1, poc7-2 #341 - CVE-2022-43239 + - poc8-1 #342 - CVE-2022-43244 + - poc9-3 #343 - CVE-2022-43236 + - poc10-2, poc10-3 #344 - CVE-2022-43237 + - poc16 #350 + - poc19 #353 + +The following are still failing if only this patch is +applied, but they stop failing if #365 is applied as well, but will +still fail with ONLY #365 applied (IOW, both are needed) + + - poc1 #335 - CVE-2022-43240 + - poc3 #337 - CVE-2022-43235 + - poc5 #339 - CVE-2022-43423 + - poc9-1,poc9-2, poc9-4 #343 - CVE-2022-43236 + - poc14 #348 - CVE-2022-43253 + - poc15 #349 - CVE-2022-43248 + - poc17-1, poc17-2 #351 + - poc18 #352 - CVE-2022-43245 +--- + libde265/motion.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libde265/libde265/motion.cc +=================================================================== +--- libde265.orig/libde265/motion.cc ++++ libde265/libde265/motion.cc +@@ -290,7 +290,7 @@ void generate_inter_prediction_samples(b + int stride[3]; + + const pic_parameter_set* pps = shdr->pps.get(); +- const seq_parameter_set* sps = pps->sps.get(); ++ const seq_parameter_set* sps = img->get_shared_sps().get(); + + if (sps->BitDepth_Y != img->get_bit_depth(0) || + sps->BitDepth_C != img->get_bit_depth(1)) { diff --git a/debian/rules b/debian/rules index 56a92e7..a87ebe9 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ + +override_dh_auto_test: + ./debian/tests/test-decode + dh_auto_test + override_dh_auto_install: dh_auto_install cd $(CURDIR)/debian/tmp/usr/bin/ && mv dec265 libde265-dec265 diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 0000000..47c3d4b --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1 @@ +debian/tests/tree.h265 diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..63d807f --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,3 @@ +Tests: test-decode +Depends: @ +Restrictions: \ No newline at end of file diff --git a/debian/tests/test-decode b/debian/tests/test-decode new file mode 100755 index 0000000..99726c0 --- /dev/null +++ b/debian/tests/test-decode @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +DECODE=/usr/bin/libde265-dec265 +if [ ! -f /usr/bin/libde265-dec265 ]; then + DECODE=./dec265/dec265 +fi + +if [ ! -f $DECODE ]; then + echo Decode utility not found + exit 1 +fi + +output=`mktemp` + +$DECODE -q -c -t 2 ./debian/tests/tree.h265 > $output 2>&1 + +if ! grep -L "nFrames decoded: 31" $output; then + echo Decoding failed + cat $output + exit 255 +fi diff --git a/debian/tests/tree.h265 b/debian/tests/tree.h265 new file mode 100644 index 0000000000000000000000000000000000000000..79e5e34ac2603e2fe6392e879c712e17c572f440 GIT binary patch literal 122475 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ðqq!28UsTNHCwX^r3u@PmX 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%0AWC$zxC@`QF+0l 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%0DBu=*Ddu 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 d9x$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -524,20 +523,6 @@ dec265-sdl.obj: sdl.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dec265_CXXFLAGS) $(CXXFLAGS) -c -o dec265-sdl.obj `if test -f 'sdl.cc'; then $(CYGPATH_W) 'sdl.cc'; else $(CYGPATH_W) '$(srcdir)/sdl.cc'; fi` -hdrcopy-hdrcopy.o: hdrcopy.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hdrcopy_CXXFLAGS) $(CXXFLAGS) -MT hdrcopy-hdrcopy.o -MD -MP -MF $(DEPDIR)/hdrcopy-hdrcopy.Tpo -c -o hdrcopy-hdrcopy.o `test -f 'hdrcopy.cc' || echo '$(srcdir)/'`hdrcopy.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hdrcopy-hdrcopy.Tpo $(DEPDIR)/hdrcopy-hdrcopy.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hdrcopy.cc' object='hdrcopy-hdrcopy.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hdrcopy_CXXFLAGS) $(CXXFLAGS) -c -o hdrcopy-hdrcopy.o `test -f 'hdrcopy.cc' || echo '$(srcdir)/'`hdrcopy.cc - -hdrcopy-hdrcopy.obj: hdrcopy.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hdrcopy_CXXFLAGS) $(CXXFLAGS) -MT hdrcopy-hdrcopy.obj -MD -MP -MF $(DEPDIR)/hdrcopy-hdrcopy.Tpo -c -o hdrcopy-hdrcopy.obj `if test -f 'hdrcopy.cc'; then $(CYGPATH_W) 'hdrcopy.cc'; else $(CYGPATH_W) '$(srcdir)/hdrcopy.cc'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hdrcopy-hdrcopy.Tpo $(DEPDIR)/hdrcopy-hdrcopy.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='hdrcopy.cc' object='hdrcopy-hdrcopy.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hdrcopy_CXXFLAGS) $(CXXFLAGS) -c -o hdrcopy-hdrcopy.obj `if test -f 'hdrcopy.cc'; then $(CYGPATH_W) 'hdrcopy.cc'; else $(CYGPATH_W) '$(srcdir)/hdrcopy.cc'; fi` - mostlyclean-libtool: -rm -f *.lo @@ -595,8 +580,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -668,7 +655,8 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/dec265-dec265.Po + -rm -f ./$(DEPDIR)/dec265-sdl.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -714,7 +702,8 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/dec265-dec265.Po + -rm -f ./$(DEPDIR)/dec265-sdl.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -735,7 +724,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/dec265/dec265.cc b/dec265/dec265.cc index 9309465..79f67cd 100644 --- a/dec265/dec265.cc +++ b/dec265/dec265.cc @@ -55,10 +55,15 @@ using namespace videogfx; #include "sdl.hh" #endif +#ifndef PRIu32 +#define PRIu32 "u" +#endif #define BUFFER_SIZE 40960 #define NUM_THREADS 4 +const uint32_t kSecurityLimit_MaxNALSize = 100 * 1024 * 1024; // 100 MB + int nThreads=0; bool nal_input=false; int quiet=0; @@ -594,7 +599,7 @@ int main(int argc, char** argv) if (optind != argc-1 || show_help) { fprintf(stderr," dec265 v%s\n", de265_get_version()); - fprintf(stderr,"--------------\n"); + fprintf(stderr,"-----------------\n"); fprintf(stderr,"usage: dec265 [options] videofile.bin\n"); fprintf(stderr,"The video file must be a raw bitstream, or a stream with NAL units (option -n).\n"); fprintf(stderr,"\n"); @@ -666,6 +671,10 @@ int main(int argc, char** argv) if (measure_quality) { reference_file = fopen(reference_filename, "rb"); + if (reference_file == nullptr) { + fprintf(stderr, "Error: cannot create measurement output file '%s'\n", reference_filename); + exit(5); + } } @@ -703,20 +712,31 @@ int main(int argc, char** argv) if (nal_input) { uint8_t len[4]; int n = fread(len,1,4,fh); - int length = (len[0]<<24) + (len[1]<<16) + (len[2]<<8) + len[3]; - - uint8_t* buf = (uint8_t*)malloc(length); - n = fread(buf,1,length,fh); - err = de265_push_NAL(ctx, buf,n, pos, (void*)1); - - if (write_bytestream) { - uint8_t sc[3] = { 0,0,1 }; - fwrite(sc ,1,3,bytestream_fh); - fwrite(buf,1,n,bytestream_fh); - } - - free(buf); - pos+=n; + uint32_t length = (len[0]<<24) + (len[1]<<16) + (len[2]<<8) + len[3]; + + if (length > kSecurityLimit_MaxNALSize) { + fprintf(stderr, "NAL packet with size %" PRIu32 " exceeds security limit %" PRIu32 ", skipping this NAL.\n", + length, + kSecurityLimit_MaxNALSize); + + fseek(fh, length, SEEK_CUR); + + pos += length; + } + else { + uint8_t* buf = (uint8_t*)malloc(length); + n = fread(buf,1,length,fh); + err = de265_push_NAL(ctx, buf,n, pos, (void*)1); + + if (write_bytestream) { + uint8_t sc[3] = { 0,0,1 }; + fwrite(sc ,1,3,bytestream_fh); + fwrite(buf,1,n,bytestream_fh); + } + + free(buf); + pos+=n; + } } else { // read a chunk of input data diff --git a/dec265/hdrcopy.cc b/dec265/hdrcopy.cc deleted file mode 100644 index eb25f5f..0000000 --- a/dec265/hdrcopy.cc +++ /dev/null @@ -1,124 +0,0 @@ -/* - libde265 example application. - - MIT License - - Copyright (c) 2013-2014 struktur AG, Dirk Farin - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - - -#include "libde265/nal-parser.h" -#include "libde265/decctx.h" -#include - -error_queue errqueue; - -video_parameter_set vps; -seq_parameter_set sps; -pic_parameter_set pps; - -CABAC_encoder_bitstream writer; - - -void process_nal(NAL_unit* nal) -{ - de265_error err = DE265_OK; - - bitreader reader; - bitreader_init(&reader, nal->data(), nal->size()); - - nal_header nal_hdr; - nal_hdr.read(&reader); - writer.write_startcode(); - nal_hdr.write(writer); - - printf("NAL: 0x%x 0x%x - unit type:%s temporal id:%d\n", - nal->data()[0], nal->data()[1], - get_NAL_name(nal_hdr.nal_unit_type), - nal_hdr.nuh_temporal_id); - - - if (nal_hdr.nal_unit_type<32) { - //err = read_slice_NAL(reader, nal, nal_hdr); - } - else switch (nal_hdr.nal_unit_type) { - case NAL_UNIT_VPS_NUT: - vps.read(&errqueue, &reader); - vps.dump(1); - vps.write(&errqueue, writer); - writer.flush_VLC(); - break; - - case NAL_UNIT_SPS_NUT: - sps.read(&errqueue, &reader); - sps.dump(1); - sps.write(&errqueue, writer); - writer.flush_VLC(); - break; - - case NAL_UNIT_PPS_NUT: - //err = read_pps_NAL(reader); - break; - - case NAL_UNIT_PREFIX_SEI_NUT: - case NAL_UNIT_SUFFIX_SEI_NUT: - //err = read_sei_NAL(reader, nal_hdr.nal_unit_type==NAL_UNIT_SUFFIX_SEI_NUT); - break; - - case NAL_UNIT_EOS_NUT: - //ctx->FirstAfterEndOfSequenceNAL = true; - break; - } -} - - -int main(int argc, char** argv) -{ - NAL_Parser nal_parser; - - FILE* fh = fopen(argv[1],"rb"); - unsigned char buf[1024]; - - writer.write_bits(0,8); // because HM has an extra byte at the beginning - - while(!feof(fh)) - { - int n = fread(buf,1,1024,fh); - if (n>0) { - nal_parser.push_data(buf,n, 0); - } - - if (nal_parser.get_NAL_queue_length()>0) { - NAL_unit* nal = nal_parser.pop_from_NAL_queue(); - assert(nal); - process_nal(nal); - nal_parser.free_NAL_unit(nal); - } - } - - fclose(fh); - - fh = fopen("out.bin","wb"); - fwrite(writer.data(), 1,writer.size(), fh); - fclose(fh); - - return 0; -} diff --git a/dec265/sdl.cc b/dec265/sdl.cc index a7afa1c..eab1f8f 100644 --- a/dec265/sdl.cc +++ b/dec265/sdl.cc @@ -37,51 +37,49 @@ bool SDL_YUV_Display::init(int frame_width, int frame_height, enum SDL_Chroma ch mChroma = chroma; - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0 ) { + if (SDL_Init(SDL_INIT_VIDEO) < 0 ) { printf("SDL_Init() failed: %s\n", SDL_GetError( ) ); SDL_Quit(); return false; } - const SDL_VideoInfo* info = SDL_GetVideoInfo(); - if( !info ) { - printf("SDL_GetVideoInfo() failed: %s\n", SDL_GetError() ); + // set window title + const char *window_title = "SDL YUV display"; + mWindow = SDL_CreateWindow(window_title, + SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, + frame_width, frame_height, 0); + if (!mWindow) { + printf("SDL: Couldn't set video mode to %dx%d: %s\n", + frame_width, frame_height, SDL_GetError()); SDL_Quit(); return false; } - Uint8 bpp = info->vfmt->BitsPerPixel; - - Uint32 vflags; - if (info->hw_available) - vflags = SDL_HWSURFACE; - else - vflags = SDL_SWSURFACE; - - // set window title - const char *window_title = "SDL YUV display"; - SDL_WM_SetCaption(window_title, NULL); - - mScreen = SDL_SetVideoMode(frame_width, frame_height, bpp, vflags); - if (mScreen == NULL) { - printf("SDL: Couldn't set video mode to %dx%d,%d bpp: %s", - frame_width, frame_height, bpp, SDL_GetError()); + Uint32 flags = 0; // Empty flags prioritize SDL_RENDERER_ACCELERATED. + mRenderer = SDL_CreateRenderer(mWindow, -1, flags); + if (!mRenderer) { + printf("SDL: Couldn't create renderer: %s\n", SDL_GetError()); SDL_Quit(); return false; } - uint32_t pixelFormat; + Uint32 pixelFormat = 0; switch (mChroma) { - case SDL_CHROMA_MONO: pixelFormat = SDL_YV12_OVERLAY; break; - case SDL_CHROMA_420: pixelFormat = SDL_YV12_OVERLAY; break; - case SDL_CHROMA_422: pixelFormat = SDL_YUY2_OVERLAY; break; - case SDL_CHROMA_444: pixelFormat = SDL_YV12_OVERLAY; break; - //case SDL_CHROMA_444: pixelFormat = SDL_YUY2_OVERLAY; break; + case SDL_CHROMA_MONO: pixelFormat = SDL_PIXELFORMAT_YV12; break; + case SDL_CHROMA_420: pixelFormat = SDL_PIXELFORMAT_YV12; break; + case SDL_CHROMA_422: pixelFormat = SDL_PIXELFORMAT_YV12; break; + case SDL_CHROMA_444: pixelFormat = SDL_PIXELFORMAT_YV12; break; + //case SDL_CHROMA_444: pixelFormat = SDL_PIXELFORMAT_YV12; break; + default: + printf("Unsupported chroma: %d\n", mChroma); + SDL_Quit(); + return false; } - mYUVOverlay = SDL_CreateYUVOverlay(frame_width, frame_height, pixelFormat, mScreen); - if (mYUVOverlay == NULL ) { - printf("SDL: Couldn't create SDL YUV overlay: %s",SDL_GetError()); + mTexture = SDL_CreateTexture(mRenderer, pixelFormat, + SDL_TEXTUREACCESS_STREAMING, frame_width, frame_height); + if (!mTexture ) { + printf("SDL: Couldn't create SDL texture: %s\n", SDL_GetError()); SDL_Quit(); return false; } @@ -102,7 +100,8 @@ void SDL_YUV_Display::display(const unsigned char *Y, int stride, int chroma_stride) { if (!mWindowOpen) return; - if (SDL_LockYUVOverlay(mYUVOverlay) < 0) return; + if (SDL_LockTexture(mTexture, nullptr, + reinterpret_cast(&mPixels), &mStride) < 0) return; if (mChroma == SDL_CHROMA_420) { display420(Y,U,V,stride,chroma_stride); @@ -118,9 +117,10 @@ void SDL_YUV_Display::display(const unsigned char *Y, display400(Y,stride); } - SDL_UnlockYUVOverlay(mYUVOverlay); + SDL_UnlockTexture(mTexture); - SDL_DisplayYUVOverlay(mYUVOverlay, &rect); + SDL_RenderCopy(mRenderer, mTexture, nullptr, nullptr); + SDL_RenderPresent(mRenderer); } @@ -129,26 +129,31 @@ void SDL_YUV_Display::display420(const unsigned char *Y, const unsigned char *V, int stride, int chroma_stride) { - if (stride == rect.w && chroma_stride == rect.w/2) { + if (stride == mStride && chroma_stride == mStride/2) { // fast copy - memcpy(mYUVOverlay->pixels[0], Y, rect.w * rect.h); - memcpy(mYUVOverlay->pixels[1], V, rect.w * rect.h / 4); - memcpy(mYUVOverlay->pixels[2], U, rect.w * rect.h / 4); + memcpy(mPixels, Y, rect.w * rect.h); + memcpy(&mPixels[rect.w * rect.h], V, rect.w * rect.h / 4); + memcpy(&mPixels[(rect.w * rect.h) + (rect.w * rect.h / 4)], U, rect.w * rect.h / 4); } else { // copy line by line, because sizes are different + uint8_t *dest = mPixels; + + for (int y=0;ypixels[0]+y*rect.w, Y+stride*y, rect.w); + memcpy(dest, V+chroma_stride*y, rect.w/2); } - for (int y=0;ypixels[2]+y*rect.w/2, U+chroma_stride*y, rect.w/2); - memcpy(mYUVOverlay->pixels[1]+y*rect.w/2, V+chroma_stride*y, rect.w/2); + memcpy(dest, U+chroma_stride*y, rect.w/2); } } } @@ -156,48 +161,51 @@ void SDL_YUV_Display::display420(const unsigned char *Y, void SDL_YUV_Display::display400(const unsigned char *Y, int stride) { - if (stride == rect.w) { + uint8_t *dest = mPixels; + if (stride == mStride) { // fast copy - memcpy(mYUVOverlay->pixels[0], Y, rect.w * rect.h); + memcpy(mPixels, Y, rect.w * rect.h); + dest += mStride * rect.h; } else { // copy line by line, because sizes are different - for (int y=0;ypixels[0]+y*rect.w, Y+stride*y, rect.w); + memcpy(dest, Y+stride*y, rect.w); } } // clear chroma planes - memset(mYUVOverlay->pixels[1], 0x80, rect.w * rect.h / 4); - memset(mYUVOverlay->pixels[2], 0x80, rect.w * rect.h / 4); + memset(dest, 0x80, mStride * rect.h / 2); } -void SDL_YUV_Display::display422(const unsigned char *Y, - const unsigned char *U, - const unsigned char *V, +void SDL_YUV_Display::display422(const unsigned char* Y, + const unsigned char* U, + const unsigned char* V, int stride, int chroma_stride) { - for (int y=0;ypixels[0] + y*rect.w *2; + for (int y = 0; y < rect.h; y++) { + unsigned char* dstY = mPixels + y * mStride; + const unsigned char* Yp = Y + y * stride; - const unsigned char* Yp = Y + y*stride; - const unsigned char* Up = U + y*chroma_stride; - const unsigned char* Vp = V + y*chroma_stride; + memcpy(dstY, Yp, rect.w); + } - for (int x=0;xpixels[0] + y*rect.w *2; + unsigned char* p = mPixels + y*mStride *2; const unsigned char* Yp = Y + y*stride; const unsigned char* Up = U + y*chroma_stride; @@ -234,14 +242,16 @@ void SDL_YUV_Display::display444as420(const unsigned char *Y, { for (int y=0;ypixels[0] + y*rect.w; + unsigned char* p = mPixels + y*mStride; memcpy(p, Y+y*stride, rect.w); } + uint8_t *startV = mPixels + (rect.h*mStride); + uint8_t *startU = startV + (rect.h*mStride/2); for (int y=0;ypixels[2] + y/2*rect.w/2; - unsigned char* v = mYUVOverlay->pixels[1] + y/2*rect.w/2; + unsigned char* u = startU + y/2*mStride/2; + unsigned char* v = startV + y/2*mStride/2; for (int x=0;x. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/enc265/CMakeLists.txt b/enc265/CMakeLists.txt index cfa7033..2b489cc 100644 --- a/enc265/CMakeLists.txt +++ b/enc265/CMakeLists.txt @@ -10,6 +10,6 @@ if(MSVC) ) endif() -target_link_libraries (enc265 PRIVATE ${PROJECT_NAME}) +target_link_libraries (enc265 PRIVATE de265) install (TARGETS enc265 DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/enc265/Makefile.in b/enc265/Makefile.in index a6a4eae..807f00a 100644 --- a/enc265/Makefile.in +++ b/enc265/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -134,7 +134,9 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/enc265-enc265.Po \ + ./$(DEPDIR)/enc265-image-io-png.Po am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -196,8 +198,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp COPYING DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -215,8 +215,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -231,6 +232,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -378,8 +380,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -450,8 +452,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc265-enc265.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc265-image-io-png.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc265-enc265.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc265-image-io-png.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -559,8 +567,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -632,7 +642,8 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/enc265-enc265.Po + -rm -f ./$(DEPDIR)/enc265-image-io-png.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -678,7 +689,8 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/enc265-enc265.Po + -rm -f ./$(DEPDIR)/enc265-image-io-png.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -699,7 +711,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/extra/stdbool.h b/extra/stdbool.h deleted file mode 100644 index 06a765d..0000000 --- a/extra/stdbool.h +++ /dev/null @@ -1,64 +0,0 @@ -/* Copyright (C) 1998-2013 Free Software Foundation, Inc. - -This file is part of GCC, modify by Min Chen. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -Under Section 7 of GPL version 3, you are granted additional -permissions described in the GCC Runtime Library Exception, version -3.1, as published by the Free Software Foundation. - -You should have received a copy of the GNU General Public License and -a copy of the GCC Runtime Library Exception along with this program; -see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -. */ - -/* - * ISO C Standard: 7.16 Boolean type and values - */ - -#ifndef _STDBOOL_H -#define _STDBOOL_H - -#ifndef __cplusplus - -#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L -#define bool _Bool -#define true 1 -#define false 0 - -#else /* not C99 */ - -typedef enum { - false = 0, - true = 1 -} bool; - -#endif /* not C99 */ - -#else /* __cplusplus */ - -#if !defined(_MSC_VER) - -/* Supporting in C++ is a GCC extension. */ -#define _Bool bool -#define bool bool -#define false false -#define true true - -#endif /* _MSC_VER */ - -#endif /* __cplusplus */ - -/* Signal that all the definitions are present. */ -#define __bool_true_false_are_defined 1 - -#endif /* stdbool.h */ diff --git a/extra/stdint.h b/extra/stdint.h deleted file mode 100644 index 9459662..0000000 --- a/extra/stdint.h +++ /dev/null @@ -1,203 +0,0 @@ -/* ISO C9x 7.18 Integer types - * Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794) - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * Contributor: Danny Smith - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Date: 2000-12-02 - */ - - -#ifndef _STDINT_H -#define _STDINT_H -#define __need_wint_t -#define __need_wchar_t -#include - -/* 7.18.1.1 Exact-width integer types */ -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef short int16_t; -typedef unsigned short uint16_t; -typedef int int32_t; -typedef unsigned uint32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; - -/* 7.18.1.2 Minimum-width integer types */ -typedef signed char int_least8_t; -typedef unsigned char uint_least8_t; -typedef short int_least16_t; -typedef unsigned short uint_least16_t; -typedef int int_least32_t; -typedef unsigned uint_least32_t; -typedef __int64 int_least64_t; -typedef unsigned __int64 uint_least64_t; - -/* 7.18.1.3 Fastest minimum-width integer types - * Not actually guaranteed to be fastest for all purposes - * Here we use the exact-width types for 8 and 16-bit ints. - */ -typedef char int_fast8_t; -typedef unsigned char uint_fast8_t; -typedef short int_fast16_t; -typedef unsigned short uint_fast16_t; -typedef int int_fast32_t; -typedef unsigned int uint_fast32_t; -typedef __int64 int_fast64_t; -typedef unsigned __int64 uint_fast64_t; - -/* 7.18.1.4 Integer types capable of holding object pointers */ -/*typedef int intptr_t; -typedef unsigned uintptr_t;*/ - -/* 7.18.1.5 Greatest-width integer types */ -typedef __int64 intmax_t; -typedef unsigned __int64 uintmax_t; - -/* 7.18.2 Limits of specified-width integer types */ -#if !defined ( __cplusplus) || defined (__STDC_LIMIT_MACROS) - -/* 7.18.2.1 Limits of exact-width integer types */ -#define INT8_MIN (-128) -#define INT16_MIN (-32768) -#define INT32_MIN (-2147483647 - 1) -#define INT64_MIN (-9223372036854775807LL - 1) - -#define INT8_MAX 127 -#define INT16_MAX 32767 -#define INT32_MAX 2147483647 -#define INT64_MAX 9223372036854775807LL - -#define UINT8_MAX 0xff /* 255U */ -#define UINT16_MAX 0xffff /* 65535U */ -#define UINT32_MAX 0xffffffff /* 4294967295U */ -#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */ - -/* 7.18.2.2 Limits of minimum-width integer types */ -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST64_MIN INT64_MIN - -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MAX INT64_MAX - -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -/* 7.18.2.3 Limits of fastest minimum-width integer types */ -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST64_MIN INT64_MIN - -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MAX INT64_MAX - -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -/* 7.18.2.4 Limits of integer types capable of holding - object pointers */ -#if defined(_WIN64) || defined(__LP64__) -#define INTPTR_MIN INT64_MIN -#define INTPTR_MAX INT64_MAX -#define UINTPTR_MAX UINT64_MAX -#else -#define INTPTR_MIN INT32_MIN -#define INTPTR_MAX INT32_MAX -#define UINTPTR_MAX UINT32_MAX -#endif - -/* 7.18.2.5 Limits of greatest-width integer types */ -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -/* 7.18.3 Limits of other integer types */ -#if defined(_WIN64) || defined(__LP64__) -#define PTRDIFF_MIN INT64_MIN -#define PTRDIFF_MAX INT64_MAX -#else -#define PTRDIFF_MIN INT32_MIN -#define PTRDIFF_MAX INT32_MAX -#endif - -#define SIG_ATOMIC_MIN INT32_MIN -#define SIG_ATOMIC_MAX INT32_MAX - -#ifndef SIZE_MAX -#if defined(_WIN64) || defined(__LP64__) -#define SIZE_MAX UINT64_MAX -#else -#define SIZE_MAX UINT32_MAX -#endif -#endif - -#ifndef WCHAR_MIN /* also in wchar.h */ -#define WCHAR_MIN 0 -#define WCHAR_MAX ((wchar_t)-1) /* UINT16_MAX */ -#endif - -/* - * wint_t is unsigned short for compatibility with MS runtime - */ -#define WINT_MIN 0 -#define WINT_MAX ((wint_t)-1) /* UINT16_MAX */ - -#endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */ - - -/* 7.18.4 Macros for integer constants */ -#if !defined ( __cplusplus) || defined (__STDC_CONSTANT_MACROS) - -/* 7.18.4.1 Macros for minimum-width integer constants - - Accoding to Douglas Gwyn : - "This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC - 9899:1999 as initially published, the expansion was required - to be an integer constant of precisely matching type, which - is impossible to accomplish for the shorter types on most - platforms, because C99 provides no standard way to designate - an integer constant with width less than that of type int. - TC1 changed this to require just an integer constant - *expression* with *promoted* type." - - The trick used here is from Clive D W Feather. -*/ - -#define INT8_C(val) (INT_LEAST8_MAX-INT_LEAST8_MAX+(val)) -#define INT16_C(val) (INT_LEAST16_MAX-INT_LEAST16_MAX+(val)) -#define INT32_C(val) (INT_LEAST32_MAX-INT_LEAST32_MAX+(val)) -#define INT64_C(val) (INT_LEAST64_MAX-INT_LEAST64_MAX+(val)) - -#define UINT8_C(val) (UINT_LEAST8_MAX-UINT_LEAST8_MAX+(val)) -#define UINT16_C(val) (UINT_LEAST16_MAX-UINT_LEAST16_MAX+(val)) -#define UINT32_C(val) (UINT_LEAST32_MAX-UINT_LEAST32_MAX+(val)) -#define UINT64_C(val) (UINT_LEAST64_MAX-UINT_LEAST64_MAX+(val)) - -/* 7.18.4.2 Macros for greatest-width integer constants */ -#define INTMAX_C(val) (INTMAX_MAX-INTMAX_MAX+(val)) -#define UINTMAX_C(val) (UINTMAX_MAX-UINTMAX_MAX+(val)) - -#endif /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */ - -#endif diff --git a/install-sh b/install-sh index 59990a1..8175c64 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2014-09-12.12; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ do fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,14 +332,16 @@ do # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) - # $RANDOM is not portable (e.g. dash); use it when possible to - # lower collision chance + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - # As "mkdir -p" follows symlinks and we work in /tmp possibly; so - # create the $tmpdir first (and fail if unsuccessful) to make sure - # that nobody tries to guess the $tmpdir name. + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && $mkdirprog $mkdir_mode "$tmpdir" && exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 @@ -434,8 +444,8 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -500,9 +510,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/libde265.pc.in b/libde265.pc.in index 1a30a05..027062d 100644 --- a/libde265.pc.in +++ b/libde265.pc.in @@ -7,7 +7,7 @@ Name: libde265 Description: H.265/HEVC video decoder. URL: https://github.com/strukturag/libde265 Version: @VERSION@ -Requires: -Libs: -lde265 -L@libdir@ -Libs.private: @LIBS@ -lstdc++ -Cflags: -I@includedir@ +Requires: +Libs: -lde265 -L${libdir} +Libs.private: @LIBS_PRIVATE@ +Cflags: -I${includedir} diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt index 749c7fb..79fc81f 100644 --- a/libde265/CMakeLists.txt +++ b/libde265/CMakeLists.txt @@ -76,6 +76,12 @@ set (libde265_headers vui.h ) +set (libde265_public_headers + de265.h + en265.h + ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h +) + if(MSVC OR MINGW) set (libde265_sources ${libde265_sources} @@ -88,7 +94,15 @@ add_definitions(-DLIBDE265_EXPORTS) add_subdirectory (encoder) -if(NOT DISABLE_SSE) +check_c_source_compiles( + "#if !defined(__x86_64) && !defined(__i386__) \ + && !defined(_M_IX86) && !defined(_M_AMD64) + #error not x86 + #endif + int main(){return 0;}" + HAVE_X86) + +if(HAVE_X86) if (MSVC) set(SUPPORTS_SSE2 1) set(SUPPORTS_SSSE3 1) @@ -107,21 +121,44 @@ if(NOT DISABLE_SSE) endif() endif() -add_library(${PROJECT_NAME} ${libde265_sources} ${ENCODER_OBJECTS} ${X86_OBJECTS}) -target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads) +add_library(de265 ${libde265_sources} ${ENCODER_OBJECTS} ${X86_OBJECTS}) +target_link_libraries(de265 PRIVATE Threads::Threads) +target_include_directories(de265 PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + +write_basic_package_version_file(libde265ConfigVersion.cmake COMPATIBILITY ExactVersion) -write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake COMPATIBILITY ExactVersion) +if (WIN32) + set_target_properties(de265 PROPERTIES PREFIX "lib") +endif() -install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config +install(TARGETS de265 EXPORT libde265Config RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -install(FILES ${libde265_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/de265-version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) +install(FILES ${libde265_public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libde265) +install(EXPORT libde265Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libde265") + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libde265ConfigVersion.cmake DESTINATION + "${CMAKE_INSTALL_LIBDIR}/cmake/libde265") + -install(EXPORT ${PROJECT_NAME}Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +# --- pkg-config + +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix "\${prefix}") +if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") + set(libdir "${CMAKE_INSTALL_LIBDIR}") +else() + set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") +endif() +if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") + set(includedir "${CMAKE_INSTALL_INCLUDEDIR}") +else() + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +endif() -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake DESTINATION - "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +set(VERSION ${PROJECT_VERSION}) # so that the replacement in libde265.pc will work with both autotools and CMake +configure_file(../libde265.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/libde265/Makefile.am b/libde265/Makefile.am index 305f934..e81b064 100644 --- a/libde265/Makefile.am +++ b/libde265/Makefile.am @@ -114,9 +114,7 @@ if MINGW endif EXTRA_DIST = Makefile.vc7 \ - CMakeLists.txt \ - ../extra/stdbool.h \ - ../extra/stdint.h + CMakeLists.txt libde265_la_HEADERS = \ de265.h \ diff --git a/libde265/Makefile.in b/libde265/Makefile.in index 4018e0b..ebe8c2f 100644 --- a/libde265/Makefile.in +++ b/libde265/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -203,7 +203,42 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ../extra/$(DEPDIR)/libde265_la-win32cond.Plo \ + ./$(DEPDIR)/libde265_la-alloc_pool.Plo \ + ./$(DEPDIR)/libde265_la-bitstream.Plo \ + ./$(DEPDIR)/libde265_la-cabac.Plo \ + ./$(DEPDIR)/libde265_la-configparam.Plo \ + ./$(DEPDIR)/libde265_la-contextmodel.Plo \ + ./$(DEPDIR)/libde265_la-de265.Plo \ + ./$(DEPDIR)/libde265_la-deblock.Plo \ + ./$(DEPDIR)/libde265_la-decctx.Plo \ + ./$(DEPDIR)/libde265_la-dpb.Plo \ + ./$(DEPDIR)/libde265_la-en265.Plo \ + ./$(DEPDIR)/libde265_la-fallback-dct.Plo \ + ./$(DEPDIR)/libde265_la-fallback-motion.Plo \ + ./$(DEPDIR)/libde265_la-fallback.Plo \ + ./$(DEPDIR)/libde265_la-image-io.Plo \ + ./$(DEPDIR)/libde265_la-image.Plo \ + ./$(DEPDIR)/libde265_la-intrapred.Plo \ + ./$(DEPDIR)/libde265_la-md5.Plo \ + ./$(DEPDIR)/libde265_la-motion.Plo \ + ./$(DEPDIR)/libde265_la-nal-parser.Plo \ + ./$(DEPDIR)/libde265_la-nal.Plo \ + ./$(DEPDIR)/libde265_la-pps.Plo \ + ./$(DEPDIR)/libde265_la-quality.Plo \ + ./$(DEPDIR)/libde265_la-refpic.Plo \ + ./$(DEPDIR)/libde265_la-sao.Plo \ + ./$(DEPDIR)/libde265_la-scan.Plo \ + ./$(DEPDIR)/libde265_la-sei.Plo \ + ./$(DEPDIR)/libde265_la-slice.Plo \ + ./$(DEPDIR)/libde265_la-sps.Plo \ + ./$(DEPDIR)/libde265_la-threads.Plo \ + ./$(DEPDIR)/libde265_la-transform.Plo \ + ./$(DEPDIR)/libde265_la-util.Plo \ + ./$(DEPDIR)/libde265_la-visualize.Plo \ + ./$(DEPDIR)/libde265_la-vps.Plo \ + ./$(DEPDIR)/libde265_la-vui.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -264,7 +299,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -282,8 +317,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = encoder x86 arm am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/de265-version.h.in \ $(top_srcdir)/depcomp COPYING @@ -328,8 +361,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -344,6 +378,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -489,9 +524,7 @@ libde265_la_SOURCES = acceleration.h alloc_pool.h alloc_pool.cc \ SUBDIRS = $(am__append_4) $(am__append_6) $(am__append_8) libde265_la_LIBADD = $(am__append_5) $(am__append_7) $(am__append_9) EXTRA_DIST = Makefile.vc7 \ - CMakeLists.txt \ - ../extra/stdbool.h \ - ../extra/stdint.h + CMakeLists.txt libde265_la_HEADERS = \ de265.h \ @@ -518,8 +551,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -587,41 +620,47 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@../extra/$(DEPDIR)/libde265_la-win32cond.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-alloc_pool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-bitstream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-cabac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-configparam.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-contextmodel.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-de265.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-deblock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-decctx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-dpb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-en265.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-fallback-dct.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-fallback-motion.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-fallback.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-image-io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-image.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-intrapred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-md5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-motion.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-nal-parser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-nal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-pps.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-quality.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-refpic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-sao.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-scan.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-sei.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-slice.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-sps.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-threads.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-transform.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-visualize.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-vps.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-vui.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../extra/$(DEPDIR)/libde265_la-win32cond.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-alloc_pool.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-bitstream.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-cabac.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-configparam.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-contextmodel.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-de265.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-deblock.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-decctx.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-dpb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-en265.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-fallback-dct.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-fallback-motion.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-fallback.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-image-io.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-image.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-intrapred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-md5.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-motion.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-nal-parser.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-nal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-pps.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-quality.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-refpic.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-sao.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-scan.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-sei.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-slice.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-sps.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-threads.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-transform.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-util.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-visualize.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-vps.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_la-vui.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1042,8 +1081,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1144,7 +1185,41 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-recursive - -rm -rf ../extra/$(DEPDIR) ./$(DEPDIR) + -rm -f ../extra/$(DEPDIR)/libde265_la-win32cond.Plo + -rm -f ./$(DEPDIR)/libde265_la-alloc_pool.Plo + -rm -f ./$(DEPDIR)/libde265_la-bitstream.Plo + -rm -f ./$(DEPDIR)/libde265_la-cabac.Plo + -rm -f ./$(DEPDIR)/libde265_la-configparam.Plo + -rm -f ./$(DEPDIR)/libde265_la-contextmodel.Plo + -rm -f ./$(DEPDIR)/libde265_la-de265.Plo + -rm -f ./$(DEPDIR)/libde265_la-deblock.Plo + -rm -f ./$(DEPDIR)/libde265_la-decctx.Plo + -rm -f ./$(DEPDIR)/libde265_la-dpb.Plo + -rm -f ./$(DEPDIR)/libde265_la-en265.Plo + -rm -f ./$(DEPDIR)/libde265_la-fallback-dct.Plo + -rm -f ./$(DEPDIR)/libde265_la-fallback-motion.Plo + -rm -f ./$(DEPDIR)/libde265_la-fallback.Plo + -rm -f ./$(DEPDIR)/libde265_la-image-io.Plo + -rm -f ./$(DEPDIR)/libde265_la-image.Plo + -rm -f ./$(DEPDIR)/libde265_la-intrapred.Plo + -rm -f ./$(DEPDIR)/libde265_la-md5.Plo + -rm -f ./$(DEPDIR)/libde265_la-motion.Plo + -rm -f ./$(DEPDIR)/libde265_la-nal-parser.Plo + -rm -f ./$(DEPDIR)/libde265_la-nal.Plo + -rm -f ./$(DEPDIR)/libde265_la-pps.Plo + -rm -f ./$(DEPDIR)/libde265_la-quality.Plo + -rm -f ./$(DEPDIR)/libde265_la-refpic.Plo + -rm -f ./$(DEPDIR)/libde265_la-sao.Plo + -rm -f ./$(DEPDIR)/libde265_la-scan.Plo + -rm -f ./$(DEPDIR)/libde265_la-sei.Plo + -rm -f ./$(DEPDIR)/libde265_la-slice.Plo + -rm -f ./$(DEPDIR)/libde265_la-sps.Plo + -rm -f ./$(DEPDIR)/libde265_la-threads.Plo + -rm -f ./$(DEPDIR)/libde265_la-transform.Plo + -rm -f ./$(DEPDIR)/libde265_la-util.Plo + -rm -f ./$(DEPDIR)/libde265_la-visualize.Plo + -rm -f ./$(DEPDIR)/libde265_la-vps.Plo + -rm -f ./$(DEPDIR)/libde265_la-vui.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1190,7 +1265,41 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ../extra/$(DEPDIR) ./$(DEPDIR) + -rm -f ../extra/$(DEPDIR)/libde265_la-win32cond.Plo + -rm -f ./$(DEPDIR)/libde265_la-alloc_pool.Plo + -rm -f ./$(DEPDIR)/libde265_la-bitstream.Plo + -rm -f ./$(DEPDIR)/libde265_la-cabac.Plo + -rm -f ./$(DEPDIR)/libde265_la-configparam.Plo + -rm -f ./$(DEPDIR)/libde265_la-contextmodel.Plo + -rm -f ./$(DEPDIR)/libde265_la-de265.Plo + -rm -f ./$(DEPDIR)/libde265_la-deblock.Plo + -rm -f ./$(DEPDIR)/libde265_la-decctx.Plo + -rm -f ./$(DEPDIR)/libde265_la-dpb.Plo + -rm -f ./$(DEPDIR)/libde265_la-en265.Plo + -rm -f ./$(DEPDIR)/libde265_la-fallback-dct.Plo + -rm -f ./$(DEPDIR)/libde265_la-fallback-motion.Plo + -rm -f ./$(DEPDIR)/libde265_la-fallback.Plo + -rm -f ./$(DEPDIR)/libde265_la-image-io.Plo + -rm -f ./$(DEPDIR)/libde265_la-image.Plo + -rm -f ./$(DEPDIR)/libde265_la-intrapred.Plo + -rm -f ./$(DEPDIR)/libde265_la-md5.Plo + -rm -f ./$(DEPDIR)/libde265_la-motion.Plo + -rm -f ./$(DEPDIR)/libde265_la-nal-parser.Plo + -rm -f ./$(DEPDIR)/libde265_la-nal.Plo + -rm -f ./$(DEPDIR)/libde265_la-pps.Plo + -rm -f ./$(DEPDIR)/libde265_la-quality.Plo + -rm -f ./$(DEPDIR)/libde265_la-refpic.Plo + -rm -f ./$(DEPDIR)/libde265_la-sao.Plo + -rm -f ./$(DEPDIR)/libde265_la-scan.Plo + -rm -f ./$(DEPDIR)/libde265_la-sei.Plo + -rm -f ./$(DEPDIR)/libde265_la-slice.Plo + -rm -f ./$(DEPDIR)/libde265_la-sps.Plo + -rm -f ./$(DEPDIR)/libde265_la-threads.Plo + -rm -f ./$(DEPDIR)/libde265_la-transform.Plo + -rm -f ./$(DEPDIR)/libde265_la-util.Plo + -rm -f ./$(DEPDIR)/libde265_la-visualize.Plo + -rm -f ./$(DEPDIR)/libde265_la-vps.Plo + -rm -f ./$(DEPDIR)/libde265_la-vui.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1211,22 +1320,22 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-libde265_laHEADERS .MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libLTLIBRARIES \ - clean-libtool cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-libde265_laHEADERS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-libLTLIBRARIES \ - uninstall-libde265_laHEADERS +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--depfiles check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES \ + install-libde265_laHEADERS install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-libde265_laHEADERS .PRECIOUS: Makefile diff --git a/libde265/alloc_pool.h b/libde265/alloc_pool.h index 41dd4a4..5e01a10 100644 --- a/libde265/alloc_pool.h +++ b/libde265/alloc_pool.h @@ -29,12 +29,7 @@ #include #include -#ifdef HAVE_STDINT_H -#include -#endif -#ifdef HAVE_CSTDINT #include -#endif class alloc_pool diff --git a/libde265/arm/Makefile.in b/libde265/arm/Makefile.in index 81afc71..465e255 100644 --- a/libde265/arm/Makefile.in +++ b/libde265/arm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -145,11 +145,16 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libde265_arm_la-arm.Plo \ + ./$(DEPDIR)/libde265_arm_neon_la-asm.Plo \ + ./$(DEPDIR)/libde265_arm_neon_la-cpudetect.Plo \ + ./$(DEPDIR)/libde265_arm_neon_la-hevcdsp_qpel_neon.Plo \ + ./$(DEPDIR)/libde265_arm_neon_la-neon.Plo am__mv = mv -f CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ +LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CCASFLAGS) $(CCASFLAGS) @@ -218,8 +223,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -237,8 +240,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -253,6 +257,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -407,8 +412,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -443,11 +448,17 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_la-arm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_neon_la-asm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_neon_la-cpudetect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_neon_la-hevcdsp_qpel_neon.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_neon_la-neon.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_la-arm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_neon_la-asm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_neon_la-cpudetect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_neon_la-hevcdsp_qpel_neon.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_arm_neon_la-neon.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .S.o: @am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -471,32 +482,32 @@ distclean-compile: @am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $< libde265_arm_neon_la-asm.lo: asm.S -@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -MT libde265_arm_neon_la-asm.lo -MD -MP -MF $(DEPDIR)/libde265_arm_neon_la-asm.Tpo -c -o libde265_arm_neon_la-asm.lo `test -f 'asm.S' || echo '$(srcdir)/'`asm.S +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -MT libde265_arm_neon_la-asm.lo -MD -MP -MF $(DEPDIR)/libde265_arm_neon_la-asm.Tpo -c -o libde265_arm_neon_la-asm.lo `test -f 'asm.S' || echo '$(srcdir)/'`asm.S @am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libde265_arm_neon_la-asm.Tpo $(DEPDIR)/libde265_arm_neon_la-asm.Plo @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='asm.S' object='libde265_arm_neon_la-asm.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -c -o libde265_arm_neon_la-asm.lo `test -f 'asm.S' || echo '$(srcdir)/'`asm.S +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -c -o libde265_arm_neon_la-asm.lo `test -f 'asm.S' || echo '$(srcdir)/'`asm.S libde265_arm_neon_la-cpudetect.lo: cpudetect.S -@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -MT libde265_arm_neon_la-cpudetect.lo -MD -MP -MF $(DEPDIR)/libde265_arm_neon_la-cpudetect.Tpo -c -o libde265_arm_neon_la-cpudetect.lo `test -f 'cpudetect.S' || echo '$(srcdir)/'`cpudetect.S +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -MT libde265_arm_neon_la-cpudetect.lo -MD -MP -MF $(DEPDIR)/libde265_arm_neon_la-cpudetect.Tpo -c -o libde265_arm_neon_la-cpudetect.lo `test -f 'cpudetect.S' || echo '$(srcdir)/'`cpudetect.S @am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libde265_arm_neon_la-cpudetect.Tpo $(DEPDIR)/libde265_arm_neon_la-cpudetect.Plo @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='cpudetect.S' object='libde265_arm_neon_la-cpudetect.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -c -o libde265_arm_neon_la-cpudetect.lo `test -f 'cpudetect.S' || echo '$(srcdir)/'`cpudetect.S +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -c -o libde265_arm_neon_la-cpudetect.lo `test -f 'cpudetect.S' || echo '$(srcdir)/'`cpudetect.S libde265_arm_neon_la-hevcdsp_qpel_neon.lo: hevcdsp_qpel_neon.S -@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -MT libde265_arm_neon_la-hevcdsp_qpel_neon.lo -MD -MP -MF $(DEPDIR)/libde265_arm_neon_la-hevcdsp_qpel_neon.Tpo -c -o libde265_arm_neon_la-hevcdsp_qpel_neon.lo `test -f 'hevcdsp_qpel_neon.S' || echo '$(srcdir)/'`hevcdsp_qpel_neon.S +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -MT libde265_arm_neon_la-hevcdsp_qpel_neon.lo -MD -MP -MF $(DEPDIR)/libde265_arm_neon_la-hevcdsp_qpel_neon.Tpo -c -o libde265_arm_neon_la-hevcdsp_qpel_neon.lo `test -f 'hevcdsp_qpel_neon.S' || echo '$(srcdir)/'`hevcdsp_qpel_neon.S @am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libde265_arm_neon_la-hevcdsp_qpel_neon.Tpo $(DEPDIR)/libde265_arm_neon_la-hevcdsp_qpel_neon.Plo @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='hevcdsp_qpel_neon.S' object='libde265_arm_neon_la-hevcdsp_qpel_neon.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -c -o libde265_arm_neon_la-hevcdsp_qpel_neon.lo `test -f 'hevcdsp_qpel_neon.S' || echo '$(srcdir)/'`hevcdsp_qpel_neon.S +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -c -o libde265_arm_neon_la-hevcdsp_qpel_neon.lo `test -f 'hevcdsp_qpel_neon.S' || echo '$(srcdir)/'`hevcdsp_qpel_neon.S libde265_arm_neon_la-neon.lo: neon.S -@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -MT libde265_arm_neon_la-neon.lo -MD -MP -MF $(DEPDIR)/libde265_arm_neon_la-neon.Tpo -c -o libde265_arm_neon_la-neon.lo `test -f 'neon.S' || echo '$(srcdir)/'`neon.S +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -MT libde265_arm_neon_la-neon.lo -MD -MP -MF $(DEPDIR)/libde265_arm_neon_la-neon.Tpo -c -o libde265_arm_neon_la-neon.lo `test -f 'neon.S' || echo '$(srcdir)/'`neon.S @am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libde265_arm_neon_la-neon.Tpo $(DEPDIR)/libde265_arm_neon_la-neon.Plo @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='neon.S' object='libde265_arm_neon_la-neon.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -c -o libde265_arm_neon_la-neon.lo `test -f 'neon.S' || echo '$(srcdir)/'`neon.S +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libde265_arm_neon_la_CCASFLAGS) $(CCASFLAGS) -c -o libde265_arm_neon_la-neon.lo `test -f 'neon.S' || echo '$(srcdir)/'`neon.S .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -583,8 +594,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -654,7 +667,11 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libde265_arm_la-arm.Plo + -rm -f ./$(DEPDIR)/libde265_arm_neon_la-asm.Plo + -rm -f ./$(DEPDIR)/libde265_arm_neon_la-cpudetect.Plo + -rm -f ./$(DEPDIR)/libde265_arm_neon_la-hevcdsp_qpel_neon.Plo + -rm -f ./$(DEPDIR)/libde265_arm_neon_la-neon.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -700,7 +717,11 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libde265_arm_la-arm.Plo + -rm -f ./$(DEPDIR)/libde265_arm_neon_la-asm.Plo + -rm -f ./$(DEPDIR)/libde265_arm_neon_la-cpudetect.Plo + -rm -f ./$(DEPDIR)/libde265_arm_neon_la-hevcdsp_qpel_neon.Plo + -rm -f ./$(DEPDIR)/libde265_arm_neon_la-neon.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -721,16 +742,16 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am diff --git a/libde265/bitstream.h b/libde265/bitstream.h index 3100b43..02a5b63 100644 --- a/libde265/bitstream.h +++ b/libde265/bitstream.h @@ -26,9 +26,6 @@ #endif #include -#ifdef HAVE_STDBOOL_H -#include -#endif #include diff --git a/libde265/cabac.cc b/libde265/cabac.cc index 102bc57..7d9ca44 100644 --- a/libde265/cabac.cc +++ b/libde265/cabac.cc @@ -274,7 +274,8 @@ int decode_CABAC_term_bit(CABAC_decoder* decoder) } - +// When we read past the end of the bitstream (which should only happen on faulty bitstreams), +// we will eventually only return zeros. int decode_CABAC_bypass(CABAC_decoder* decoder) { logtrace(LogCABAC,"[%3d] bypass r:%x v:%x\n",logcnt,decoder->range, decoder->value); @@ -288,6 +289,10 @@ int decode_CABAC_bypass(CABAC_decoder* decoder) decoder->bits_needed = -8; decoder->value |= *decoder->bitstream_curr++; } + else { + // we read past the end of the bitstream, fill with 0 + decoder->bits_needed = -8; + } } int bit; @@ -371,9 +376,9 @@ int decode_CABAC_FL_bypass_parallel(CABAC_decoder* decoder, int nBits) } -int decode_CABAC_FL_bypass(CABAC_decoder* decoder, int nBits) +uint32_t decode_CABAC_FL_bypass(CABAC_decoder* decoder, int nBits) { - int value=0; + uint32_t value=0; if (likely(nBits<=8)) { if (nBits==0) { @@ -487,6 +492,8 @@ void CABAC_encoder_bitstream::write_bits(uint32_t bits,int n) vlc_buffer |= bits; vlc_buffer_len += n; + // TODO: errors returned by append_byte() are ignored, resulting in a broken output. + while (vlc_buffer_len>=8) { append_byte((vlc_buffer >> (vlc_buffer_len-8)) & 0xFF); vlc_buffer_len -= 8; @@ -519,6 +526,8 @@ void CABAC_encoder::write_svlc(int value) void CABAC_encoder_bitstream::flush_VLC() { + // TODO: errors returned by append_byte() are ignored, resulting in a broken output. + while (vlc_buffer_len>=8) { append_byte((vlc_buffer >> (vlc_buffer_len-8)) & 0xFF); vlc_buffer_len -= 8; @@ -552,7 +561,7 @@ int CABAC_encoder_bitstream::number_free_bits_in_byte() const } -void CABAC_encoder_bitstream::check_size_and_resize(int nBytes) +bool CABAC_encoder_bitstream::check_size_and_resize(int nBytes) { if (data_size+nBytes > data_capacity) { // 1 extra byte for stuffing if (data_capacity==0) { @@ -561,14 +570,24 @@ void CABAC_encoder_bitstream::check_size_and_resize(int nBytes) data_capacity *= 2; } - data_mem = (uint8_t*)realloc(data_mem,data_capacity); + uint8_t* new_data_mem = (uint8_t*)realloc(data_mem,data_capacity); + if (new_data_mem) { + data_mem = new_data_mem; + } + else { + return false; + } } + + return true; } -void CABAC_encoder_bitstream::append_byte(int byte) +bool CABAC_encoder_bitstream::append_byte(int byte) { - check_size_and_resize(2); + if (!check_size_and_resize(2)) { + return false; + } // --- emulation prevention --- @@ -598,17 +617,23 @@ void CABAC_encoder_bitstream::append_byte(int byte) // write actual data byte data_mem[ data_size++ ] = byte; + + return true; } -void CABAC_encoder_bitstream::write_startcode() +bool CABAC_encoder_bitstream::write_startcode() { - check_size_and_resize(3); + if (!check_size_and_resize(3)) { + return false; + } data_mem[ data_size+0 ] = 0; data_mem[ data_size+1 ] = 0; data_mem[ data_size+2 ] = 1; data_size+=3; + + return true; } void CABAC_encoder_bitstream::init_CABAC() @@ -623,6 +648,8 @@ void CABAC_encoder_bitstream::init_CABAC() void CABAC_encoder_bitstream::flush_CABAC() { + // TODO: errors returned by append_byte() are ignored, resulting in a broken output. + if (low >> (32 - bits_left)) { append_byte(buffered_byte + 1); @@ -656,6 +683,8 @@ void CABAC_encoder_bitstream::flush_CABAC() void CABAC_encoder_bitstream::write_out() { + // TODO: errors returned by append_byte() are ignored, resulting in a broken output. + //logtrace(LogCABAC,"low = %08x (bits_left=%d)\n",low,bits_left); int leadByte = low >> (24 - bits_left); bits_left += 8; diff --git a/libde265/cabac.h b/libde265/cabac.h index e28aeeb..4560ac2 100644 --- a/libde265/cabac.h +++ b/libde265/cabac.h @@ -44,7 +44,7 @@ int decode_CABAC_term_bit(CABAC_decoder* decoder); int decode_CABAC_bypass(CABAC_decoder* decoder); int decode_CABAC_TU_bypass(CABAC_decoder* decoder, int cMax); -int decode_CABAC_FL_bypass(CABAC_decoder* decoder, int nBits); +uint32_t decode_CABAC_FL_bypass(CABAC_decoder* decoder, int nBits); int decode_CABAC_TR_bypass(CABAC_decoder* decoder, int cRiceParam, int cTRMax); int decode_CABAC_EGk_bypass(CABAC_decoder* decoder, int k); @@ -66,7 +66,7 @@ class CABAC_encoder virtual void write_bit(int bit) { write_bits(bit,1); } virtual void write_uvlc(int value); virtual void write_svlc(int value); - virtual void write_startcode() = 0; + virtual bool write_startcode() = 0; virtual void skip_bits(int nBits) = 0; virtual void add_trailing_bits(); @@ -113,7 +113,7 @@ class CABAC_encoder_bitstream : public CABAC_encoder // --- VLC --- virtual void write_bits(uint32_t bits,int n); - virtual void write_startcode(); + virtual bool write_startcode(); virtual void skip_bits(int nBits); virtual int number_free_bits_in_byte() const; @@ -155,10 +155,10 @@ class CABAC_encoder_bitstream : public CABAC_encoder uint16_t num_buffered_bytes; - void check_size_and_resize(int nBytes); + bool check_size_and_resize(int nBytes); void testAndWriteOut(); void write_out(); - void append_byte(int byte); + bool append_byte(int byte); }; @@ -178,7 +178,7 @@ class CABAC_encoder_estim : public CABAC_encoder virtual void write_bits(uint32_t bits,int n) { mFracBits += n<<15; } virtual void write_bit(int bit) { mFracBits+=1<<15; } - virtual void write_startcode() { mFracBits += (1<<15)*8*3; } + virtual bool write_startcode() { mFracBits += (1<<15)*8*3; return true; } virtual void skip_bits(int nBits) { mFracBits += nBits<<15; } virtual int number_free_bits_in_byte() const { return 0; } // TODO, good enough for now diff --git a/libde265/configparam.cc b/libde265/configparam.cc index d944141..6d873fd 100644 --- a/libde265/configparam.cc +++ b/libde265/configparam.cc @@ -236,7 +236,7 @@ bool config_parameters::parse_command_line_params(int* argc, char** argv, int* f bool option_found=false; - for (int o=0;ohasLongOption() && strcmp(mOptions[o]->getLongOption().c_str(), argv[i]+2)==0) { option_found=true; @@ -271,7 +271,7 @@ bool config_parameters::parse_command_line_params(int* argc, char** argv, int* f bool option_found=false; - for (int o=0;ogetShortOption() == option) { option_found=true; @@ -318,7 +318,7 @@ bool config_parameters::parse_command_line_params(int* argc, char** argv, int* f void config_parameters::print_params() const { - for (int i=0;i>4) * 10 + (v & 0x0F); +} + LIBDE265_API int de265_get_version_number_major(void) { - return ((LIBDE265_NUMERIC_VERSION)>>24) & 0xFF; + return bcd2dec(((LIBDE265_NUMERIC_VERSION)>>24) & 0xFF); } LIBDE265_API int de265_get_version_number_minor(void) { - return ((LIBDE265_NUMERIC_VERSION)>>16) & 0xFF; + return bcd2dec(((LIBDE265_NUMERIC_VERSION)>>16) & 0xFF); } LIBDE265_API int de265_get_version_number_maintenance(void) { - return ((LIBDE265_NUMERIC_VERSION)>>8) & 0xFF; + return bcd2dec(((LIBDE265_NUMERIC_VERSION)>>8) & 0xFF); } @@ -157,6 +162,20 @@ LIBDE265_API const char* de265_get_error_text(de265_error err) return "SPS header missing, cannot decode SEI"; case DE265_WARNING_COLLOCATED_MOTION_VECTOR_OUTSIDE_IMAGE_AREA: return "collocated motion-vector is outside image area"; + case DE265_WARNING_PCM_BITDEPTH_TOO_LARGE: + return "PCM bit-depth too large"; + case DE265_WARNING_REFERENCE_IMAGE_BIT_DEPTH_DOES_NOT_MATCH: + return "Bit-depth of reference image does not match current image"; + case DE265_WARNING_REFERENCE_IMAGE_SIZE_DOES_NOT_MATCH_SPS: + return "Size of reference image does not match current size in SPS"; + case DE265_WARNING_CHROMA_OF_CURRENT_IMAGE_DOES_NOT_MATCH_SPS: + return "Chroma format of current image does not match chroma in SPS"; + case DE265_WARNING_BIT_DEPTH_OF_CURRENT_IMAGE_DOES_NOT_MATCH_SPS: + return "Bit-depth of current image does not match SPS"; + case DE265_WARNING_REFERENCE_IMAGE_CHROMA_FORMAT_DOES_NOT_MATCH: + return "Chroma format of reference image does not match current image"; + case DE265_WARNING_INVALID_SLICE_HEADER_INDEX_ACCESS: + return "Access with invalid slice header index"; default: return "unknown error"; } diff --git a/libde265/de265.h b/libde265/de265.h index 5cbac45..b160be4 100644 --- a/libde265/de265.h +++ b/libde265/de265.h @@ -70,6 +70,10 @@ extern "C" { // version of linked libde265 library LIBDE265_API const char *de265_get_version(void); + +// returns the version number as a BCD number. +// 0xAABBCCDD is interpreted as version AA.BB.CC. +// For example: 0x02143000 is version 2.14.30 LIBDE265_API uint32_t de265_get_version_number(void); LIBDE265_API int de265_get_version_number_major(void); @@ -135,7 +139,14 @@ typedef enum { DE265_NON_EXISTING_LT_REFERENCE_CANDIDATE_IN_SLICE_HEADER=1023, DE265_WARNING_CANNOT_APPLY_SAO_OUT_OF_MEMORY=1024, DE265_WARNING_SPS_MISSING_CANNOT_DECODE_SEI=1025, - DE265_WARNING_COLLOCATED_MOTION_VECTOR_OUTSIDE_IMAGE_AREA=1026 + DE265_WARNING_COLLOCATED_MOTION_VECTOR_OUTSIDE_IMAGE_AREA=1026, + DE265_WARNING_PCM_BITDEPTH_TOO_LARGE=1027, + DE265_WARNING_REFERENCE_IMAGE_BIT_DEPTH_DOES_NOT_MATCH=1028, + DE265_WARNING_REFERENCE_IMAGE_SIZE_DOES_NOT_MATCH_SPS=1029, + DE265_WARNING_CHROMA_OF_CURRENT_IMAGE_DOES_NOT_MATCH_SPS=1030, + DE265_WARNING_BIT_DEPTH_OF_CURRENT_IMAGE_DOES_NOT_MATCH_SPS=1031, + DE265_WARNING_REFERENCE_IMAGE_CHROMA_FORMAT_DOES_NOT_MATCH=1032, + DE265_WARNING_INVALID_SLICE_HEADER_INDEX_ACCESS=1033 } de265_error; LIBDE265_API const char* de265_get_error_text(de265_error err); diff --git a/libde265/deblock.cc b/libde265/deblock.cc index f64cd8e..d19d450 100644 --- a/libde265/deblock.cc +++ b/libde265/deblock.cc @@ -295,67 +295,82 @@ void derive_boundaryStrength(de265_image* img, bool vertical, int yStart,int yEn slice_segment_header* shdrP = img->get_SliceHeader(xDiOpp,yDiOpp); slice_segment_header* shdrQ = img->get_SliceHeader(xDi ,yDi); - int refPicP0 = mviP.predFlag[0] ? shdrP->RefPicList[0][ mviP.refIdx[0] ] : -1; - int refPicP1 = mviP.predFlag[1] ? shdrP->RefPicList[1][ mviP.refIdx[1] ] : -1; - int refPicQ0 = mviQ.predFlag[0] ? shdrQ->RefPicList[0][ mviQ.refIdx[0] ] : -1; - int refPicQ1 = mviQ.predFlag[1] ? shdrQ->RefPicList[1][ mviQ.refIdx[1] ] : -1; - - bool samePics = ((refPicP0==refPicQ0 && refPicP1==refPicQ1) || - (refPicP0==refPicQ1 && refPicP1==refPicQ0)); - - if (!samePics) { - bS = 1; - } - else { - MotionVector mvP0 = mviP.mv[0]; if (!mviP.predFlag[0]) { mvP0.x=mvP0.y=0; } - MotionVector mvP1 = mviP.mv[1]; if (!mviP.predFlag[1]) { mvP1.x=mvP1.y=0; } - MotionVector mvQ0 = mviQ.mv[0]; if (!mviQ.predFlag[0]) { mvQ0.x=mvQ0.y=0; } - MotionVector mvQ1 = mviQ.mv[1]; if (!mviQ.predFlag[1]) { mvQ1.x=mvQ1.y=0; } - - int numMV_P = mviP.predFlag[0] + mviP.predFlag[1]; - int numMV_Q = mviQ.predFlag[0] + mviQ.predFlag[1]; - - if (numMV_P!=numMV_Q) { - img->decctx->add_warning(DE265_WARNING_NUMMVP_NOT_EQUAL_TO_NUMMVQ, false); - img->integrity = INTEGRITY_DECODING_ERRORS; - } - - // two different reference pictures or only one reference picture - if (refPicP0 != refPicP1) { + if (shdrP && shdrQ) { + + if (mviP.refIdx[0] > MAX_NUM_REF_PICS || + mviP.refIdx[1] > MAX_NUM_REF_PICS || + mviQ.refIdx[0] > MAX_NUM_REF_PICS || + mviQ.refIdx[1] > MAX_NUM_REF_PICS) { + // we cannot return an error from here, so just set a valid boundaryStrength value and continue; + img->set_deblk_bS(xDi, yDi, 0); + continue; + } - if (refPicP0 == refPicQ0) { - if (abs_value(mvP0.x-mvQ0.x) >= 4 || - abs_value(mvP0.y-mvQ0.y) >= 4 || - abs_value(mvP1.x-mvQ1.x) >= 4 || - abs_value(mvP1.y-mvQ1.y) >= 4) { - bS = 1; - } - } - else { - if (abs_value(mvP0.x-mvQ1.x) >= 4 || - abs_value(mvP0.y-mvQ1.y) >= 4 || - abs_value(mvP1.x-mvQ0.x) >= 4 || - abs_value(mvP1.y-mvQ0.y) >= 4) { - bS = 1; - } - } - } - else { - assert(refPicQ0==refPicQ1); - - if ((abs_value(mvP0.x-mvQ0.x) >= 4 || - abs_value(mvP0.y-mvQ0.y) >= 4 || - abs_value(mvP1.x-mvQ1.x) >= 4 || - abs_value(mvP1.y-mvQ1.y) >= 4) - && - (abs_value(mvP0.x-mvQ1.x) >= 4 || - abs_value(mvP0.y-mvQ1.y) >= 4 || - abs_value(mvP1.x-mvQ0.x) >= 4 || - abs_value(mvP1.y-mvQ0.y) >= 4)) { - bS = 1; - } - } - } + int refPicP0 = mviP.predFlag[0] ? shdrP->RefPicList[0][ mviP.refIdx[0] ] : -1; + int refPicP1 = mviP.predFlag[1] ? shdrP->RefPicList[1][ mviP.refIdx[1] ] : -1; + int refPicQ0 = mviQ.predFlag[0] ? shdrQ->RefPicList[0][ mviQ.refIdx[0] ] : -1; + int refPicQ1 = mviQ.predFlag[1] ? shdrQ->RefPicList[1][ mviQ.refIdx[1] ] : -1; + + bool samePics = ((refPicP0==refPicQ0 && refPicP1==refPicQ1) || + (refPicP0==refPicQ1 && refPicP1==refPicQ0)); + + if (!samePics) { + bS = 1; + } + else { + MotionVector mvP0 = mviP.mv[0]; if (!mviP.predFlag[0]) { mvP0.x=mvP0.y=0; } + MotionVector mvP1 = mviP.mv[1]; if (!mviP.predFlag[1]) { mvP1.x=mvP1.y=0; } + MotionVector mvQ0 = mviQ.mv[0]; if (!mviQ.predFlag[0]) { mvQ0.x=mvQ0.y=0; } + MotionVector mvQ1 = mviQ.mv[1]; if (!mviQ.predFlag[1]) { mvQ1.x=mvQ1.y=0; } + + int numMV_P = mviP.predFlag[0] + mviP.predFlag[1]; + int numMV_Q = mviQ.predFlag[0] + mviQ.predFlag[1]; + + if (numMV_P!=numMV_Q) { + img->decctx->add_warning(DE265_WARNING_NUMMVP_NOT_EQUAL_TO_NUMMVQ, false); + img->integrity = INTEGRITY_DECODING_ERRORS; + } + + // two different reference pictures or only one reference picture + if (refPicP0 != refPicP1) { + + if (refPicP0 == refPicQ0) { + if (abs_value(mvP0.x-mvQ0.x) >= 4 || + abs_value(mvP0.y-mvQ0.y) >= 4 || + abs_value(mvP1.x-mvQ1.x) >= 4 || + abs_value(mvP1.y-mvQ1.y) >= 4) { + bS = 1; + } + } + else { + if (abs_value(mvP0.x-mvQ1.x) >= 4 || + abs_value(mvP0.y-mvQ1.y) >= 4 || + abs_value(mvP1.x-mvQ0.x) >= 4 || + abs_value(mvP1.y-mvQ0.y) >= 4) { + bS = 1; + } + } + } + else { + assert(refPicQ0==refPicQ1); + + if ((abs_value(mvP0.x-mvQ0.x) >= 4 || + abs_value(mvP0.y-mvQ0.y) >= 4 || + abs_value(mvP1.x-mvQ1.x) >= 4 || + abs_value(mvP1.y-mvQ1.y) >= 4) + && + (abs_value(mvP0.x-mvQ1.x) >= 4 || + abs_value(mvP0.y-mvQ1.y) >= 4 || + abs_value(mvP1.x-mvQ0.x) >= 4 || + abs_value(mvP1.y-mvQ0.y) >= 4)) { + bS = 1; + } + } + } + } + else { + bS = 0; // if shdrP==NULL or shdrQ==NULL + } /* printf("unimplemented deblocking code for CU at %d;%d\n",xDi,yDi); @@ -844,7 +859,7 @@ void edge_filtering_chroma_internal(de265_image* img, bool vertical, for (int k=0;k<4;k++) { - int delta = Clip3(-tc,tc, ((((q[0][k]-p[0][k])<<2)+p[1][k]-q[1][k]+4)>>3)); + int delta = Clip3(-tc,tc, ((((q[0][k]-p[0][k])*4)+p[1][k]-q[1][k]+4)>>3)); // standard says <<2 in eq. (8-356), but the value can also be negative logtrace(LogDeblock,"delta=%d\n",delta); if (filterP) { ptr[-1+k*stride] = Clip_BitDepth(p[0][k]+delta, bitDepth_C); } if (filterQ) { ptr[ 0+k*stride] = Clip_BitDepth(q[0][k]-delta, bitDepth_C); } @@ -860,7 +875,7 @@ void edge_filtering_chroma_internal(de265_image* img, bool vertical, if (img->get_cu_transquant_bypass(SubWidthC*xDi,SubHeightC*yDi)) filterQ=false; for (int k=0;k<4;k++) { - int delta = Clip3(-tc,tc, ((((q[0][k]-p[0][k])<<2)+p[1][k]-q[1][k]+4)>>3)); + int delta = Clip3(-tc,tc, ((((q[0][k]-p[0][k])*4)+p[1][k]-q[1][k]+4)>>3)); // standard says <<2, but the value can also be negative if (filterP) { ptr[ k-1*stride] = Clip_BitDepth(p[0][k]+delta, bitDepth_C); } if (filterQ) { ptr[ k+0*stride] = Clip_BitDepth(q[0][k]-delta, bitDepth_C); } } diff --git a/libde265/decctx.cc b/libde265/decctx.cc index edebb71..2e5fca5 100644 --- a/libde265/decctx.cc +++ b/libde265/decctx.cc @@ -186,11 +186,11 @@ image_unit::image_unit() image_unit::~image_unit() { - for (int i=0;iseq_parameter_set_id ] = new_sps; + // Remove the all PPS that referenced the old SPS because parameters may have changed and we do not want to + // get the SPS and PPS parameters (e.g. image size) out of sync. + + for (auto& p : pps) { + if (p && p->seq_parameter_set_id == new_sps->seq_parameter_set_id) { + p = nullptr; + } + } + return DE265_OK; } @@ -572,16 +582,17 @@ de265_error decoder_context::read_pps_NAL(bitreader& reader) std::shared_ptr new_pps = std::make_shared(); bool success = new_pps->read(&reader,this); + if (!success) { + return DE265_WARNING_PPS_HEADER_INVALID; + } if (param_pps_headers_fd>=0) { new_pps->dump(param_pps_headers_fd); } - if (success) { - pps[ (int)new_pps->pic_parameter_set_id ] = new_pps; - } + pps[ (int)new_pps->pic_parameter_set_id ] = new_pps; - return success ? DE265_OK : DE265_WARNING_PPS_HEADER_INVALID; + return DE265_OK; } de265_error decoder_context::read_sei_NAL(bitreader& reader, bool suffix) @@ -693,7 +704,7 @@ de265_error decoder_context::read_slice_NAL(bitreader& reader, NAL_unit* nal, na template void pop_front(std::vector& vec) { - for (int i=1;isuffix_SEIs.size();i++) { + for (size_t i=0;isuffix_SEIs.size();i++) { const sei_message& sei = imgunit->suffix_SEIs[i]; err = process_sei(&sei, imgunit->img); @@ -1083,7 +1094,7 @@ de265_error decoder_context::decode_slice_unit_WPP(image_unit* imgunit, img->wait_for_completion(); - for (int i=0;itasks.size();i++) + for (size_t i=0;itasks.size();i++) delete imgunit->tasks[i]; imgunit->tasks.clear(); @@ -1173,7 +1184,7 @@ de265_error decoder_context::decode_slice_unit_tiles(image_unit* imgunit, img->wait_for_completion(); - for (int i=0;itasks.size();i++) + for (size_t i=0;itasks.size();i++) delete imgunit->tasks[i]; imgunit->tasks.clear(); @@ -1416,8 +1427,9 @@ int decoder_context::generate_unavailable_reference_picture(const seq_parameter_ std::shared_ptr current_sps = this->sps[ (int)current_pps->seq_parameter_set_id ]; int idx = dpb.new_image(current_sps, this, 0,0, false); - assert(idx>=0); - //printf("-> fill with unavailable POC %d\n",POC); + if (idx<0) { + return idx; + } de265_image* img = dpb.get_image(idx); @@ -1441,7 +1453,7 @@ int decoder_context::generate_unavailable_reference_picture(const seq_parameter_ This function will mark pictures in the DPB as 'unused' or 'used for long-term reference' */ -void decoder_context::process_reference_picture_set(slice_segment_header* hdr) +de265_error decoder_context::process_reference_picture_set(slice_segment_header* hdr) { std::vector removeReferencesList; @@ -1463,7 +1475,7 @@ void decoder_context::process_reference_picture_set(slice_segment_header* hdr) lower POCs seems to be compliant to the reference decoder. */ - for (int i=0;iPicState != UnusedForReference && @@ -1589,6 +1601,9 @@ void decoder_context::process_reference_picture_set(slice_segment_header* hdr) // We do not know the correct MSB int concealedPicture = generate_unavailable_reference_picture(current_sps.get(), PocLtCurr[i], true); + if (concealedPicture<0) { + return (de265_error)(-concealedPicture); + } picInAnyList.resize(dpb.size(), false); // adjust size of array to hold new picture RefPicSetLtCurr[i] = k = concealedPicture; @@ -1615,6 +1630,9 @@ void decoder_context::process_reference_picture_set(slice_segment_header* hdr) else { int concealedPicture = k = generate_unavailable_reference_picture(current_sps.get(), PocLtFoll[i], true); + if (concealedPicture<0) { + return (de265_error)(-concealedPicture); + } picInAnyList.resize(dpb.size(), false); // adjust size of array to hold new picture RefPicSetLtFoll[i] = concealedPicture; @@ -1646,6 +1664,9 @@ void decoder_context::process_reference_picture_set(slice_segment_header* hdr) else { int concealedPicture = generate_unavailable_reference_picture(current_sps.get(), PocStCurrBefore[i], false); + if (concealedPicture<0) { + return (de265_error)(-concealedPicture); + } RefPicSetStCurrBefore[i] = k = concealedPicture; picInAnyList.resize(dpb.size(), false); // adjust size of array to hold new picture @@ -1669,6 +1690,9 @@ void decoder_context::process_reference_picture_set(slice_segment_header* hdr) else { int concealedPicture = generate_unavailable_reference_picture(current_sps.get(), PocStCurrAfter[i], false); + if (concealedPicture<0) { + return (de265_error)(-concealedPicture); + } RefPicSetStCurrAfter[i] = k = concealedPicture; @@ -1712,6 +1736,8 @@ void decoder_context::process_reference_picture_set(slice_segment_header* hdr) hdr->RemoveReferencesList = removeReferencesList; //remove_images_from_dpb(hdr->RemoveReferencesList); + + return DE265_OK; } @@ -1979,9 +2005,10 @@ bool decoder_context::process_slice_segment_header(slice_segment_header* hdr, // get PPS and SPS for this slice int pps_id = hdr->slice_pic_parameter_set_id; - if (pps[pps_id]->pps_read==false) { + if (pps[pps_id]==nullptr || pps[pps_id]->pps_read==false) { logerror(LogHeaders, "PPS %d has not been read\n", pps_id); - assert(false); // TODO + img->decctx->add_warning(DE265_WARNING_NONEXISTING_PPS_REFERENCED, false); + return false; } current_pps = pps[pps_id]; @@ -2010,8 +2037,8 @@ bool decoder_context::process_slice_segment_header(slice_segment_header* hdr, int image_buffer_idx; bool isOutputImage = (!sps->sample_adaptive_offset_enabled_flag || param_disable_sao); image_buffer_idx = dpb.new_image(current_sps, this, pts, user_data, isOutputImage); - if (image_buffer_idx == -1) { - *err = DE265_ERROR_IMAGE_BUFFER_FULL; + if (image_buffer_idx < 0) { + *err = (de265_error)(-image_buffer_idx); return false; } @@ -2063,7 +2090,10 @@ bool decoder_context::process_slice_segment_header(slice_segment_header* hdr, // mark picture so that it is not overwritten by unavailable reference frames img->PicState = UsedForShortTermReference; - process_reference_picture_set(hdr); + *err = process_reference_picture_set(hdr); + if (*err != DE265_OK) { + return false; + } } img->PicState = UsedForShortTermReference; @@ -2115,7 +2145,7 @@ bool decoder_context::process_slice_segment_header(slice_segment_header* hdr, void decoder_context::remove_images_from_dpb(const std::vector& removeImageList) { - for (int i=0;i=0) { //printf("remove ID %d\n", removeImageList[i]); diff --git a/libde265/decctx.h b/libde265/decctx.h index c1acdce..8170b60 100644 --- a/libde265/decctx.h +++ b/libde265/decctx.h @@ -203,7 +203,7 @@ class image_unit std::vector suffix_SEIs; slice_unit* get_next_unprocessed_slice_segment() const { - for (int i=0;istate == slice_unit::Unprocessed) { return slice_units[i]; } @@ -213,7 +213,7 @@ class image_unit } slice_unit* get_prev_slice_segment(slice_unit* s) const { - for (int i=1; iPicOrderCntVal, dpb[i]->get_ID(), @@ -63,7 +63,7 @@ bool decoded_picture_buffer::has_free_dpb_picture(bool high_priority) const if (dpb.size() < max_images_in_DPB) return true; // scan for empty slots - for (int i=0;iPicOutputFlag==false && dpb[i]->PicState == UnusedForReference) { return true; } @@ -81,7 +81,7 @@ int decoded_picture_buffer::DPB_index_of_picture_with_POC(int poc, int currentID //loginfo(LogDPB,"searching for short-term reference POC=%d\n",poc); if (preferLongTerm) { - for (int k=0;kPicOrderCntVal == poc && dpb[k]->removed_at_picture_id > currentID && dpb[k]->PicState == UsedForLongTermReference) { @@ -90,7 +90,7 @@ int decoded_picture_buffer::DPB_index_of_picture_with_POC(int poc, int currentID } } - for (int k=0;kPicOrderCntVal == poc && dpb[k]->removed_at_picture_id > currentID && dpb[k]->PicState != UnusedForReference) { @@ -107,7 +107,7 @@ int decoded_picture_buffer::DPB_index_of_picture_with_LSB(int lsb, int currentID logdebug(LogHeaders,"get access to picture with LSB %d from DPB\n",lsb); if (preferLongTerm) { - for (int k=0;kpicture_order_cnt_lsb == lsb && dpb[k]->removed_at_picture_id > currentID && dpb[k]->PicState == UsedForLongTermReference) { @@ -116,7 +116,7 @@ int decoded_picture_buffer::DPB_index_of_picture_with_LSB(int lsb, int currentID } } - for (int k=0;kpicture_order_cnt_lsb == lsb && dpb[k]->removed_at_picture_id > currentID && dpb[k]->PicState != UnusedForReference) { @@ -132,7 +132,7 @@ int decoded_picture_buffer::DPB_index_of_picture_with_ID(int id) const { logdebug(LogHeaders,"get access to picture with ID %d from DPB\n",id); - for (int k=0;kget_ID() == id) { return k; } @@ -150,7 +150,7 @@ void decoded_picture_buffer::output_next_picture_in_reorder_buffer() int minPOC = reorder_output_queue[0]->PicOrderCntVal; int minIdx = 0; - for (int i=1;iPicOrderCntVal < minPOC) { minPOC = reorder_output_queue[i]->PicOrderCntVal; @@ -186,7 +186,7 @@ bool decoded_picture_buffer::flush_reorder_buffer() void decoded_picture_buffer::clear() { - for (int i=0;iPicOutputFlag || dpb[i]->PicState != UnusedForReference) { @@ -210,8 +210,8 @@ int decoded_picture_buffer::new_image(std::shared_ptr s // --- search for a free slot in the DPB --- - int free_image_buffer_idx = -1; - for (int i=0;ican_be_released()) { dpb[i]->release(); /* TODO: this is surely not the best place to free the image, but we have to do it here because releasing it in de265_release_image() @@ -237,7 +237,7 @@ int decoded_picture_buffer::new_image(std::shared_ptr s // create a new image slot if no empty slot remaining - if (free_image_buffer_idx == -1) { + if (free_image_buffer_idx == -DE265_ERROR_IMAGE_BUFFER_FULL) { free_image_buffer_idx = dpb.size(); dpb.push_back(new de265_image); } @@ -245,6 +245,10 @@ int decoded_picture_buffer::new_image(std::shared_ptr s // --- allocate new image --- + if (free_image_buffer_idx<0) { + return free_image_buffer_idx; + } + de265_image* img = dpb[free_image_buffer_idx]; int w = sps->pic_width_in_luma_samples; @@ -259,7 +263,10 @@ int decoded_picture_buffer::new_image(std::shared_ptr s default: chroma = de265_chroma_420; assert(0); break; // should never happen } - img->alloc_image(w,h, chroma, sps, true, decctx, /*NULL,*/ pts, user_data, isOutputImage); + de265_error error = img->alloc_image(w,h, chroma, sps, true, decctx, /*NULL,*/ pts, user_data, isOutputImage); + if (error) { + return -error; + } img->integrity = INTEGRITY_CORRECT; diff --git a/libde265/dpb.h b/libde265/dpb.h index fa8ff59..781ac3a 100644 --- a/libde265/dpb.h +++ b/libde265/dpb.h @@ -38,7 +38,9 @@ class decoded_picture_buffer { void set_norm_size_of_DPB(int n) { norm_images_in_DPB=n; } /* Alloc a new image in the DPB and return its index. - If there is no space for a new image, return -1. */ + If there is no space for a new image, returns the negative value of an de265_error. + I.e. you can check for error by return_value<0, which is error (-return_value); + */ int new_image(std::shared_ptr sps, decoder_context* decctx, de265_PTS pts, void* user_data, bool isOutputImage); diff --git a/libde265/encoder/Makefile.in b/libde265/encoder/Makefile.in index 750ea50..233833c 100644 --- a/libde265/encoder/Makefile.in +++ b/libde265/encoder/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -138,7 +138,17 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = \ + ./$(DEPDIR)/libde265_encoder_la-encoder-context.Plo \ + ./$(DEPDIR)/libde265_encoder_la-encoder-core.Plo \ + ./$(DEPDIR)/libde265_encoder_la-encoder-intrapred.Plo \ + ./$(DEPDIR)/libde265_encoder_la-encoder-motion.Plo \ + ./$(DEPDIR)/libde265_encoder_la-encoder-params.Plo \ + ./$(DEPDIR)/libde265_encoder_la-encoder-syntax.Plo \ + ./$(DEPDIR)/libde265_encoder_la-encoder-types.Plo \ + ./$(DEPDIR)/libde265_encoder_la-encpicbuf.Plo \ + ./$(DEPDIR)/libde265_encoder_la-sop.Plo am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -198,7 +208,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -216,8 +226,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -261,8 +269,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -277,6 +286,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -432,8 +442,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -465,15 +475,21 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-core.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-intrapred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-motion.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-params.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-syntax.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encpicbuf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-sop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-core.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-intrapred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-motion.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-params.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-syntax.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encoder-types.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-encpicbuf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_la-sop.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -663,8 +679,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -760,7 +778,15 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-context.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-core.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-intrapred.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-motion.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-params.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-syntax.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-types.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encpicbuf.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-sop.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -806,7 +832,15 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-context.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-core.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-intrapred.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-motion.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-params.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-syntax.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encoder-types.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-encpicbuf.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_la-sop.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -827,8 +861,8 @@ uninstall-am: .MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--depfiles check check-am clean clean-generic clean-libtool \ clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ diff --git a/libde265/encoder/algo/Makefile.in b/libde265/encoder/algo/Makefile.in index 7090922..0ede05c 100644 --- a/libde265/encoder/algo/Makefile.in +++ b/libde265/encoder/algo/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -146,7 +146,21 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libde265_encoder_algo_la-algo.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-cb-interpartmode.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-cb-intra-inter.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-cb-intrapartmode.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-cb-mergeindex.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-cb-skip.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-cb-split.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-coding-options.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-ctb-qscale.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-pb-mv.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-tb-intrapredmode.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-tb-rateestim.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-tb-split.Plo \ + ./$(DEPDIR)/libde265_encoder_algo_la-tb-transform.Plo am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -208,8 +222,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -227,8 +239,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -243,6 +256,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -401,8 +415,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -434,20 +448,26 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-algo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-interpartmode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-intra-inter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-intrapartmode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-mergeindex.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-skip.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-split.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-coding-options.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-ctb-qscale.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-pb-mv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-tb-intrapredmode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-tb-rateestim.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-tb-split.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-tb-transform.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-algo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-interpartmode.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-intra-inter.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-intrapartmode.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-mergeindex.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-skip.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-cb-split.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-coding-options.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-ctb-qscale.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-pb-mv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-tb-intrapredmode.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-tb-rateestim.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-tb-split.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_encoder_algo_la-tb-transform.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -625,8 +645,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -696,7 +718,20 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-algo.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-interpartmode.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-intra-inter.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-intrapartmode.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-mergeindex.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-skip.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-split.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-coding-options.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-ctb-qscale.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-pb-mv.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-tb-intrapredmode.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-tb-rateestim.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-tb-split.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-tb-transform.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -742,7 +777,20 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-algo.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-interpartmode.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-intra-inter.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-intrapartmode.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-mergeindex.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-skip.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-cb-split.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-coding-options.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-ctb-qscale.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-pb-mv.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-tb-intrapredmode.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-tb-rateestim.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-tb-split.Plo + -rm -f ./$(DEPDIR)/libde265_encoder_algo_la-tb-transform.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -763,16 +811,16 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am diff --git a/libde265/encoder/algo/coding-options.cc b/libde265/encoder/algo/coding-options.cc index 85db0f1..f42d1fa 100644 --- a/libde265/encoder/algo/coding-options.cc +++ b/libde265/encoder/algo/coding-options.cc @@ -110,7 +110,7 @@ void CodingOptions::start(enum RateEstimationMethod rateMethod) template void CodingOptions::compute_rdo_costs() { - for (int i=0;irate); mOptions[i].rdoCost = mOptions[i].mNode->distortion + mECtx->lambda * mOptions[i].mNode->rate; @@ -129,7 +129,7 @@ int CodingOptions::find_best_rdo_index() bool first=true; int bestRDO=-1; - for (int i=0;i::return_best_rdo_node() // delete all CBs except the best one - for (int i=0;i options(ectx, tb, ctxModel); std::vector > option; - for (int i=0;iwriteReconstructionToImage(img, sps); } diff --git a/libde265/encoder/encpicbuf.cc b/libde265/encoder/encpicbuf.cc index f84a151..fc60938 100644 --- a/libde265/encoder/encpicbuf.cc +++ b/libde265/encoder/encpicbuf.cc @@ -134,7 +134,7 @@ void image_data::set_references(int sps_index, // -1 -> custom //shdr.num_ref_idx_l1_active = l1.size(); assert(l0.size() < MAX_NUM_REF_PICS); - for (int i=0;istate < image_data::state_encoding) { return true; } @@ -257,7 +257,7 @@ bool encoder_picture_buffer::have_more_frames_to_encode() const image_data* encoder_picture_buffer::get_next_picture_to_encode() { - for (int i=0;istate < image_data::state_encoding) { return mImages[i]; } @@ -269,7 +269,7 @@ image_data* encoder_picture_buffer::get_next_picture_to_encode() const image_data* encoder_picture_buffer::get_picture(int frame_number) const { - for (int i=0;iframe_number == frame_number) return mImages[i]; } @@ -281,7 +281,7 @@ const image_data* encoder_picture_buffer::get_picture(int frame_number) const image_data* encoder_picture_buffer::get_picture(int frame_number) { - for (int i=0;iframe_number == frame_number) return mImages[i]; } @@ -293,7 +293,7 @@ image_data* encoder_picture_buffer::get_picture(int frame_number) bool encoder_picture_buffer::has_picture(int frame_number) const { - for (int i=0;iframe_number == frame_number) return true; } diff --git a/libde265/image.cc b/libde265/image.cc index 07e4a22..0ae7751 100644 --- a/libde265/image.cc +++ b/libde265/image.cc @@ -330,6 +330,14 @@ de265_error de265_image::alloc_image(int w,int h, enum de265_chroma c, int top = sps ? sps->conf_win_top_offset : 0; int bottom = sps ? sps->conf_win_bottom_offset : 0; + if ((left+right)*WinUnitX >= width) { + return DE265_ERROR_CODED_PARAMETER_OUT_OF_RANGE; + } + + if ((top+bottom)*WinUnitY >= height) { + return DE265_ERROR_CODED_PARAMETER_OUT_OF_RANGE; + } + width_confwin = width - (left+right)*WinUnitX; height_confwin= height- (top+bottom)*WinUnitY; chroma_width_confwin = chroma_width -left-right; @@ -445,7 +453,8 @@ de265_error de265_image::alloc_image(int w,int h, enum de265_chroma c, // CTB info - if (ctb_info.data_size != sps->PicSizeInCtbsY) + if (ctb_info.width_in_units != sps->PicWidthInCtbsY || + ctb_info.height_in_units != sps->PicHeightInCtbsY) { delete[] ctb_progress; @@ -510,7 +519,7 @@ void de265_image::release() // free slices - for (int i=0;i #include #include -#ifdef HAVE_STDBOOL_H -#include -#endif #include "libde265/de265.h" #include "libde265/sps.h" @@ -627,7 +624,14 @@ struct de265_image { enum IntraPredMode get_IntraPredMode(int x,int y) const { - return (enum IntraPredMode)intraPredMode.get(x,y); + uint8_t ipm = intraPredMode.get(x,y); + + // sanitize values if IPM is uninitialized (because of earlier read error) + if (ipm > 34) { + ipm = 0; + } + + return static_cast(ipm); } enum IntraPredMode get_IntraPredMode_atIndex(int idx) const @@ -712,6 +716,10 @@ struct de265_image { // address of first CTB in slice void set_SliceAddrRS(int ctbX, int ctbY, int SliceAddrRS) { + if (ctbX >= ctb_info.width_in_units || ctbY >= ctb_info.height_in_units) { + return; + } + int idx = ctbX + ctbY*ctb_info.width_in_units; ctb_info[idx].SliceAddrRS = SliceAddrRS; } diff --git a/libde265/motion.cc b/libde265/motion.cc index deae240..73b88eb 100644 --- a/libde265/motion.cc +++ b/libde265/motion.cc @@ -292,6 +292,19 @@ void generate_inter_prediction_samples(base_context* ctx, const pic_parameter_set* pps = shdr->pps.get(); const seq_parameter_set* sps = pps->sps.get(); + if (sps->BitDepth_Y != img->get_bit_depth(0) || + sps->BitDepth_C != img->get_bit_depth(1)) { + img->integrity = INTEGRITY_DECODING_ERRORS; + ctx->add_warning(DE265_WARNING_BIT_DEPTH_OF_CURRENT_IMAGE_DOES_NOT_MATCH_SPS, false); + return; + } + + if (sps->chroma_format_idc != img->get_chroma_format()) { + img->integrity = INTEGRITY_DECODING_ERRORS; + ctx->add_warning(DE265_WARNING_CHROMA_OF_CURRENT_IMAGE_DOES_NOT_MATCH_SPS, false); + return; + } + const int SubWidthC = sps->SubWidthC; const int SubHeightC = sps->SubHeightC; @@ -354,6 +367,21 @@ void generate_inter_prediction_samples(base_context* ctx, // TODO: fill predSamplesC with black or grey } + else if (refPic->get_width(0) != sps->pic_width_in_luma_samples || + refPic->get_height(0) != sps->pic_height_in_luma_samples || + img->get_chroma_format() != refPic->get_chroma_format()) { + img->integrity = INTEGRITY_DECODING_ERRORS; + ctx->add_warning(DE265_WARNING_REFERENCE_IMAGE_SIZE_DOES_NOT_MATCH_SPS, false); + } + else if (img->get_bit_depth(0) != refPic->get_bit_depth(0) || + img->get_bit_depth(1) != refPic->get_bit_depth(1)) { + img->integrity = INTEGRITY_DECODING_ERRORS; + ctx->add_warning(DE265_WARNING_REFERENCE_IMAGE_BIT_DEPTH_DOES_NOT_MATCH, false); + } + else if (img->get_chroma_format() != refPic->get_chroma_format()) { + img->integrity = INTEGRITY_DECODING_ERRORS; + ctx->add_warning(DE265_WARNING_REFERENCE_IMAGE_CHROMA_FORMAT_DOES_NOT_MATCH, false); + } else { // 8.5.3.2.2 @@ -376,21 +404,23 @@ void generate_inter_prediction_samples(base_context* ctx, refPic->get_luma_stride(), nPbW,nPbH, bit_depth_L); } - if (img->high_bit_depth(0)) { - mc_chroma(ctx, sps, vi->mv[l].x, vi->mv[l].y, xP,yP, - predSamplesC[0][l],nCS, (const uint16_t*)refPic->get_image_plane(1), - refPic->get_chroma_stride(), nPbW/SubWidthC,nPbH/SubHeightC, bit_depth_C); - mc_chroma(ctx, sps, vi->mv[l].x, vi->mv[l].y, xP,yP, - predSamplesC[1][l],nCS, (const uint16_t*)refPic->get_image_plane(2), - refPic->get_chroma_stride(), nPbW/SubWidthC,nPbH/SubHeightC, bit_depth_C); - } - else { - mc_chroma(ctx, sps, vi->mv[l].x, vi->mv[l].y, xP,yP, - predSamplesC[0][l],nCS, (const uint8_t*)refPic->get_image_plane(1), - refPic->get_chroma_stride(), nPbW/SubWidthC,nPbH/SubHeightC, bit_depth_C); - mc_chroma(ctx, sps, vi->mv[l].x, vi->mv[l].y, xP,yP, - predSamplesC[1][l],nCS, (const uint8_t*)refPic->get_image_plane(2), - refPic->get_chroma_stride(), nPbW/SubWidthC,nPbH/SubHeightC, bit_depth_C); + if (img->get_chroma_format() != de265_chroma_mono) { + if (img->high_bit_depth(1)) { + mc_chroma(ctx, sps, vi->mv[l].x, vi->mv[l].y, xP, yP, + predSamplesC[0][l], nCS, (const uint16_t*) refPic->get_image_plane(1), + refPic->get_chroma_stride(), nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + mc_chroma(ctx, sps, vi->mv[l].x, vi->mv[l].y, xP, yP, + predSamplesC[1][l], nCS, (const uint16_t*) refPic->get_image_plane(2), + refPic->get_chroma_stride(), nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + } + else { + mc_chroma(ctx, sps, vi->mv[l].x, vi->mv[l].y, xP, yP, + predSamplesC[0][l], nCS, (const uint8_t*) refPic->get_image_plane(1), + refPic->get_chroma_stride(), nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + mc_chroma(ctx, sps, vi->mv[l].x, vi->mv[l].y, xP, yP, + predSamplesC[1][l], nCS, (const uint8_t*) refPic->get_image_plane(2), + refPic->get_chroma_stride(), nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + } } } } @@ -441,12 +471,15 @@ void generate_inter_prediction_samples(base_context* ctx, if (predFlag[0]==1 && predFlag[1]==0) { ctx->acceleration.put_unweighted_pred(pixels[0], stride[0], predSamplesL[0],nCS, nPbW,nPbH, bit_depth_L); - ctx->acceleration.put_unweighted_pred(pixels[1], stride[1], - predSamplesC[0][0],nCS, - nPbW/SubWidthC,nPbH/SubHeightC, bit_depth_C); - ctx->acceleration.put_unweighted_pred(pixels[2], stride[2], - predSamplesC[1][0],nCS, - nPbW/SubWidthC,nPbH/SubHeightC, bit_depth_C); + + if (img->get_chroma_format() != de265_chroma_mono) { + ctx->acceleration.put_unweighted_pred(pixels[1], stride[1], + predSamplesC[0][0], nCS, + nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + ctx->acceleration.put_unweighted_pred(pixels[2], stride[2], + predSamplesC[1][0], nCS, + nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + } } else { ctx->add_warning(DE265_WARNING_BOTH_PREDFLAGS_ZERO, false); @@ -476,12 +509,14 @@ void generate_inter_prediction_samples(base_context* ctx, ctx->acceleration.put_weighted_pred(pixels[0], stride[0], predSamplesL[0],nCS, nPbW,nPbH, luma_w0, luma_o0, luma_log2WD, bit_depth_L); - ctx->acceleration.put_weighted_pred(pixels[1], stride[1], - predSamplesC[0][0],nCS, nPbW/SubWidthC,nPbH/SubHeightC, - chroma0_w0, chroma0_o0, chroma_log2WD, bit_depth_C); - ctx->acceleration.put_weighted_pred(pixels[2], stride[2], - predSamplesC[1][0],nCS, nPbW/SubWidthC,nPbH/SubHeightC, - chroma1_w0, chroma1_o0, chroma_log2WD, bit_depth_C); + if (img->get_chroma_format() != de265_chroma_mono) { + ctx->acceleration.put_weighted_pred(pixels[1], stride[1], + predSamplesC[0][0], nCS, nPbW / SubWidthC, nPbH / SubHeightC, + chroma0_w0, chroma0_o0, chroma_log2WD, bit_depth_C); + ctx->acceleration.put_weighted_pred(pixels[2], stride[2], + predSamplesC[1][0], nCS, nPbW / SubWidthC, nPbH / SubHeightC, + chroma1_w0, chroma1_o0, chroma_log2WD, bit_depth_C); + } } else { ctx->add_warning(DE265_WARNING_BOTH_PREDFLAGS_ZERO, false); @@ -508,12 +543,14 @@ void generate_inter_prediction_samples(base_context* ctx, int16_t* in10 = predSamplesC[1][0]; int16_t* in11 = predSamplesC[1][1]; - ctx->acceleration.put_weighted_pred_avg(pixels[1], stride[1], - in00,in01, nCS, - nPbW/SubWidthC, nPbH/SubHeightC, bit_depth_C); - ctx->acceleration.put_weighted_pred_avg(pixels[2], stride[2], - in10,in11, nCS, - nPbW/SubWidthC, nPbH/SubHeightC, bit_depth_C); + if (img->get_chroma_format() != de265_chroma_mono) { + ctx->acceleration.put_weighted_pred_avg(pixels[1], stride[1], + in00, in01, nCS, + nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + ctx->acceleration.put_weighted_pred_avg(pixels[2], stride[2], + in10, in11, nCS, + nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + } } else { // weighted prediction @@ -555,16 +592,18 @@ void generate_inter_prediction_samples(base_context* ctx, int16_t* in10 = predSamplesC[1][0]; int16_t* in11 = predSamplesC[1][1]; - ctx->acceleration.put_weighted_bipred(pixels[1], stride[1], - in00,in01, nCS, nPbW/SubWidthC, nPbH/SubHeightC, - chroma0_w0,chroma0_o0, - chroma0_w1,chroma0_o1, - chroma_log2WD, bit_depth_C); - ctx->acceleration.put_weighted_bipred(pixels[2], stride[2], - in10,in11, nCS, nPbW/SubWidthC, nPbH/SubHeightC, - chroma1_w0,chroma1_o0, - chroma1_w1,chroma1_o1, - chroma_log2WD, bit_depth_C); + if (img->get_chroma_format() != de265_chroma_mono) { + ctx->acceleration.put_weighted_bipred(pixels[1], stride[1], + in00, in01, nCS, nPbW / SubWidthC, nPbH / SubHeightC, + chroma0_w0, chroma0_o0, + chroma0_w1, chroma0_o1, + chroma_log2WD, bit_depth_C); + ctx->acceleration.put_weighted_bipred(pixels[2], stride[2], + in10, in11, nCS, nPbW / SubWidthC, nPbH / SubHeightC, + chroma1_w0, chroma1_o0, + chroma1_w1, chroma1_o1, + chroma_log2WD, bit_depth_C); + } } } else if (predFlag[0]==1 || predFlag[1]==1) { @@ -573,12 +612,15 @@ void generate_inter_prediction_samples(base_context* ctx, if (pps->weighted_bipred_flag==0) { ctx->acceleration.put_unweighted_pred(pixels[0], stride[0], predSamplesL[l],nCS, nPbW,nPbH, bit_depth_L); - ctx->acceleration.put_unweighted_pred(pixels[1], stride[1], - predSamplesC[0][l],nCS, - nPbW/SubWidthC,nPbH/SubHeightC, bit_depth_C); - ctx->acceleration.put_unweighted_pred(pixels[2], stride[2], - predSamplesC[1][l],nCS, - nPbW/SubWidthC,nPbH/SubHeightC, bit_depth_C); + + if (img->get_chroma_format() != de265_chroma_mono) { + ctx->acceleration.put_unweighted_pred(pixels[1], stride[1], + predSamplesC[0][l], nCS, + nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + ctx->acceleration.put_unweighted_pred(pixels[2], stride[2], + predSamplesC[1][l], nCS, + nPbW / SubWidthC, nPbH / SubHeightC, bit_depth_C); + } } else { int refIdx = vi->refIdx[l]; @@ -599,14 +641,17 @@ void generate_inter_prediction_samples(base_context* ctx, ctx->acceleration.put_weighted_pred(pixels[0], stride[0], predSamplesL[l],nCS, nPbW,nPbH, luma_w, luma_o, luma_log2WD, bit_depth_L); - ctx->acceleration.put_weighted_pred(pixels[1], stride[1], - predSamplesC[0][l],nCS, - nPbW/SubWidthC,nPbH/SubHeightC, - chroma0_w, chroma0_o, chroma_log2WD, bit_depth_C); - ctx->acceleration.put_weighted_pred(pixels[2], stride[2], - predSamplesC[1][l],nCS, - nPbW/SubWidthC,nPbH/SubHeightC, - chroma1_w, chroma1_o, chroma_log2WD, bit_depth_C); + + if (img->get_chroma_format() != de265_chroma_mono) { + ctx->acceleration.put_weighted_pred(pixels[1], stride[1], + predSamplesC[0][l], nCS, + nPbW / SubWidthC, nPbH / SubHeightC, + chroma0_w, chroma0_o, chroma_log2WD, bit_depth_C); + ctx->acceleration.put_weighted_pred(pixels[2], stride[2], + predSamplesC[1][l], nCS, + nPbW / SubWidthC, nPbH / SubHeightC, + chroma1_w, chroma1_o, chroma_log2WD, bit_depth_C); + } } } else { @@ -1211,6 +1256,16 @@ void derive_collocated_motion_vectors(base_context* ctx, + int slice_hdr_idx = colImg->get_SliceHeaderIndex(xColPb,yColPb); + if (slice_hdr_idx >= colImg->slices.size()) { + ctx->add_warning(DE265_WARNING_INVALID_SLICE_HEADER_INDEX_ACCESS, false); + + *out_availableFlagLXCol = 0; + out_mvLXCol->x = 0; + out_mvLXCol->y = 0; + return; + } + const slice_segment_header* colShdr = colImg->slices[ colImg->get_SliceHeaderIndex(xColPb,yColPb) ]; if (shdr->LongTermRefPic[X][refIdxLX] != @@ -1591,6 +1646,17 @@ void derive_spatial_luma_vector_prediction(base_context* ctx, uint8_t out_availableFlagLXN[2], MotionVector out_mvLXN[2]) { + if (refIdxLX >= MAX_NUM_REF_PICS) { + ctx->add_warning(DE265_WARNING_INCORRECT_MOTION_VECTOR_SCALING, false); + img->integrity = INTEGRITY_DECODING_ERRORS; + + out_availableFlagLXN[0] = false; + out_availableFlagLXN[1] = false; + out_mvLXN[0] = MotionVector(); + out_mvLXN[1] = MotionVector(); + return; + } + int isScaledFlagLX = 0; const int A=0; @@ -1638,6 +1704,7 @@ void derive_spatial_luma_vector_prediction(base_context* ctx, const int referenced_POC = tmpimg->PicOrderCntVal; for (int k=0;k<=1;k++) { + if (availableA[k] && out_availableFlagLXN[A]==0 && // no A?-predictor so far img->get_pred_mode(xA[k],yA[k]) != MODE_INTRA) { @@ -1649,9 +1716,24 @@ void derive_spatial_luma_vector_prediction(base_context* ctx, logmvcand(vi); const de265_image* imgX = NULL; - if (vi.predFlag[X]) imgX = ctx->get_image(shdr->RefPicList[X][ vi.refIdx[X] ]); + if (vi.predFlag[X]) { + // check for input data validity + if (vi.refIdx[X]<0 || vi.refIdx[X] >= MAX_NUM_REF_PICS) { + return; + } + + imgX = ctx->get_image(shdr->RefPicList[X][ vi.refIdx[X] ]); + } + const de265_image* imgY = NULL; - if (vi.predFlag[Y]) imgY = ctx->get_image(shdr->RefPicList[Y][ vi.refIdx[Y] ]); + if (vi.predFlag[Y]) { + // check for input data validity + if (vi.refIdx[Y]<0 || vi.refIdx[Y] >= MAX_NUM_REF_PICS) { + return; + } + + imgY = ctx->get_image(shdr->RefPicList[Y][ vi.refIdx[Y] ]); + } // check whether the predictor X is available and references the same POC if (vi.predFlag[X] && imgX && imgX->PicOrderCntVal == referenced_POC) { @@ -1747,7 +1829,6 @@ void derive_spatial_luma_vector_prediction(base_context* ctx, } } - // --- B --- // 1. @@ -1782,11 +1863,23 @@ void derive_spatial_luma_vector_prediction(base_context* ctx, logtrace(LogMotion,"MVP B%d=\n",k); logmvcand(vi); - const de265_image* imgX = NULL; - if (vi.predFlag[X]) imgX = ctx->get_image(shdr->RefPicList[X][ vi.refIdx[X] ]); + if (vi.predFlag[X]) { + if (vi.refIdx[X] < 0 || vi.refIdx[X] >= MAX_NUM_REF_PICS) { + return; + } + + imgX = ctx->get_image(shdr->RefPicList[X][ vi.refIdx[X] ]); + } + const de265_image* imgY = NULL; - if (vi.predFlag[Y]) imgY = ctx->get_image(shdr->RefPicList[Y][ vi.refIdx[Y] ]); + if (vi.predFlag[Y]) { + if (vi.refIdx[Y] < 0 || vi.refIdx[Y] >= MAX_NUM_REF_PICS) { + return; + } + + imgY = ctx->get_image(shdr->RefPicList[Y][ vi.refIdx[Y] ]); + } if (vi.predFlag[X] && imgX && imgX->PicOrderCntVal == referenced_POC) { logtrace(LogMotion,"a) take B%d/L%d as B candidate with same POC\n",k,X); @@ -1835,6 +1928,12 @@ void derive_spatial_luma_vector_prediction(base_context* ctx, const PBMotion& vi = img->get_mv_info(xB[k],yB[k]); + if (vi.refIdx[X] >= MAX_NUM_REF_PICS) { + img->integrity = INTEGRITY_DECODING_ERRORS; + ctx->add_warning(DE265_WARNING_NONEXISTING_REFERENCE_PICTURE_ACCESSED, false); + return; // error // TODO: we actually should make sure that this is never set to an out-of-range value + } + if (vi.predFlag[X]==1 && shdr->LongTermRefPic[X][refIdxLX] == shdr->LongTermRefPic[X][ vi.refIdx[X] ]) { out_availableFlagLXN[B]=1; @@ -2044,6 +2143,14 @@ void motion_vectors_and_ref_indices(base_context* ctx, (inter_pred_idc == PRED_L1 && l==1)) { out_vi->refIdx[l] = motion.refIdx[l]; out_vi->predFlag[l] = 1; + + if (motion.refIdx[l] >= MAX_NUM_REF_PICS) { + out_vi->refIdx[l] = 0; + + img->integrity = INTEGRITY_DECODING_ERRORS; + ctx->add_warning(DE265_WARNING_NONEXISTING_REFERENCE_PICTURE_ACCESSED, false); + return; + } } else { out_vi->refIdx[l] = -1; diff --git a/libde265/nal-parser.cc b/libde265/nal-parser.cc index ea95ed1..d2a1d5d 100644 --- a/libde265/nal-parser.cc +++ b/libde265/nal-parser.cc @@ -181,7 +181,7 @@ NAL_Parser::~NAL_Parser() // free all NALs in free-list - for (int i=0;i -#ifdef HAVE_STDBOOL_H -#include -#endif #include "libde265/bitstream.h" #include "libde265/cabac.h" diff --git a/libde265/refpic.cc b/libde265/refpic.cc index 5d19426..77cc719 100644 --- a/libde265/refpic.cc +++ b/libde265/refpic.cc @@ -416,7 +416,7 @@ void dump_compact_short_term_ref_pic_set(const ref_pic_set* set, int range, FILE for (int i=set->NumNegativePics-1;i>=0;i--) { int n = set->DeltaPocS0[i]; - if (n>=-range) { + if (n>=-range && n<=range) { if (set->UsedByCurrPicS0[i]) log[n+range] = 'X'; else log[n+range] = 'o'; } else { log2fh(fh,"*%d%c ",n, set->UsedByCurrPicS0[i] ? 'X':'o'); } @@ -424,7 +424,7 @@ void dump_compact_short_term_ref_pic_set(const ref_pic_set* set, int range, FILE for (int i=set->NumPositivePics-1;i>=0;i--) { int n = set->DeltaPocS1[i]; - if (n<=range) { + if (n>=-range && n<=range) { if (set->UsedByCurrPicS1[i]) log[n+range] = 'X'; else log[n+range] = 'o'; } else { log2fh(fh,"*%d%c ",n, set->UsedByCurrPicS1[i] ? 'X':'o'); } diff --git a/libde265/sao.cc b/libde265/sao.cc index f93fc02..1b88a10 100644 --- a/libde265/sao.cc +++ b/libde265/sao.cc @@ -217,7 +217,14 @@ void apply_sao_internal(de265_image* img, int xCtb,int yCtb, if (bandShift >= 8) { bandIdx = 0; } else { - bandIdx = bandTable[ in_img[xC+i+(yC+j)*in_stride]>>bandShift ]; + int pixel = in_img[xC+i+(yC+j)*in_stride]; + + // Note: the input pixel value should never exceed the valid range, but it seems that it still does, + // maybe when there was a decoding error and the pixels have not been filled in correctly. + // Thus, we have to limit the pixel range to ensure that we have no illegal table access. + pixel = Clip3(0,maxPixelValue, pixel); + + bandIdx = bandTable[ pixel>>bandShift ]; } if (bandIdx>0) { @@ -245,7 +252,14 @@ void apply_sao_internal(de265_image* img, int xCtb,int yCtb, if (bandShift >= 8) { bandIdx = 0; } else { - bandIdx = bandTable[ in_img[xC+i+(yC+j)*in_stride]>>bandShift ]; + int pixel = in_img[xC+i+(yC+j)*in_stride]; + + // Note: the input pixel value should never exceed the valid range, but it seems that it still does, + // maybe when there was a decoding error and the pixels have not been filled in correctly. + // Thus, we have to limit the pixel range to ensure that we have no illegal table access. + pixel = Clip3(0,maxPixelValue, pixel); + + bandIdx = bandTable[ pixel>>bandShift ]; } if (bandIdx>0) { @@ -353,7 +367,10 @@ void apply_sample_adaptive_offset_sequential(de265_image* img) for (int xCtb=0; xCtbget_SliceHeaderCtb(xCtb,yCtb); - if (shdr==NULL) { return; } + if (shdr==NULL) { + delete[] inputCopy; + return; + } if (cIdx==0 && shdr->slice_sao_luma_flag) { apply_sao(img, xCtb,yCtb, shdr, 0, 1< DE265_MAX_PPS_SETS || + if (slice_pic_parameter_set_id >= DE265_MAX_PPS_SETS || slice_pic_parameter_set_id == UVLC_ERROR) { ctx->add_warning(DE265_WARNING_NONEXISTING_PPS_REFERENCED, false); return DE265_OK; @@ -1277,14 +1277,23 @@ void slice_segment_header::dump_slice_segment_header(const decoder_context* ctx, #define LOG3(t,d1,d2,d3) log2fh(fh, t,d1,d2,d3) #define LOG4(t,d1,d2,d3,d4) log2fh(fh, t,d1,d2,d3,d4) + LOG0("----------------- SLICE -----------------\n"); + const pic_parameter_set* pps = ctx->get_pps(slice_pic_parameter_set_id); + if (!pps) { + LOG0("invalid PPS referenced\n"); + return; + } assert(pps->pps_read); // TODO: error handling const seq_parameter_set* sps = ctx->get_sps((int)pps->seq_parameter_set_id); + if (!sps) { + LOG0("invalid SPS referenced\n"); + return; + } assert(sps->sps_read); // TODO: error handling - LOG0("----------------- SLICE -----------------\n"); LOG1("first_slice_segment_in_pic_flag : %d\n", first_slice_segment_in_pic_flag); if (ctx->get_nal_unit_type() >= NAL_UNIT_BLA_W_LP && ctx->get_nal_unit_type() <= NAL_UNIT_RESERVED_IRAP_VCL23) { @@ -2573,6 +2582,11 @@ static int decode_rqt_root_cbf(thread_context* tctx) static int decode_ref_idx_lX(thread_context* tctx, int numRefIdxLXActive) { + // prevent endless loop when 'numRefIdxLXActive' is invalid + if (numRefIdxLXActive <= 1) { + return 0; + } + logtrace(LogSlice,"# ref_idx_lX\n"); int cMax = numRefIdxLXActive-1; @@ -3387,7 +3401,7 @@ int residual_coding(thread_context* tctx, } if (pps.sign_data_hiding_flag && signHidden) { - sumAbsLevel += baseLevel + coeff_abs_level_remaining; + sumAbsLevel += currCoeff; if (n==nCoefficients-1 && (sumAbsLevel & 1)) { currCoeff = -currCoeff; @@ -4174,6 +4188,11 @@ void read_pcm_samples_internal(thread_context* tctx, int x0, int y0, int log2CbS int shift = bitDepth - nPcmBits; + // a shift < 0 may result when the SPS sequence header is broken + if (shift < 0) { + shift=0; + } + for (int y=0;y bit_depth_luma) { + errqueue->add_warning(DE265_WARNING_PCM_BITDEPTH_TOO_LARGE, false); + return DE265_ERROR_CODED_PARAMETER_OUT_OF_RANGE; + } + + if (pcm_sample_bit_depth_chroma > bit_depth_chroma) { + errqueue->add_warning(DE265_WARNING_PCM_BITDEPTH_TOO_LARGE, false); + return DE265_ERROR_CODED_PARAMETER_OUT_OF_RANGE; + } } else { pcm_sample_bit_depth_luma = 0; @@ -425,7 +435,10 @@ de265_error seq_parameter_set::read(error_queue* errqueue, bitreader* br) vui_parameters_present_flag = get_bits(br,1); if (vui_parameters_present_flag) { - vui.read(errqueue, br, this); + de265_error err = vui.read(errqueue, br, this); + if (err) { + return err; + } } @@ -709,7 +722,7 @@ void seq_parameter_set::dump(int fd) const LOG1("num_short_term_ref_pic_sets : %d\n", ref_pic_sets.size()); - for (int i = 0; i < ref_pic_sets.size(); i++) { + for (size_t i = 0; i < ref_pic_sets.size(); i++) { LOG1("ref_pic_set[ %2d ]: ",i); dump_compact_short_term_ref_pic_set(&ref_pic_sets[i], 16, fh); } @@ -873,24 +886,31 @@ de265_error read_scaling_list(bitreader* br, const seq_parameter_set* sps, int dc_coeff[4][6]; for (int sizeId=0;sizeId<4;sizeId++) { - int n = ((sizeId==3) ? 2 : 6); + //int n = ((sizeId==3) ? 2 : 6); uint8_t scaling_list[6][32*32]; - for (int matrixId=0;matrixId matrixId) { + + if (scaling_list_pred_matrix_id_delta == UVLC_ERROR) { + return DE265_ERROR_CODED_PARAMETER_OUT_OF_RANGE; + } + + if (sizeId == 3) { + // adapt to our changed matrixId for size 3 + scaling_list_pred_matrix_id_delta *= 3; + } + + if (scaling_list_pred_matrix_id_delta > matrixId) { return DE265_ERROR_CODED_PARAMETER_OUT_OF_RANGE; } @@ -904,15 +924,14 @@ de265_error read_scaling_list(bitreader* br, const seq_parameter_set* sps, memcpy(curr_scaling_list, default_ScalingList_4x4, 16); } else { - if (canonicalMatrixId<3) + if (matrixId<3) { memcpy(curr_scaling_list, default_ScalingList_8x8_intra,64); } else { memcpy(curr_scaling_list, default_ScalingList_8x8_inter,64); } } } else { - // TODO: CHECK: for sizeID=3 and the second matrix, should we have delta=1 or delta=3 ? - if (sizeId==3) { assert(scaling_list_pred_matrix_id_delta==1); } + if (sizeId==3) { assert(scaling_list_pred_matrix_id_delta==3); } int mID = matrixId - scaling_list_pred_matrix_id_delta; @@ -982,6 +1001,27 @@ de265_error read_scaling_list(bitreader* br, const seq_parameter_set* sps, } } + + // --- fill 32x32 matrices for chroma + + const position* scan = get_scan_order(3, 0 /* diag */); + + for (int matrixId=0;matrixId<6;matrixId++) + if (matrixId!=0 && matrixId!=3) { + for (int i=0;i<64;i++) { + int x = scan[i].x; + int y = scan[i].y; + int v = sclist->ScalingFactor_Size1[matrixId][y][x]; + + for (int dy=0;dy<4;dy++) + for (int dx=0;dx<4;dx++) { + sclist->ScalingFactor_Size3[matrixId][4*y+dy][4*x+dx] = v; + } + } + + sclist->ScalingFactor_Size3[matrixId][0][0] = sclist->ScalingFactor_Size1[matrixId][0][0]; + } + return DE265_OK; } diff --git a/libde265/sps.h b/libde265/sps.h index b06151d..9759bae 100644 --- a/libde265/sps.h +++ b/libde265/sps.h @@ -35,9 +35,9 @@ class error_queue; // #define MAX_REF_PIC_SETS 64 // maximum according to standard #define MAX_NUM_LT_REF_PICS_SPS 32 -// this is just a safety range -#define MAX_PICTURE_WIDTH 70000 -#define MAX_PICTURE_HEIGHT 70000 +// This is just a safety range. It is chosen such that width/height fits into 16bit integers and the total number of pixels in 32bit integers. +#define MAX_PICTURE_WIDTH 65535 +#define MAX_PICTURE_HEIGHT 65535 enum { CHROMA_MONO = 0, @@ -54,7 +54,7 @@ typedef struct scaling_list_data { uint8_t ScalingFactor_Size0[6][4][4]; uint8_t ScalingFactor_Size1[6][8][8]; uint8_t ScalingFactor_Size2[6][16][16]; - uint8_t ScalingFactor_Size3[2][32][32]; + uint8_t ScalingFactor_Size3[6][32][32]; } scaling_list_data; @@ -210,7 +210,7 @@ class seq_parameter_set { int PicHeightInCtbsY; int PicSizeInMinCbsY; int PicSizeInCtbsY; - int PicSizeInSamplesY; + uint32_t PicSizeInSamplesY; int CtbWidthC, CtbHeightC; diff --git a/libde265/threads.h b/libde265/threads.h index 2c743bc..ad4e472 100644 --- a/libde265/threads.h +++ b/libde265/threads.h @@ -27,10 +27,6 @@ #include "config.h" #endif -#ifdef HAVE_STDBOOL_H -#include -#endif - #include #include #include diff --git a/libde265/transform.cc b/libde265/transform.cc index ef404f8..cf07460 100644 --- a/libde265/transform.cc +++ b/libde265/transform.cc @@ -504,10 +504,8 @@ void scale_coefficients_internal(thread_context* tctx, for (int i=0;inCoeff[cIdx];i++) { int pos = tctx->coeffPos[cIdx][i]; - int x = pos%nT; - int y = pos/nT; - const int m_x_y = sclist[x+y*nT]; + const int m_x_y = sclist[pos]; const int fact = m_x_y * levelScale[qP%6] << (qP/6); int64_t currCoeff = tctx->coeffList[cIdx][i]; diff --git a/libde265/vps.cc b/libde265/vps.cc index 188e518..8bfab9c 100644 --- a/libde265/vps.cc +++ b/libde265/vps.cc @@ -489,7 +489,7 @@ void video_parameter_set::dump(int fd) const for (int j=0; j <= vps_max_layer_id; j++) { LOG3("layer_id_included_flag[%d][%d] = %d\n",i,j, - layer_id_included_flag[i][j]); + int(layer_id_included_flag[i][j])); } LOG1("vps_timing_info_present_flag = %d\n", diff --git a/libde265/vps.h b/libde265/vps.h index 04c9c15..5b94cfd 100644 --- a/libde265/vps.h +++ b/libde265/vps.h @@ -25,10 +25,6 @@ #include #endif -#ifdef HAVE_STDBOOL_H -#include -#endif - #include "libde265/bitstream.h" #include "libde265/de265.h" #include "libde265/cabac.h" diff --git a/libde265/vui.cc b/libde265/vui.cc index b5f46ac..76086ff 100644 --- a/libde265/vui.cc +++ b/libde265/vui.cc @@ -201,6 +201,9 @@ de265_error video_usability_information::hrd_parameters(error_queue* errqueue, b if (!low_delay_hrd_flag[i]) { READ_VLC_OFFSET(cpb_cnt_minus1[i], uvlc, 0); + if (cpb_cnt_minus1[i] > 31) { + return DE265_ERROR_CODED_PARAMETER_OUT_OF_RANGE; + } } for (nalOrVcl = 0; nalOrVcl < 2; nalOrVcl++) @@ -361,6 +364,9 @@ de265_error video_usability_information::read(error_queue* errqueue, bitreader* if (vui_hrd_parameters_present_flag) { de265_error err; err = hrd_parameters(errqueue, br, sps); + if (err) { + return err; + } } } diff --git a/libde265/x86/Makefile.in b/libde265/x86/Makefile.in index 0d9f3b9..58314e1 100644 --- a/libde265/x86/Makefile.in +++ b/libde265/x86/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,10 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libde265_x86_la-sse.Plo \ + ./$(DEPDIR)/libde265_x86_sse_la-sse-dct.Plo \ + ./$(DEPDIR)/libde265_x86_sse_la-sse-motion.Plo am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -204,8 +207,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -223,8 +224,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -239,6 +241,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -389,8 +392,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -425,9 +428,15 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_x86_la-sse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_x86_sse_la-sse-dct.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_x86_sse_la-sse-motion.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_x86_la-sse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_x86_sse_la-sse-dct.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libde265_x86_sse_la-sse-motion.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -528,8 +537,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -599,7 +610,9 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libde265_x86_la-sse.Plo + -rm -f ./$(DEPDIR)/libde265_x86_sse_la-sse-dct.Plo + -rm -f ./$(DEPDIR)/libde265_x86_sse_la-sse-motion.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -645,7 +658,9 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/libde265_x86_la-sse.Plo + -rm -f ./$(DEPDIR)/libde265_x86_sse_la-sse-dct.Plo + -rm -f ./$(DEPDIR)/libde265_x86_sse_la-sse-motion.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -666,16 +681,16 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am diff --git a/ltmain.sh b/ltmain.sh index a736cf9..0cb7f90 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-2" +VERSION="2.4.6 Debian-2.4.6-14" package_revision=2.4.6 @@ -387,7 +387,7 @@ EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -1370,7 +1370,7 @@ func_lt_ver () #! /bin/sh # Set a version string for this script. -scriptversion=2014-01-07.03; # UTC +scriptversion=2015-10-07.11; # UTC # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 @@ -1530,6 +1530,8 @@ func_run_hooks () { $debug_cmd + _G_rc_run_hooks=false + case " $hookable_fns " in *" $1 "*) ;; *) func_fatal_error "'$1' does not support hook funcions.n" ;; @@ -1538,16 +1540,16 @@ func_run_hooks () eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - eval $_G_hook '"$@"' - - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift + if eval $_G_hook '"$@"'; then + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + _G_rc_run_hooks=: + fi done - func_quote_for_eval ${1+"$@"} - func_run_hooks_result=$func_quote_for_eval_result + $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result } @@ -1557,10 +1559,16 @@ func_run_hooks () ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, remove any -# options that you action, and then pass back the remaining unprocessed +# full positional parameter list in your hook function, you may remove/edit +# any options that you action, and then pass back the remaining unprocessed # options in '_result', escaped suitably for -# 'eval'. Like this: +# 'eval'. In this case you also must return $EXIT_SUCCESS to let the +# hook's caller know that it should pay attention to +# '_result'. Returning $EXIT_FAILURE signalizes that +# arguments are left untouched by the hook and therefore caller will ignore the +# result variable. +# +# Like this: # # my_options_prep () # { @@ -1570,9 +1578,11 @@ func_run_hooks () # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# -# func_quote_for_eval ${1+"$@"} -# my_options_prep_result=$func_quote_for_eval_result +# # No change in '$@' (ignored completely by this hook). There is +# # no need to do the equivalent (but slower) action: +# # func_quote_for_eval ${1+"$@"} +# # my_options_prep_result=$func_quote_for_eval_result +# false # } # func_add_hook func_options_prep my_options_prep # @@ -1581,25 +1591,37 @@ func_run_hooks () # { # $debug_cmd # +# args_changed=false +# # # Note that for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do # opt=$1; shift # case $opt in -# --silent|-s) opt_silent=: ;; +# --silent|-s) opt_silent=: +# args_changed=: +# ;; # # Separate non-argument short options: # -s*) func_split_short_opt "$_G_opt" # set dummy "$func_split_short_opt_name" \ # "-$func_split_short_opt_arg" ${1+"$@"} # shift +# args_changed=: # ;; -# *) set dummy "$_G_opt" "$*"; shift; break ;; +# *) # Make sure the first unrecognised option "$_G_opt" +# # is added back to "$@", we could need that later +# # if $args_changed is true. +# set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result +# if $args_changed; then +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# fi +# +# $args_changed # } # func_add_hook func_parse_options my_silent_option # @@ -1611,16 +1633,32 @@ func_run_hooks () # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." # -# func_quote_for_eval ${1+"$@"} -# my_option_validation_result=$func_quote_for_eval_result +# false # } # func_add_hook func_validate_options my_option_validation # -# You'll alse need to manually amend $usage_message to reflect the extra +# You'll also need to manually amend $usage_message to reflect the extra # options you parse. It's preferable to append if you can, so that # multiple option parsing hooks can be added safely. +# func_options_finish [ARG]... +# ---------------------------- +# Finishing the option parse loop (call 'func_options' hooks ATM). +func_options_finish () +{ + $debug_cmd + + _G_func_options_finish_exit=false + if func_run_hooks func_options ${1+"$@"}; then + func_options_finish_result=$func_run_hooks_result + _G_func_options_finish_exit=: + fi + + $_G_func_options_finish_exit +} + + # func_options [ARG]... # --------------------- # All the functions called inside func_options are hookable. See the @@ -1630,17 +1668,28 @@ func_options () { $debug_cmd - func_options_prep ${1+"$@"} - eval func_parse_options \ - ${func_options_prep_result+"$func_options_prep_result"} - eval func_validate_options \ - ${func_parse_options_result+"$func_parse_options_result"} + _G_rc_options=false - eval func_run_hooks func_options \ - ${func_validate_options_result+"$func_validate_options_result"} + for my_func in options_prep parse_options validate_options options_finish + do + if eval func_$my_func '${1+"$@"}'; then + eval _G_res_var='$'"func_${my_func}_result" + eval set dummy "$_G_res_var" ; shift + _G_rc_options=: + fi + done + + # Save modified positional parameters for caller. As a top-level + # options-parser function we always need to set the 'func_options_result' + # variable (regardless the $_G_rc_options value). + if $_G_rc_options; then + func_options_result=$_G_res_var + else + func_quote_for_eval ${1+"$@"} + func_options_result=$func_quote_for_eval_result + fi - # save modified positional parameters for caller - func_options_result=$func_run_hooks_result + $_G_rc_options } @@ -1649,9 +1698,9 @@ func_options () # All initialisations required before starting the option parse loop. # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and -# needs to propogate that back to rest of this script, then the complete +# needs to propagate that back to rest of this script, then the complete # modified list must be put in 'func_run_hooks_result' before -# returning. +# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). func_hookable func_options_prep func_options_prep () { @@ -1661,10 +1710,14 @@ func_options_prep () opt_verbose=false opt_warning_types= - func_run_hooks func_options_prep ${1+"$@"} + _G_rc_options_prep=false + if func_run_hooks func_options_prep ${1+"$@"}; then + _G_rc_options_prep=: + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result + fi - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result + $_G_rc_options_prep } @@ -1678,18 +1731,20 @@ func_parse_options () func_parse_options_result= + _G_rc_parse_options=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. - func_run_hooks func_parse_options ${1+"$@"} - - # Adjust func_parse_options positional parameters to match - eval set dummy "$func_run_hooks_result"; shift + if func_run_hooks func_parse_options ${1+"$@"}; then + eval set dummy "$func_run_hooks_result"; shift + _G_rc_parse_options=: + fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break + _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -1704,7 +1759,10 @@ func_parse_options () ;; --warnings|--warning|-W) - test $# = 0 && func_missing_arg $_G_opt && break + if test $# = 0 && func_missing_arg $_G_opt; then + _G_rc_parse_options=: + break + fi case " $warning_categories $1" in *" $1 "*) # trailing space prevents matching last $1 above @@ -1757,15 +1815,25 @@ func_parse_options () shift ;; - --) break ;; + --) _G_rc_parse_options=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift + _G_match_parse_options=false + break + ;; esac + + $_G_match_parse_options && _G_rc_parse_options=: done - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + + if $_G_rc_parse_options; then + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result + fi + + $_G_rc_parse_options } @@ -1778,16 +1846,21 @@ func_validate_options () { $debug_cmd + _G_rc_validate_options=false + # Display all warnings if -W was not given. test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - func_run_hooks func_validate_options ${1+"$@"} + if func_run_hooks func_validate_options ${1+"$@"}; then + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result + _G_rc_validate_options=: + fi # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result + $_G_rc_validate_options } @@ -2068,7 +2141,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-2 + version: $progname $scriptversion Debian-2.4.6-14 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2270,6 +2343,8 @@ libtool_options_prep () nonopt= preserve_args= + _G_rc_lt_options_prep=: + # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2293,11 +2368,18 @@ libtool_options_prep () uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) shift; set dummy --mode uninstall ${1+"$@"}; shift ;; + *) + _G_rc_lt_options_prep=false + ;; esac - # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result + if $_G_rc_lt_options_prep; then + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result + fi + + $_G_rc_lt_options_prep } func_add_hook func_options_prep libtool_options_prep @@ -2309,9 +2391,12 @@ libtool_parse_options () { $debug_cmd + _G_rc_lt_parse_options=false + # Perform our own loop to consume as many options as possible in # each iteration. while test $# -gt 0; do + _G_match_lt_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -2386,15 +2471,22 @@ libtool_parse_options () func_append preserve_args " $_G_opt" ;; - # An option not handled by this hook function: - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"} ; shift + _G_match_lt_parse_options=false + break + ;; esac + $_G_match_lt_parse_options && _G_rc_lt_parse_options=: done + if $_G_rc_lt_parse_options; then + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result + fi - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result + $_G_rc_lt_parse_options } func_add_hook func_parse_options libtool_parse_options @@ -7275,10 +7367,13 @@ func_mode_link () # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang # -fsanitize=* Clang/GCC memory and address sanitizer + # -fuse-ld=* Linker select flags for GCC + # -static-* direct GCC to link specific libraries statically + # -fcilkplus Cilk Plus language extension features for C/C++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*) + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff --git a/m4/libtool.m4 b/m4/libtool.m4 index ee80844..a6d21ae 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1492,7 +1492,7 @@ need_locks=$enable_libtool_lock m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) @@ -4063,7 +4063,8 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -4703,6 +4704,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -6438,7 +6445,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -6813,7 +6820,7 @@ if test yes != "$_lt_caught_CXX_error"; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6878,7 +6885,7 @@ if test yes != "$_lt_caught_CXX_error"; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -7217,7 +7224,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -7301,7 +7308,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7312,7 +7319,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' diff --git a/m4/visibility.m4 b/m4/visibility.m4 new file mode 100644 index 0000000..2ff6330 --- /dev/null +++ b/m4/visibility.m4 @@ -0,0 +1,52 @@ +# visibility.m4 serial 1 (gettext-0.15) +dnl Copyright (C) 2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl Tests whether the compiler supports the command-line option +dnl -fvisibility=hidden and the function and variable attributes +dnl __attribute__((__visibility__("hidden"))) and +dnl __attribute__((__visibility__("default"))). +dnl Does *not* test for __visibility__("protected") - which has tricky +dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on +dnl MacOS X. +dnl Does *not* test for __visibility__("internal") - which has processor +dnl dependent semantics. +dnl Does *not* test for #pragma GCC visibility push(hidden) - which is +dnl "really only recommended for legacy code". +dnl Set the variable CFLAG_VISIBILITY. +dnl Defines and sets the variable HAVE_VISIBILITY. + +AC_DEFUN([gl_VISIBILITY], +[ + AC_REQUIRE([AC_PROG_CC]) + CFLAG_VISIBILITY= + HAVE_VISIBILITY=0 + if test -n "$GCC"; then + AC_MSG_CHECKING([for simple visibility declarations]) + AC_CACHE_VAL(gl_cv_cc_visibility, [ + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + AC_TRY_COMPILE( + [extern __attribute__((__visibility__("hidden"))) int hiddenvar; + extern __attribute__((__visibility__("default"))) int exportedvar; + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void);], + [], + gl_cv_cc_visibility=yes, + gl_cv_cc_visibility=no) + CFLAGS="$gl_save_CFLAGS"]) + AC_MSG_RESULT([$gl_cv_cc_visibility]) + if test $gl_cv_cc_visibility = yes; then + CFLAG_VISIBILITY="-fvisibility=hidden" + HAVE_VISIBILITY=1 + fi + fi + AC_SUBST([CFLAG_VISIBILITY]) + AC_SUBST([HAVE_VISIBILITY]) + AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], + [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) +]) diff --git a/missing b/missing index f62bbae..625aeb1 100755 --- a/missing +++ b/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ else exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/sherlock265/Makefile.in b/sherlock265/Makefile.in index da2b9eb..8d578a1 100644 --- a/sherlock265/Makefile.in +++ b/sherlock265/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -142,7 +142,14 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/sherlock265-VideoDecoder.Po \ + ./$(DEPDIR)/sherlock265-VideoPlayer.Po \ + ./$(DEPDIR)/sherlock265-VideoWidget.Po \ + ./$(DEPDIR)/sherlock265-moc_VideoDecoder.Po \ + ./$(DEPDIR)/sherlock265-moc_VideoPlayer.Po \ + ./$(DEPDIR)/sherlock265-moc_VideoWidget.Po \ + ./$(DEPDIR)/sherlock265-sherlock265.Po am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -204,8 +211,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp COPYING \ README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -224,8 +229,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -240,6 +246,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -405,8 +412,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -477,13 +484,19 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-VideoDecoder.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-VideoPlayer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-VideoWidget.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-moc_VideoDecoder.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-moc_VideoPlayer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-moc_VideoWidget.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-sherlock265.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-VideoDecoder.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-VideoPlayer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-VideoWidget.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-moc_VideoDecoder.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-moc_VideoPlayer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-moc_VideoWidget.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sherlock265-sherlock265.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -682,8 +695,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -756,7 +771,13 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/sherlock265-VideoDecoder.Po + -rm -f ./$(DEPDIR)/sherlock265-VideoPlayer.Po + -rm -f ./$(DEPDIR)/sherlock265-VideoWidget.Po + -rm -f ./$(DEPDIR)/sherlock265-moc_VideoDecoder.Po + -rm -f ./$(DEPDIR)/sherlock265-moc_VideoPlayer.Po + -rm -f ./$(DEPDIR)/sherlock265-moc_VideoWidget.Po + -rm -f ./$(DEPDIR)/sherlock265-sherlock265.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -802,7 +823,13 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/sherlock265-VideoDecoder.Po + -rm -f ./$(DEPDIR)/sherlock265-VideoPlayer.Po + -rm -f ./$(DEPDIR)/sherlock265-VideoWidget.Po + -rm -f ./$(DEPDIR)/sherlock265-moc_VideoDecoder.Po + -rm -f ./$(DEPDIR)/sherlock265-moc_VideoPlayer.Po + -rm -f ./$(DEPDIR)/sherlock265-moc_VideoWidget.Po + -rm -f ./$(DEPDIR)/sherlock265-sherlock265.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -823,7 +850,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/tools/Makefile.in b/tools/Makefile.in index f3ffe0f..0214af0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -164,7 +164,12 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/bjoentegaard-bjoentegaard.Po \ + ./$(DEPDIR)/block_rate_estim-block-rate-estim.Po \ + ./$(DEPDIR)/gen_enc_table-gen-entropy-table.Po \ + ./$(DEPDIR)/rd_curves-rd-curves.Po ./$(DEPDIR)/tests-tests.Po \ + ./$(DEPDIR)/yuv_distortion-yuv-distortion.Po am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -212,8 +217,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -231,8 +234,9 @@ CCASDEPMODE = @CCASDEPMODE@ CCASFLAGS = @CCASFLAGS@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -247,6 +251,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ @@ -415,8 +420,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -507,12 +512,18 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bjoentegaard-bjoentegaard.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/block_rate_estim-block-rate-estim.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_enc_table-gen-entropy-table.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rd_curves-rd-curves.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests-tests.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv_distortion-yuv-distortion.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bjoentegaard-bjoentegaard.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/block_rate_estim-block-rate-estim.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_enc_table-gen-entropy-table.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rd_curves-rd-curves.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests-tests.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv_distortion-yuv-distortion.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -676,8 +687,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -749,7 +762,12 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/bjoentegaard-bjoentegaard.Po + -rm -f ./$(DEPDIR)/block_rate_estim-block-rate-estim.Po + -rm -f ./$(DEPDIR)/gen_enc_table-gen-entropy-table.Po + -rm -f ./$(DEPDIR)/rd_curves-rd-curves.Po + -rm -f ./$(DEPDIR)/tests-tests.Po + -rm -f ./$(DEPDIR)/yuv_distortion-yuv-distortion.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -795,7 +813,12 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/bjoentegaard-bjoentegaard.Po + -rm -f ./$(DEPDIR)/block_rate_estim-block-rate-estim.Po + -rm -f ./$(DEPDIR)/gen_enc_table-gen-entropy-table.Po + -rm -f ./$(DEPDIR)/rd_curves-rd-curves.Po + -rm -f ./$(DEPDIR)/tests-tests.Po + -rm -f ./$(DEPDIR)/yuv_distortion-yuv-distortion.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -816,7 +839,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff --git a/tools/rd-curves.cc b/tools/rd-curves.cc index 71fd3e2..7c26d05 100644 --- a/tools/rd-curves.cc +++ b/tools/rd-curves.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include